debian/0000775000000000000000000000000012264570667007207 5ustar debian/copyright0000664000000000000000000001504311765710114011131 0ustar This package was debianized by Henrik Stoerner on Sun, 6 Mar 2005 21:58:45 +0100. The current debianization is based on Henrik's and was done by Christoph Berg on Wed, 15 Aug 2007 21:09:40 +0200. It was downloaded from http://sourceforge.net/projects/hobbitmon/ Upstream author: Henrik Stoerner Copyright: Most files are carry the following copyright header: Copyright (C) 2002-2011 Henrik Storner This program is released under the GNU General Public License (GPL), version 2. See the file "COPYING" for details. The README file states: Xymon is Open Source software, made available under the GNU General Public License (GPL) version 2, with the explicit exemption that linking with the OpenSSL libraries is permitted. On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'. Other copyrights: client/hobbitclient-sco_sv.sh: SCO_SV client for Hobbit Copyright (C) 2005-2006 Henrik Storner Copyright (C) 2006 Charles Goyard client/runclient.sh: Copyright (C) 2005-2006 Henrik Storner "status" section (C) Scott Smith 2006 hobbitd/webfiles/zoom.js: Copyright (C) 2004 Eric Steffen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. lib/md5.c: This file is part of the Hobbit monitor library, but was written by Peter Deutsch and released under the GNU GPL. Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved. This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: 1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. 2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. lib/ripemd.h: Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) All rights reserved. This package is an SSL implementation written by Eric Young (eay@cryptsoft.com). The implementation was written so as to conform with Netscapes SSL. This library is free for commercial and non-commercial use as long as the following conditions are aheared to. The following conditions apply to all code found in this distribution, be it the RC4, RSA, lhash, DES, etc., code; not just the SSL code. The SSL documentation included with this distribution is covered by the same copyright terms except that the holder is Tim Hudson (tjh@cryptsoft.com). Copyright remains Eric Young's, and as such any Copyright notices in the code are not to be removed. If this package is used in a product, Eric Young should be given attribution as the author of the parts of the library used. This can be in the form of a textual message at program startup or in documentation (online or textual) provided with the package. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the copyright notice, this list of conditions and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. All advertising materials mentioning features or use of this software must display the following acknowledgement: "This product includes cryptographic software written by Eric Young (eay@cryptsoft.com)" The word 'cryptographic' can be left out if the rouines from the library being used are not cryptographic related :-). 4. If you include any Windows specific code (or a derivative thereof) from the apps directory (application code) you must include an acknowledgement: "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. The licence and distribution terms for any publically available version or derivative of this code cannot be changed. i.e. this code cannot simply be copied and put under another distribution licence [including the GNU Public Licence.] There is a nested c-ares tarball in bbnet/: Copyright 1998, 2000 by the Massachusetts Institute of Technology. Copyright (C) 2004 by Daniel Stenberg et al Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that both that copyright notice and this permission notice appear in supporting documentation, and that the name of M.I.T. not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission. M.I.T. makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty. debian/README.Debian0000664000000000000000000000156211766103035011237 0ustar Xymon for Debian ================= This Debian package follows pretty closely the original debianization shipped by upstream. The main differences are - 'xymon' depends on 'xymon-client' rather than conflicting with it; it uses the client package for monitoring the local host. (The client package's init script/daemon is disabled when the server is installed.) - Additional tests to run can be plugged into /etc/xymon/clientlaunch.d/*.cfg. Client and server will read these files on startup. Install the hobbit-plugins package for some pre-packaged modules. - Access to the monitoring website is restricted to localhost by default. Edit /etc/apache2/conf.d/xymon to change this. - The animated gifs were replaced by static versions in the default install, change BBSKIN for the animated version. -- Axel Beckert , Wed, 13 Jun 2012 14:22:53 +0200 debian/xymon-client.maintscript0000664000000000000000000000074011772141646014107 0ustar mv_conffile /etc/init.d/hobbit-client /etc/init.d/xymon-client 4.3.7-1~~ xymon-client mv_conffile /etc/logrotate.d/hobbit-client /etc/logrotate.d/xymon-client 4.3.7-1~~ xymon-client mv_conffile /etc/hobbit/localclient.cfg /etc/xymon/localclient.cfg 4.3.7-1~~ xymon-client mv_conffile /etc/hobbit/hobbitclient.cfg /etc/xymon/xymonclient.cfg 4.3.7-1~~ xymon-client mv_conffile /etc/hobbit/clientlaunch.cfg /etc/xymon/clientlaunch.cfg 4.3.7-1~~ xymon-client debian/xymon.postrm0000664000000000000000000000274411772161051011620 0ustar #! /bin/sh # postrm script for xymon # # see: dh_installdeb(1) set -e # summary of how this script can be called: # * `remove' # * `purge' # * `upgrade' # * `failed-upgrade' # * `abort-install' # * `abort-install' # * `abort-upgrade' # * `disappear' overwrit>r> # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # Workaround for http://bugs.debian.org/560317 in case debconf is too old like on Squeeze export DPKG_MAINTSCRIPT_PACKAGE=${DPKG_MAINTSCRIPT_PACKAGE:-xymon} export DPKG_MAINTSCRIPT_NAME=${DPKG_MAINTSCRIPT_NAME:-postrm} case "$1" in purge|disappear) rm -f /etc/hobbit/bb-hosts /etc/hobbit/hobbitgroups /etc/hobbit/hobbitpasswd \ /etc/default/hobbit /etc/xymon/hosts.cfg /etc/xymon/xymongroups \ /etc/xymon/xymonpasswd /etc/default/xymon if test -e /usr/share/debconf/confmodule ; then . /usr/share/debconf/confmodule db_purge fi ;; remove) ;; upgrade) # The server package doesn't use debconf anymore if dpkg --compare-versions "$2" lt 4.2.0.dfsg-2 && test -e /usr/share/debconf/confmodule ; then . /usr/share/debconf/confmodule db_purge fi ;; failed-upgrade|abort-install|abort-upgrade) ;; *) echo "postrm called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xymon.docs0000664000000000000000000000013011772175326011221 0ustar docs/upgrade-to-430.txt docs/Renaming-430.txt xymond/etcfiles/xymonserver-migration.cfg debian/xymon-client.install0000664000000000000000000000004611766446270013223 0ustar debian/init-common.sh usr/share/xymon debian/xymon-client.logrotate0000664000000000000000000000046011765656133013555 0ustar # # Logrotate fragment for Hobbit (client and server). # /var/log/hobbit/*.log { weekly compress delaycompress rotate 5 missingok nocreate sharedscripts postrotate /etc/init.d/hobbit-client rotate endscript } debian/xymon-client.prerm0000664000000000000000000000044311772161051012667 0ustar #! /bin/sh # prerm script for xymon set -e # Workaround for http://bugs.debian.org/560317 in case debconf is too old like on Squeeze export DPKG_MAINTSCRIPT_PACKAGE=${DPKG_MAINTSCRIPT_PACKAGE:-xymon-client} export DPKG_MAINTSCRIPT_NAME=${DPKG_MAINTSCRIPT_NAME:-prerm} #DEBHELPER# exit 0 debian/xymon-client.docs0000664000000000000000000000005611772175326012504 0ustar docs/upgrade-to-430.txt docs/Renaming-430.txt debian/xymon.prerm0000664000000000000000000000043411772161051011413 0ustar #! /bin/sh # prerm script for xymon set -e # Workaround for http://bugs.debian.org/560317 in case debconf is too old like on Squeeze export DPKG_MAINTSCRIPT_PACKAGE=${DPKG_MAINTSCRIPT_PACKAGE:-xymon} export DPKG_MAINTSCRIPT_NAME=${DPKG_MAINTSCRIPT_NAME:-prerm} #DEBHELPER# exit 0 debian/xymon.install0000664000000000000000000000021611766447422011746 0ustar build/renamevars usr/lib/xymon/server/libexec build/renametasks usr/lib/xymon/server/libexec build/upgrade430.sh usr/lib/xymon/server/libexec debian/xymon-client.config0000664000000000000000000000153211772141646013017 0ustar #!/bin/sh CONFIGFILE=/etc/default/xymon-client set -e . /usr/share/debconf/confmodule if [ -e $CONFIGFILE ]; then . $CONFIGFILE || true fi # if there is no value configured, look for debconf answers if [ -z "$HOBBITSERVERS" ] ; then db_get hobbit-client/HOBBITSERVERS HOBBITSERVERS="$RET" fi # still nothing? set a default if [ -z "$HOBBITSERVERS" ] ; then HOBBITSERVERS="127.0.0.1" fi # in any case, store the value in debconf db_set hobbit-client/HOBBITSERVERS "$HOBBITSERVERS" if [ -z "$CLIENTHOSTNAME" ] ; then db_get hobbit-client/CLIENTHOSTNAME CLIENTHOSTNAME="$RET" fi if [ -z "$CLIENTHOSTNAME" ] ; then CLIENTHOSTNAME="`hostname -f 2> /dev/null || hostname`" fi db_set hobbit-client/CLIENTHOSTNAME "$CLIENTHOSTNAME" db_input high hobbit-client/HOBBITSERVERS || true db_input medium hobbit-client/CLIENTHOSTNAME || true db_go || true debian/po/0000775000000000000000000000000012264570667007625 5ustar debian/po/fi.po0000664000000000000000000000353311766073257010566 0ustar msgid "" msgstr "" "Project-Id-Version: debconf: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:17+0200\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Finnish\n" "X-Poedit-Country: FINLAND\n" "X-Poedit-SourceCharset: utf-8\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymon-palvelin:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Anna Xymon-palvelimen verkko-osoite. Jos käytössä on useampia palvelimia, " "syötä osoitteet välilyönnein eroteltuna." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Verkkonimien käyttöä IP-osoitteiden sijaan ei suositella mahdollisten DNS:n " "toimintahäiriöiden takia." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Asiakaskoneen verkkonimi:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Anna verkkonimi, jota Xymon-asiakas käyttää lähettäessään raportteja Xymon-" "palvelimelle. Tämän nimen tulee täsmätä Xymon-serverillä tiedostossa " "hosts.cfg olevaan nimeen." debian/po/POTFILES.in0000664000000000000000000000006111765656133011375 0ustar [type: gettext/rfc822deb] xymon-client.templates debian/po/ja.po0000664000000000000000000000435611766075202010556 0ustar # Japanese translation of xymon debconf templates. # Copyright (C) 2009 Hideki Yamane # This file is distributed under the same license as xymon package. # Hideki Yamane (Debian-JP) , 2009 # msgid "" msgstr "" "Project-Id-Version: xymon 4.3.0~beta2.dfsg-3\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:33+0200\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymon サーバ:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Xymon サーバに接続するのに使うネットワークアドレスを入力してください。複数の" "サーバを利用する場合は、空白で区切ったアドレスの一覧を使ってください。" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "IP アドレスではなくホスト名を使うのは、ネットワークに DNS 障害が起こった場合" "に問題となるので推奨されません。" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "クライアントのホスト名:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Xymon クライアントが Xymon サーバにレポートを送信する際に使うホスト名を入力" "してください。この名前は Xymon サーバ上の hosts.cfg ファイルで使われている名" "前と一致している必要があります。" debian/po/de.po0000664000000000000000000000356311766072664010564 0ustar # xymon # Copyright (C) 2007 # This file is distributed under the same license as the xymon package. # Christoph Berg # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:12+0200\n" "Last-Translator: Christoph Berg \n" "Language-Team: debian-l10n-german \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymon-Server:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Geben Sie die Adresse zum Zugriff auf den Xymon-Server ein. Wenn Sie mehrere " "Server benutzen, trennen Sie die Adressen mit Leerzeichen." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Es wird empfohlen im Falle von DNS-Ausfällen statt Hostnamen IP-Adressen zu " "benutzen." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Client-Hostname:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Geben Sie den Hostnamen ein den der Xymon-Client benutzt um Reports and den " "Xymon-Server zu senden. Der Name muss mit dem in der Datei hosts.cfg auf dem " "Server übereinstimmen." debian/po/es.po0000664000000000000000000000572711766072723010603 0ustar # xymon translation to spanish # Copyright (C) 2008 Software in the Public Interest, SPI Inc. # This file is distributed under the same license as the xymon package. # # Changes: # - Initial translation # Enrique Monge , 2008 # # Traductores, si no conoce el formato PO, merece la pena leer la # documentación de gettext, especialmente las secciones dedicadas a este # formato, por ejemplo ejecutando: # info -n '(gettext)PO Files' # info -n '(gettext)Header Entry' # # Equipo de traducción al español, por favor lean antes de traducir # los siguientes documentos: # # - El proyecto de traducción de Debian al español # http://www.debian.org/intl/spanish/ # especialmente las notas y normas de traducción en # http://www.debian.org/intl/spanish/notas # # - La guía de traducción de po's de debconf: # /usr/share/doc/po-debconf/README-trans # o http://www.debian.org/intl/l10n/po-debconf/README-trans # # Si tiene dudas o consultas sobre esta traducción consulte con el último # traductor (campo Last-Translator) y ponga en copia a la lista de # traducción de Debian al español () # msgid "" msgstr "" "Project-Id-Version: xymon 4.2.0.dfsg-14\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:13+0200\n" "Last-Translator: Enrique Monge \n" "Language-Team: Debian Spanish \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Servidor «Xymon»:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Ingrese la dirección de red para acceder al servidor(es) «Xymon». Si usa " "varios servidores, use un espacio para separar la lista de direcciones." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Usar los nombres de equipo en lugar de direcciones IP no es recomendable en " "caso que la red experimente fallos de DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nombre del cliente" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Introduzca el nombre del equipo que utilizará el cliente para enviar " "reportes al servidor «Xymon». Este nombre debe coincidir con el nombre " "usado en el fichero «hosts.cfg» en el servidor «Xymon»." debian/po/gl.po0000664000000000000000000000367411766074657010605 0ustar # Galician translation of xymon's debconf templates # This file is distributed under the same license as the xymon package. # Jacobo Tarrio , 2007. # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:29+0200\n" "Last-Translator: Jacobo Tarrio \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Servidor Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Introduza o enderezo de rede que quere empregar para acceder ao servidor " "Xymon. Se emprega varios servidores, introduza unha lista de enderezos " "separados por espazos." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Recoméndase non empregar nomes, senón enderezos IP, para evitar problemas no " "caso de que a rede teña problemas con DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nome do cliente:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Introduza o nome empregado polo cliente Xymon ao enviar informes ao " "servidor Xymon. Este nome debe coincidir co nome empregado no ficheiro " "hosts.cfg no servidor Xymon." debian/po/ta.po0000664000000000000000000000640611766067520010572 0ustar # translation of hobbit.po to TAMIL # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Dr.T.Vasudevan , 2007. msgid "" msgstr "" "Project-Id-Version: hobbit\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2007-09-19 14:53+0530\n" "Last-Translator: Dr.T.Vasudevan \n" "Language-Team: TAMIL \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" #. Type: string #. Description #: ../xymon-client.templates:2001 #, fuzzy #| msgid "Hobbit server:" msgid "Xymon server:" msgstr "ஹாபிட் சேவையகம்:" #. Type: string #. Description #: ../xymon-client.templates:2001 #, fuzzy #| msgid "" #| "Please enter the network address used to access the Hobbit server(s). If " #| "you use multiple servers, use a space-separated list of addresses." msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "தயவு செய்து ஹாபிட் சேவையக வலைப்பின்னல் முகவரியை உள்ளிடவும். நீங்கள் பல சேவையக கணினிகளை " "பயன்படுத்தினால் ஒரு இடைவெளியால் பிரித்த முகவரிகள் பட்டியலை பயன்படுத்துக" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "டிஎன்எஸ் தோல்விகளால் ஐபி முகவரிக்கு பதிலாக புரவன் பெயரை பயன்படுத்தாமை " "பரிந்துரைக்கப்படுகிறது. " #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "சார்ந்தோன் புரவன் பெயர்:" #. Type: string #. Description #: ../xymon-client.templates:3001 #, fuzzy #| msgid "" #| "Please enter the host name used by the Hobbit client when sending reports " #| "to the Hobbit server. This name must match the name used in the bb-hosts " #| "file on the Hobbit server." msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "ஹாபிட் சார்ந்தோன் ஹாபிட் சேவையகத்துக்கு அறிக்கைகள் அனுப்பும் போது பயன்படும் புரவன் பெயரை " "தயவு செய்து உள்ளிடுக. இந்த பெயர் ஹாபிட் சேவையகத்தில் உள்ள bb-hosts கோப்பில் உள்ள " "பெயருடன் ஒத்துப்போக வேண்டும்." debian/po/da.po0000664000000000000000000000370411766070407010546 0ustar # Danish translation xymon. # Copyright (C) 2010 xymon & nedenstående oversættere. # This file is distributed under the same license as xymon package. # Joe Hansen , 2010. # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 12:52+0200\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymonserver:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Indtast venligst netværksadressen brugt til at tilgå Xymonserveren. Hvis du " "bruger flere servere, så brug en mellemrumsadskilt liste for adresserne." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Brug af værtsnavne i steden for IP-adresser frarådes i tilfælde af at " "netværket oplever DNS-fejl." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Klientværtsnavn:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Indtast venligst værtsnavnet brugt af Xymonklienten, når der indsendes " "rapporter til Xymonserveren. Dette navn skal svare til navnet brugt i " "hosts.cfg-filen på Xymonserveren." debian/po/nl.po0000664000000000000000000000407211766075403010573 0ustar # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE 'S COPYRIGHT HOLDER # This file is distributed under the same license as the package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:35+0200\n" "Last-Translator: Bart Cornelis \n" "Language-Team: debian-l10n-dutch \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Dutch\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymon-server:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Wat is het netwerkadres waarmee de Xymon-server(s) benaderd kunnen worden? " "Als u meerdere servers gebruikt dient u de adressen met spaties van elkaar " "te scheiden." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Gebruik van computernamen in plaats van IP-adressen wordt afgeraden (IP-" "adressen blijven werken als het netwerk DNS-problemen ondervindt). " #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Computernaam van de client:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Wat is de computernaam die de Xymon-client gebruikt om rapporten naar de " "Xymon-server te versturen? Deze naam dient overeen te komen met de naam die " "in het bestand 'hosts.cfg' op de Xymon-server gebruikt wordt." debian/po/ru.po0000664000000000000000000000467711766076041010622 0ustar # translation of ru.po to Russian # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Yuri Kozlov , 2007. msgid "" msgstr "" "Project-Id-Version: 4.2.0.dfsg-4\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:40+0200\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Сервер Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Введите сетевой адрес, который нужно использовать для доступа к серверу(ам) " "Xymon. Если у вас используются несколько серверов, укажите все адреса через " "пробел." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Использование имён серверов вместо IP-адресов приводит к проблемам в случае " "отказа DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Имя клиента:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Введите имя клиентской машины, которое будет использовано клиентом Xymon " "при отправке отчётов на сервер Xymon. Это имя должно совпадать с именем в " "файле hosts.cfg на сервере Xymon." debian/po/it.po0000664000000000000000000000403711766074776010613 0ustar # Italian (it) translation of debconf templates for xymon # Copyright (C) 2007 Software in the Public Interest # This file is distributed under the same license as the xymon package. # Luca Monducci , 2007. # msgid "" msgstr "" "Project-Id-Version: xymon debconf templates\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:31+0200\n" "Last-Translator: Luca Monducci \n" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Server Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Inserire l'indirizzo di rete da usare per accedere al server Xymon. Se si " "utilizzano più server, inserire l'elenco degli indirizzi usando uno spazio " "come separatore." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "L'uso dei nomi host al posto degli indirizzi IP è sconsigliato nel caso si " "verifichino dei problemi con il DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nome host del client:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Inserire il nome host che il client Xymon deve usare per l'invio dei report " "al server Xymon. Questo nome deve coincidere con il nome utilizzato nel " "file hosts.cfg sul server Xymon." debian/po/pt_BR.po0000664000000000000000000000411511766075526011174 0ustar # xymon Brazilian Portuguese translation # Copyright (C) 2007 THE xymon'S COPYRIGHT HOLDER # This file is distributed under the same license as the xymon package. # Felipe Augusto van de Wiel (faw) , 2007. # # msgid "" msgstr "" "Project-Id-Version: xymon (20071005)\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:36+0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) \n" "Language-Team: l10n portuguese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "pt_BR utf-8\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Servidor Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Por favor, informe o endereço de rede usado para acessar o(s) servidor(es) " "Xymon. Se você usa múltiplos servidores, use uma lista de endereços " "separada por espaços." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Usar nomes de máquinas ao invés de endereços IP é desencorajado caso a rede " "sofra falhas de DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nome da máquina cliente:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Por favor, informe o nome da máquina cliente usado pelo cliente Xymon " "quando envia relatórios para o servidor Xymon. Este nome precisa bater com " "o nome usado no arquivo hosts.cfg no servidor Xymon." debian/po/cs.po0000664000000000000000000000371311766070737010575 0ustar # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the xymon package. # Martin Sin , 2009. # msgid "" msgstr "" "Project-Id-Version: xymon 4.3.0~beta2.dfsg-2\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 12:56+0200\n" "Last-Translator: Martin Sin \n" "Language-Team: Czech \n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Server Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Zadejte prosím síťovou adresu serveru/serverů Xymon. Pokud chcete použít " "více serverů, oddělte je pomocí mezery." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Použití jmen počítačů místo IP adresy není doporučeno, zejména pokud může " "dojít k selhání serveru DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Jméno klienta:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Zadejte prosím jméno klienta Xymon, které bude použito při zasílání zpráv " "na server Xymon. Jméno musí odpovídat tomu, které je použito v souboru " "hosts.cfg na serveru Xymon." debian/po/fr.po0000664000000000000000000000411611766074100010561 0ustar # Translation of xymon debconf templates to French # Copyright (C) 2007 Geoffroy Youri Berret # This file is distributed under the same license as the xymon package. # # Geoffroy Youri Berret , 2007. # # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:23+0200\n" "Last-Translator: Geoffroy Youri Berret \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Serveur xymon :" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Veuillez indiquer l'adresse du (ou des) serveur(s) Xymon. Les serveurs " "multiples éventuels doivent être séparés par des espaces." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Il est conseillé d'indiquer les adresses IP plutôt que les noms d'hôtes afin " "d'éviter des difficulté si la résolution de noms de domaine (DNS) ne " "fonctionne plus." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nom d'hôte du client :" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Veuillez indiquer le nom d'hôte utilisé par le client Xymon pour envoyer " "les rapports au serveur Xymon. Ce nom doit correpondre à celui utilisé dans " "le fichier hosts.cfg sur le serveur Xymon." debian/po/sv.po0000664000000000000000000000414611766076164010621 0ustar # translation of xymon_4.2.0.dfsg-13_sv.po to Swedish # Copyright (C) 2008 # This file is distributed under the same license as the xymon package. # # Martin Ågren , 2008. msgid "" msgstr "" "Project-Id-Version: xymon_4.2.0.dfsg-13_sv\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:41+0200\n" "Last-Translator: Martin Ågren \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymonserver:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Var vänlig skriv in den nätverksadress som används för att ansluta till " "Xymonservern/-servrarna. Om du använder flera servrar, separera adresserna " "med blanksteg." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Användande av värdnamn istället för IP-adresser är inte rekommenderat ifall " "nätverket upplever DNS-problem." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Klientens värdnamn:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Var vänlig ange det värdnamn som används av Xymonklienten för att sända " "rapporter till Xymonservern. Detta namn måste stämma överens med det namn " "som används i hosts.cfg-filen på Xymonservern." debian/po/templates.pot0000664000000000000000000000270111766067735012352 0ustar # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 12:47+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" debian/po/vi.po0000664000000000000000000000406311766076453010606 0ustar # Vietnamese translation for Xymon. # Copyright © 2007 Free Software Foundation, Inc. # Clytie Siddall , 2007 # msgid "" msgstr "" "Project-Id-Version: xymon\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:44+0200\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: LocFactoryEditor 1.7b1\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Máy phục vụ Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Hãy gõ địa chỉ mạng được dùng để truy cập (các) máy phục vụ Xymon. Định " "giới nhiều máy phục vụ bằng dấu cách." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "Khuyên bạn không sử dụng tên máy thay cho địa chỉ IP, trong trường hợp mạng " "gặp dịch vụ DNS bị gián đoạn." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Tên máy khách:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Hãy gõ tên máy được ứng dụng khách Xymon dùng khi gửi thông báo cho máy " "phục vụ Xymon. Tên này phải tương ứng với tên nằm trong tập tin « hosts.cfg " "» trên máy phục vụ Xymon." debian/po/pt.po0000664000000000000000000000411011766075666010611 0ustar # translation of xymon debconf to Portuguese # Copyright (C) 2007 Américo Monteiro # This file is distributed under the same license as the xymon package. # # Américo Monteiro , 2007. msgid "" msgstr "" "Project-Id-Version: xymon 4.2.0.dfsg-4\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:38+0200\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Servidor Xymon:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Por favor indique o endereço de rede usado para aceder ao(s) seu(s) servidor" "(es) Xymon. Se você tem vários servidores, use uma lista de endereços " "separados por espaços." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "A utilização de nomes de máquinas em vez de endereços IP é desaconselhada, " "em casos em que a rede sofra de falhas de DNS." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Nome da máquina cliente:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Por favor indique o nome da máquina usada pelo cliente Xymon quando envia " "relatórios para o servidor Xymon. Este nome tem que coincidir com o nome " "usado no ficheiro hosts.cfg no servidor Xymon." debian/po/eu.po0000664000000000000000000000401411766072762010574 0ustar # translation of xymon-templates.po to Euskara # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # # Piarres Beobide , 2007. msgid "" msgstr "" "Project-Id-Version: xymon-templates\n" "Report-Msgid-Bugs-To: xymon@packages.debian.org\n" "POT-Creation-Date: 2012-06-13 12:45+0200\n" "PO-Revision-Date: 2012-06-13 13:13+0200\n" "Last-Translator: Piarres Beobide \n" "Language-Team: Euskara \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "Xymon server:" msgstr "Xymon zerbitzaria:" #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Please enter the network address used to access the Xymon server(s). If you " "use multiple servers, use a space-separated list of addresses." msgstr "" "Mesedez idatzi xymon zerbitzaria(k) eskuratzeko erabiliko den sare " "helbidea. Zerbitzari anitz erabiaz gero zuriunez bereiziriko helbide " "zerrenda bat erabili." #. Type: string #. Description #: ../xymon-client.templates:2001 msgid "" "Using host names instead of IP addresses is discouraged in case the network " "experiences DNS failures." msgstr "" "IP helbideak beharrean ostalari izenak erabiltzea arrisku bat izan liteke " "sareak DNS erroreak dituen kasuan." #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "Client hostname:" msgstr "Bezero ostalari izena:" #. Type: string #. Description #: ../xymon-client.templates:3001 msgid "" "Please enter the host name used by the Xymon client when sending reports to " "the Xymon server. This name must match the name used in the hosts.cfg file " "on the Xymon server." msgstr "" "Mesedez idatzi xymon bezeroak zerbitzarira txostenak bidaltzeko erabiliko " "duen ostalari izena. Izen hau Xymon zerbitzariko hosts.cfg fitxategian " "dagoen berdina izan behar da." debian/xymon.lintian-overrides0000664000000000000000000000035511766620557013744 0ustar xymon: package-contains-empty-directory usr/lib/xymon/server/download/ xymon: setuid-binary usr/lib/xymon/server/bin/xymonping 4755 root/root xymon: spelling-error-in-binary usr/lib/xymon/server/bin/xymond_rrd retransmited retransmitted debian/changelog0000664000000000000000000004313712264570661011063 0ustar xymon (4.3.7-1ubuntu2) trusty; urgency=low * Fix embedded c-ares's use of outdated config.{guess,sub}, resolving FTBFS on newer arches. -- Daniel T Chen Sun, 12 Jan 2014 14:48:33 -0500 xymon (4.3.7-1ubuntu1) trusty; urgency=low * Use autotools-dev for newer arches, resolving FTBFS. -- Daniel T Chen Sun, 12 Jan 2014 14:17:27 -0500 xymon (4.3.7-1) experimental; urgency=low * New upstream release (Closes: #622574, LP: #1017868) [ Christoph Berg ] * Acknowledge and incorporate NMU by gregor herrmann * Remove indep rules (left-overs from transitional packages) [ Axel Beckert ] * Add myself to Uploaders * Recommend a CGI-capable web server, defaulting to apache2 * Update Homepage header to point to http://xymon.sourceforge.net/ * Make git repo git-buildpackage capable + Ignore upstream's debian directory when importing upstream sources + No more have upstream sources listed in .gitignore * Remove the following patches (applied upstream): + new-menu + hobbitd-rrdparameters + 530227-hobbitclient-bashism * Add new patch fix-configure-for-multiarch (Closes: #639080) * Refreshed the following patches and partially added one-liner comments to make lintian happy: + htmlcontenttype + doc-paths + hobbitclient-debian + hobbitvars + hobbitgraph.netstat + hobbit-ghosts-menu + rrd_net_granularity + hobbitgraph.mailq + hobbitclient-tmpfs + hobbit_files_ifexist + 580493-negative-timeoffset + kfreebsd-makefile + bbcombotest-fix + 622069-sslv2-deprecation * Remove remaining traces of the debian-specific menu + Remove note about rebuilt upstream tarball from debian/copyright + Remove the menu from debian/rules, debian/xymon.install, etc. * Move from /etc/hobbit/ to /etc/xymon/. + Add xymon.NEWS entry and new xymon-client.NEWS file. + Install upgrade-to-430.txt and Renaming-430.txt as documentation + Install some files from xymond/etcfiles as examples + Adapt paths, variable names, etc. in debian/* accordingly. + Add pre-dependency on ${misc:Pre-Depends} for *.maintscript + Install upstream's migration tools to /usr/lib/xymon/server/libexec/ and upstream's migration documentation to /usr/share/doc/xymon/ + Stop old Hobbit daemons earlier, reload Apache later + Kill remaining vmstat processes and then delete user+group hobbit after chowning+chgrping files to xymon. Don't bail out if that fails. + At the end, remove all _empty_ directories in /etc/hobbit/ and possibly /etc/hobbit itself. + Rename data, history and rrd files according to Renaming-430.txt + Bump debhelper build dependency to >= 8.1.0~ + Breaks hobbit-plugins < 20120619 + Export DPKG_MAINTSCRIPT_PACKAGE and DPKG_MAINTSCRIPT_NAME in all maintainer scripts manually to make reconfiguring work with older debconf versions (cf. #560317, present on Squeeze) * Enabled hardening build flags + Bump dpkg-dev build dependency to >= 1.16.1~ * Update debconf po templates for Hobbit → Xymon rename * Replace last hardcoded occurrence of pid file name in init.d script * Fix enforcement of non-parallel builds * Let dh_clean do all the clean up, no more calling rm in clean target * Bump Standards-Version to 3.9.3 (no changes) * Mention OpenSSL linkage exception from upstream's README file in debian/copyright (fixes lintian error possible-gpl-code-linked-with-openssl) * Update copyright years in debian/copyright * Switch to source format "3.0 (quilt)" + Remove traces of explicit quilt usage. * Fixed lintian warnings: + copyright-refers-to-symlink-license + conflicts-with-version + unused-override possibly-insecure-handling-of-tmp-files-in-maintainer-script + duplicate-changelog-files + executable-not-elf-or-script (fix permissions in /var/lib/xymon/www/menu/) * Add patches to fix the following lintian warnings: + spelling-error-in-binary + spelling-error-in-manpage (one overriden) + hyphen-used-as-minus-sign -- Axel Beckert Tue, 26 Jun 2012 20:16:23 +0200 xymon (4.3.0~beta2.dfsg-9.1) unstable; urgency=low * Non-maintainer upload. * Fix "FTBFS: PCRE not found": patch from Ubuntu / Steve Langasek: - debian/rules: pass --pcrelib to find libpcre in the multiarch dir LP: #749190. Additionally build-depend on dpkg-dev (>= 1.16.0) and libpcre3-dev (>= 8.12-4~). (Closes: #651231) * Since this Ubuntu patch, SSL and LDAP also went multiarch, so: - also pass --ssllib and --ldaplib to configure in debian/rules - build-depend on libssl-dev (>= 1.0.0e-1~) and libldap2-dev (>= 2.4.25-2~) * libpng also went multiarch, so build/rrd.sh doesn't find it, and there's no option for configure. Add patch png-multiarch that changes build/rrd.sh to use libpng12-config instead of guessing. -- gregor herrmann Mon, 26 Dec 2011 23:40:38 +0100 xymon (4.3.0~beta2.dfsg-9) unstable; urgency=low [ Axel Beckert ] * Change SF project name from hobbitmon to xymon in debian/watch. [ Christoph Berg ] * Remove transitional packages hobbit and hobbit-client. * Add /run to the default tmpfs ignore list in hobbit-clients.cfg. (Closes: #633061) * Move hobbit HOME to /var/lib/hobbit (does not affect existing installations). (Closes: #608787) -- Christoph Berg Fri, 08 Jul 2011 10:54:50 +0200 xymon (4.3.0~beta2.dfsg-8) unstable; urgency=low * libssl1.0.0 removes SSLv2_client_method(), stop using it and document in bb-hosts(5) that testing "https2" will in fact use v3. (Closes: #621115) -- Christoph Berg Tue, 12 Apr 2011 13:19:22 +0200 xymon (4.3.0~beta2.dfsg-7) experimental; urgency=low * Allow negative time offset (clock too fast) in clock.rrd. Patch by Roland Rosenfeld. (Closes: #580493) * Add postinst code to fix old clock.rrd files using rrdtool. * Fix bbcombotest: "Could not access hobbitd board, error 0". * Debconf translation: Danish by Joe Hansen, thanks! (Closes: #605324) -- Christoph Berg Sun, 05 Dec 2010 12:21:01 +0100 xymon (4.3.0~beta2.dfsg-6) unstable; urgency=low * Support GNU/kFreeBSD by adding a Makefile and a config snippet that pretends we are running on Linux. (Closes: #458417) * Tweak hobbitclient-linux.sh to report 'df' data without /proc/filesystems mounted. -- Christoph Berg Fri, 09 Apr 2010 00:17:03 +0200 xymon (4.3.0~beta2.dfsg-5) unstable; urgency=low * Add HTMLCHARSET headers to all html pages generated. -- Christoph Berg Tue, 19 Jan 2010 12:08:47 +0100 xymon (4.3.0~beta2.dfsg-4) unstable; urgency=low * Japanese debconf translation, thanks Hideki Yamane. (Closes: #558065) * Fix bashism in hobbitclient-linux.sh, thanks Raphael Geissert. (Closes: #530227) * Ignore apache2 reload errors in postinst. Suggested by Giacomo Catenazzi. (Closes: #528195) -- Christoph Berg Wed, 02 Dec 2009 14:18:48 +0100 xymon (4.3.0~beta2.dfsg-3) unstable; urgency=low * Fix SPLITNCV rrd generation. * Czech debconf translation added, thanks Martin Šín. (Closes: #535029) * Update Build-Depends to librrd-dev, dropping Sarge support. * Bump Standards-Version and DH compat level. -- Christoph Berg Sun, 16 Aug 2009 14:32:56 +0200 xymon (4.3.0~beta2.dfsg-2) unstable; urgency=low * Mangle upstream version number in watch file. * Really fix librrd dependency. Thanks to Achim Schaefer for spotting. (Again Closes: #521045) * Once again a patch for using LDAP_DEPRECATED from dann frazier, now for the build/ directory. Thanks! (Closes: #526176) * Removing Martin from Uploaders. -- Christoph Berg Thu, 30 Apr 2009 16:22:10 +0200 xymon (4.3.0~beta2.dfsg-1) unstable; urgency=low * New upstream release candidate. (Closes: #497819, #511560) * Rebuilding fixes librrd dependency. (Closes: #521045) * Forbid parallel building. * init scripts create /var/run/hobbit if missing. By Axel Beckert. * init scripts properly support 'status'. By Peter Eisentraut. (Closes: #525347) * Uploading to unstable, and adding transitional packages replacing hobbit and hobbit-client. -- Christoph Berg Tue, 28 Apr 2009 12:49:05 +0200 xymon (4.2.3~rc1.dfsg-1) experimental; urgency=low * New upstream release candidate. -- Christoph Berg Thu, 12 Feb 2009 16:25:24 +0100 xymon (4.2.2.dfsg-2) experimental; urgency=low * Add "IFEXIST" patch to hobbit-clients.cfg/files test. By Bernd Zeimetz. -- Christoph Berg Mon, 19 Jan 2009 17:11:51 +0100 xymon (4.2.2.dfsg-1) experimental; urgency=low * Hobbit was renamed to Xymon (pronounced 'simon'). We only rename the packages for now, most of the filenames stay the same. http://www.hswn.dk/hobbiton/2008/11/msg00123.html * New upstream version mostly consisting of the "all-in-one" patch and support for BBWin clients. * Remove patches that went upstream: bbgen_ASN1_UTCTIME, disk-linecount, http-proxy-url, ldap-deprecated, ncv-ignoretext.patch. * Known issue: only the first dns test for a host works. -- Christoph Berg Thu, 15 Jan 2009 09:55:18 +0100 hobbit (4.2.0.dfsg-16) unstable; urgency=low * Spanish debconf translation, thanks Enrique Monge. (Closes: #505206) -- Christoph Berg Mon, 10 Nov 2008 17:31:58 +0100 hobbit (4.2.0.dfsg-15) unstable; urgency=medium * bbnet/contest.c: Do not crash on long-living SSL certs. (Closes: #503111) -- Christoph Berg Sat, 25 Oct 2008 14:04:35 +0200 hobbit (4.2.0.dfsg-14) unstable; urgency=low * Swedish debconf translation, thanks Martin Ågren. (Closes: #491368) -- Christoph Berg Sat, 19 Jul 2008 01:24:50 +0200 hobbit (4.2.0.dfsg-13) unstable; urgency=low * Use lsb init functions. * ncv-ignoretext.patch uses -p1. (Closes: #484950) * Do not ignore tmpfs mountpoints in hobbitclient-linux.sh, but add /dev, /dev/shm, and /lib/init/rw to the default IGNORE list in /etc/hobbit/hobbit-clients.cfg. (Closes: #487157) * Add README.source. -- Christoph Berg Sat, 05 Jul 2008 14:57:16 +0200 hobbit (4.2.0.dfsg-12) unstable; urgency=low * Debconf was broken for the initial install, thanks to Peter Eisentraut for spotting. (Closes: #470988) * Actually include /var/run/hobbit/hobbitclient-include.cfg so /etc/hobbit/hobbitclient.d/ works. Also spotted by Peter. * Use dh_lintian. -- Christoph Berg Sat, 10 May 2008 21:31:25 +0200 hobbit (4.2.0.dfsg-11) unstable; urgency=low * Make force-reload reload, not restart in init scripts. * Move init scripts to S98 and Should-Start: $all so monitored services have already started. (S98 only effective on new installs.) * Set umask to 022 on for files in /var/run/hobbit/. * Add patch to allow "/http" in URLs (require full "/http[s]://" for proxy requests). * Add /etc/hobbit/hobbitclient.d/. -- Christoph Berg Wed, 09 Apr 2008 13:32:39 +0200 hobbit (4.2.0.dfsg-10) unstable; urgency=low * Add patch by dann frazier to define LDAP_DEPRECATED to continue using the deprecated libldap interfaces, thanks. (Closes: #463424) -- Christoph Berg Fri, 15 Feb 2008 12:18:50 +0100 hobbit (4.2.0.dfsg-9) unstable; urgency=low * Add splitncv patch by Charles Goyard. * Updated lintian overrides. -- Christoph Berg Sat, 22 Dec 2007 20:22:45 +0100 hobbit (4.2.0.dfsg-8) unstable; urgency=low * Set umask to 022 on startup. * Fix mailq regexp in hobbitgraph.cfg, thanks to Roland Rosenfeld for the patch. (Closes: #450830) * Do not assume the first df output line to be a header. (Closes: #450834) * Add librrd0-dev as alternative to build-depends. -- Christoph Berg Sat, 15 Dec 2007 22:37:27 +0100 hobbit (4.2.0.dfsg-7) unstable; urgency=low * Add patch by Roland Rosenfeld to adjust description width in the netstat graphs. (Closes: #447484) * Return 0 in init-common.sh, thanks to Jason Cormie for spotting. (Closes: #448482) * Recreate /usr/lib/hobbit/*/tmp/ symlinks, pointing to /var/lib/hobbit/tmp, and properly set permissions. (Closes: #448489) * Make our HOBBITMENU work for the ghost clients report. (Closes: #446095) * Grab patch from upstream to fix slightly broken NCV parsing. * Add /etc/hobbit/hobbitgraph.d/ and /etc/hobbit/hobbitserver.d/. * Improve TCP tests time granularity. * Translations: Dutch, thanks Bart Cornelis. (Closes: #448934) -- Christoph Berg Thu, 01 Nov 2007 20:51:26 +0100 hobbit (4.2.0.dfsg-6) unstable; urgency=low * Remove /usr/lib/hobbit/*/tmp/ symlinks, set BBTMP="/var/lib/hobbit/tmp". (Closes: #446982) * Drop "hobbit" binary again, instead bbcmd will set PATH to include the hobbit binaries. * Add /etc/hobbit/hobbitlaunch.d/ directory for server extensions. * When upgrading from a pre-Debian version, move old directories in /var/lib/hobbit/www/ away, we want them to be symlinks. * Add missing "test" in postrm. Thanks to Yukio Shiiya for the patch. (Closes: #446347) * Add COLUMS=200 to the dpkg -l call for Sarge compatibility. * Add some examples to the default bb-hosts file. * Move the config file tweaking from debian/rules to quilt. -- Christoph Berg Wed, 17 Oct 2007 18:06:02 +0200 hobbit (4.2.0.dfsg-5) unstable; urgency=low * The Smith inquisition reviewed our templates - thanks Christian Perrier. (Closes: #442953) + Basque, thanks Piarres Beobide (Closes: #443155). + Vietnamese, thanks Clytie Siddall (Closes: #443161). + Portuguese, thanks Américo Monteiro (Closes: #443214). + Finnish, thanks Esko Arajärvi (Closes: #443617). + Czech, thanks Miroslav Kure (Closes: #443667). + Russian, thanks Yuri Kozlov (Closes: #443861). + Tamil, thanks Tirumurti Vasudevan (Closes: #444281). + Italian, thanks Luca Monducci (Closes: #444610). + French, thanks Geoffroy Youri Berret (Closes: #444659). + Galician, thanks Jacobo Tarrio (Closes: #444751). + Brazilian Portuguese, thanks Felipe Augusto van de Wiel. (Closes: #445339) * Use $BBSERVERWWWURL and friends in menu.cfg. * Fix reading of /etc/default/hobbit-client in config script. (Closes: #445828) -- Christoph Berg Mon, 08 Oct 2007 22:40:39 +0200 hobbit (4.2.0.dfsg-4) unstable; urgency=low * Instead of conflicting with bb, rename our 'bb' binary to 'hobbit'. Move bb.1 to bb.8 (Closes: #441030 again). * Send (reformatted) dpkg -l output with client message. -- Christoph Berg Wed, 19 Sep 2007 00:36:23 +0200 hobbit (4.2.0.dfsg-3) unstable; urgency=low * Debconf translations: Portuguese, thanks Américo Monteiro (Closes: #439693). French, thanks Geoffroy Youri Berret (Closes: #440504). * Actually install README.Debian and fix paths in html docs (Closes: #440949). * Quiltize source. * hobbit-client: + Conflict with bb (<= 1.3rc1-8), it ships bb.1 (Closes: #441030). + Set missing environment variables (Closes: #441199, thanks Jason Cormie). -- Christoph Berg Fri, 07 Sep 2007 19:13:22 +0200 hobbit (4.2.0.dfsg-2) unstable; urgency=low * Install /usr/bin/bb and bbcmd. * Use HOBBITSERVERS in /etc/default/hobbit-client (again). * Consistently use start-stop-daemon for daemon handling. * Priority: extra. -- Christoph Berg Thu, 23 Aug 2007 17:24:10 +0200 hobbit (4.2.0.dfsg-1) unstable; urgency=low * Preparing for Debian upload. * Repackaged the source: + Removed non-free tigra menu files from hobbitd/wwwfiles/menu/. + Removed upstream's debian/ dir. -- Christoph Berg Sat, 18 Aug 2007 22:05:09 +0200 hobbit (4.2.0-1) unstable; urgency=low * Hobbit version 4.2: New upstream release. -- Henrik Stoerner Wed, 09 Aug 2006 21:48:00 +0200 hobbit (4.2-RC-20060712) unstable; urgency=low * Release candidate of 4.2 -- Henrik Stoerner Wed, 12 Jul 2006 23:13:00 +0200 hobbit (4.2-beta-20060605) unstable; urgency=low * Beta release of 4.2 -- Henrik Stoerner Mon, 05 Jun 2006 16:53:00 +0200 hobbit (4.2-alfa-20060404) unstable; urgency=low * Alfa release of 4.2 -- Henrik Stoerner Tue, 04 Apr 2006 23:30:00 +0200 hobbit (4.1.2p1-1) unstable; urgency=low * New upstream release -- Henrik Stoerner Thu, 10 Nov 2005 17:32:00 +0100 hobbit (4.1.2-1) unstable; urgency=low * New upstream release -- Henrik Stoerner Mon, 10 Oct 2005 22:30:00 +0200 hobbit (4.1.1-1) unstable; urgency=low * New upstream release. -- Henrik Stoerner Mon, 25 Jul 2005 17:49:00 +0200 hobbit (4.1.0-1) unstable; urgency=low * New upstream release. -- Henrik Stoerner Sun, 24 Jul 2005 23:27:00 +0200 hobbit (4.0.4-1) unstable; urgency=low * New upstream release. -- Henrik Stoerner Sun, 29 May 2005 12:08:00 +0200 hobbit (4.0.3-1) unstable; urgency=low * New upstream release. -- Henrik Stoerner Sun, 22 May 2005 09:34:57 +0200 hobbit (4.0.2-1) unstable; urgency=low * New upstream release. -- Henrik Stoerner Sun, 10 Apr 2005 19:39:15 +0200 hobbit (4.0.1-1) unstable; urgency=low * Build problems fixed on Solaris, HP-UX * Zoomed graphs could lose the hostname in the title. -- Henrik Stoerner Fri, 1 Apr 2005 07:43:42 +0200 hobbit (4.0-1) unstable; urgency=low * Upstream release of version 4.0 -- Henrik Stoerner Wed, 30 Mar 2005 21:31:03 +0200 debian/xymon-client.postinst0000664000000000000000000000637411772161051013436 0ustar #! /bin/sh # postinst script for hobbit # # see: dh_installdeb(1) # summary of how this script can be called: # * `configure' # * `abort-upgrade' # * `abort-remove' `in-favour' # # * `abort-deconfigure' `in-favour' # `removing' # # for details, see http://www.debian.org/doc/debian-policy/ or # the debian-policy package # . /usr/share/debconf/confmodule set -e # Workaround for http://bugs.debian.org/560317 in case debconf is too old like on Squeeze export DPKG_MAINTSCRIPT_PACKAGE=${DPKG_MAINTSCRIPT_PACKAGE:-xymon-client} export DPKG_MAINTSCRIPT_NAME=${DPKG_MAINTSCRIPT_NAME:-postinst} case "$1" in configure) # Create new group getent group xymon > /dev/null || addgroup --system xymon # Create or migrate user getent passwd xymon > /dev/null || adduser --system \ --home /var/lib/xymon --no-create-home \ --ingroup xymon --disabled-password --disabled-login \ --gecos "Xymon System Monitor" xymon if getent passwd hobbit > /dev/null; then for d in /etc/hobbit /etc/xymon /var/*/hobbit /var/*/xymon; do find $d -user hobbit -exec chown -c xymon '{}' +; done pkill -u hobbit vmstat deluser hobbit || echo "Couldn't delete user hobbit, please remove it manually" fi # Migrate old group if getent group hobbit > /dev/null; then for d in /etc/hobbit /etc/xymon /var/*/hobbit /var/*/xymon; do find $d -group hobbit -exec chgrp -c xymon '{}' +; done delgroup hobbit || echo "Couldn't delete group hobbit, please remove it manually" fi # Create or migrate directories test -d /var/run/hobbit -a ! -d /var/run/xymon && mv -v /var/run/hobbit /var/run/xymon || true test -d /var/run/xymon || mkdir /var/run/xymon chown xymon:xymon /var/run/xymon test -d /var/lib/xymon/tmp || mkdir /var/lib/xymon/tmp chown xymon:xymon /var/lib/xymon/tmp test -d /var/log/hobbit -a ! -d /var/log/xymon && mv -v /var/log/hobbit /var/log/xymon || true test -d /var/log/xymon || mkdir /var/log/xymon chown xymon:adm /var/log/xymon ; chmod 2755 /var/log/xymon # Do the debconf stuff db_get hobbit-client/HOBBITSERVERS HOBBITSERVERS="$RET" db_get hobbit-client/CLIENTHOSTNAME CLIENTHOSTNAME="$RET" db_stop # Update configuration file CONFIGFILE=/etc/default/xymon-client test -e $CONFIGFILE || cp /usr/share/xymon/xymon-client.default.template $CONFIGFILE if grep -Eq "^(HOBBIT|XYMON)SERVERS=" $CONFIGFILE ; then sed -i -e "s/^\(HOBBIT\|XYMON\)SERVERS=.*/XYMONSERVERS=\"$HOBBITSERVERS\"/" \ $CONFIGFILE else echo "XYMONSERVERS=\"$HOBBITSERVERS\"" >> $CONFIGFILE fi if grep -q "^CLIENTHOSTNAME=" $CONFIGFILE ; then sed -i -e "s/^CLIENTHOSTNAME=.*/CLIENTHOSTNAME=\"$CLIENTHOSTNAME\"/" \ $CONFIGFILE else echo "CLIENTHOSTNAME=\"$CLIENTHOSTNAME\"" >> $CONFIGFILE fi # Remove empty directories in /etc/hobbit and possibly /etc/hobbit itself. rmdir --ignore-fail-on-non-empty -pv /etc/hobbit/*/ || true ;; abort-upgrade|abort-remove|abort-deconfigure) ;; *) echo "postinst called with unknown argument \`$1'" >&2 exit 1 ;; esac #DEBHELPER# exit 0 debian/xymon.NEWS0000664000000000000000000000326011772175326011054 0ustar xymon (4.3.7-1) experimental; urgency=low This release moves Xymon's configuration from /etc/hobbit/ to /etc/xymon/ and renames quite some files. Additionally most configuration files have been renamed by upstream, too, to be more consistent. See Upstream's migration documentation available at /usr/share/doc/xymon/upgrade-to-430.txt.gz and /usr/share/doc/xymon/Renaming-430.txt.gz for details. The package should care about most of the file renaming but can't change the contents of files if they have been edited locally. One common case is /etc/apache2/conf.d/hobbit (now /etc/apache2/conf.d/xymon) which contains paths with hobbit in their name. Check /etc/apache2/conf.d/xymon.dpkg-new for how they should look like now. Unfortunately most configuration files need to be changed for the new paths and variable or directive names. Depending on the customization level of your setup, it's either easier to take the something.cfg.dpkg-new files and put in your customization or to take your old configuration files and change the paths and variable names. For changing paths and variable names in old configuration, upstream's migration tools have been installed into /usr/lib/xymon/server/libexec/. Nevertheless they are mostly untested in the context of Debian package and are installed primarily for reference purposes. -- Axel Beckert Tue, 26 Jun 2012 01:02:40 +0200 hobbit (4.2.0.dfsg-9) unstable; urgency=low This release adds Charles Goyard's splitncv patch. See hobbitd_rrd(8) and http://www.hswn.dk/hobbiton/2007/03/msg00368.html for more information. -- Christoph Berg Mon, 31 Dec 2007 10:47:56 +0100 debian/xymon-client.preinst0000664000000000000000000000121011772161051013217 0ustar #! /bin/sh # preinst script for xymon set -e # Workaround for http://bugs.debian.org/560317 in case debconf is too old like on Squeeze export DPKG_MAINTSCRIPT_PACKAGE=${DPKG_MAINTSCRIPT_PACKAGE:-xymon-client} export DPKG_MAINTSCRIPT_NAME=${DPKG_MAINTSCRIPT_NAME:-preinst} case "$1" in upgrade) # Stop any previously running old server or client before # migrating directories invoke-rc.d --quiet hobbit-client stop || true invoke-rc.d --quiet hobbit stop || true test -d /var/lib/hobbit -a ! -d /var/lib/xymon && mv -v /var/lib/hobbit /var/lib/xymon || true test -d /var/lib/xymon || mkdir /var/lib/xymon ;; esac #DEBHELPER# exit 0 debian/docs0000664000000000000000000000006411765775233010063 0ustar README README.CLIENT CREDITS RELEASENOTES docs/TODO debian/xymon-client.dirs0000664000000000000000000000016511765656133012520 0ustar etc/default etc/xymon/clientlaunch.d etc/xymon/xymonclient.d usr/bin usr/share/xymon var/lib/xymon/tmp var/log/xymon debian/xymon.maintscript0000664000000000000000000001556611772141646012647 0ustar mv_conffile /etc/apache2/conf.d/hobbit /etc/apache2/conf.d/xymon 4.3.7-1~~ xymon mv_conffile /etc/init.d/hobbit /etc/init.d/xymon 4.3.7-1~~ xymon mv_conffile /etc/hobbit/client-local.cfg /etc/xymon/client-local.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/columndoc.csv /etc/xymon/columndoc.csv 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbitserver.cfg /etc/xymon/xymonserver.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/acknowledge_header /etc/xymon/web/acknowledge_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/acknowledge_form /etc/xymon/web/acknowledge_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/columndoc_header /etc/xymon/web/columndoc_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/confreport_back /etc/xymon/web/confreport_back 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/confreport_footer /etc/xymon/web/confreport_footer 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/confreport_front /etc/xymon/web/confreport_front 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/confreport_header /etc/xymon/web/confreport_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/event_form /etc/xymon/web/event_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/event_header /etc/xymon/web/event_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/findhost_form /etc/xymon/web/findhost_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/findhost_header /etc/xymon/web/findhost_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/ghosts_header /etc/xymon/web/ghosts_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/graphs_header /etc/xymon/web/graphs_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hist_header /etc/xymon/web/hist_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/histlog_header /etc/xymon/web/histlog_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hostgraphs_form /etc/xymon/web/hostgraphs_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hostgraphs_header /etc/xymon/web/hostgraphs_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hostlist_form /etc/xymon/web/hostlist_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hostlist_header /etc/xymon/web/hostlist_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hostsvc_header /etc/xymon/web/hostsvc_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/info_header /etc/xymon/web/info_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/maint_form /etc/xymon/web/maint_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/maint_header /etc/xymon/web/maint_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/maintact_header /etc/xymon/web/maintact_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/notify_form /etc/xymon/web/notify_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/notify_footer /etc/xymon/web/notify_footer 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/notify_header /etc/xymon/web/notify_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/perfdata_form /etc/xymon/web/perfdata_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/perfdata_header /etc/xymon/web/perfdata_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/replog_header /etc/xymon/web/replog_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/report_form /etc/xymon/web/report_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/report_form_daily /etc/xymon/web/report_form_daily 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/report_form_monthly /etc/xymon/web/report_form_monthly 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/report_form_weekly /etc/xymon/web/report_form_weekly 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/report_header /etc/xymon/web/report_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/snapshot_form /etc/xymon/web/snapshot_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/snapshot_header /etc/xymon/web/snapshot_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/topchanges_form /etc/xymon/web/topchanges_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/topchanges_header /etc/xymon/web/topchanges_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/trends_form /etc/xymon/web/trends_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/useradm_form /etc/xymon/web/useradm_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/useradm_header /etc/xymon/web/useradm_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/zoom.js /etc/xymon/web/zoom.js 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbit-alerts.cfg /etc/xymon/alerts.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbit-nkview.cfg /etc/xymon/critical.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbit-nkview.cfg.bak /etc/xymon/critical.cfg.bak 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbitcgi.cfg /etc/xymon/cgioptions.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbitgraph.cfg /etc/xymon/graphs.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/bbcombotest.cfg /etc/xymon/combo.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hobbitnk_footer /etc/xymon/web/critical_footer 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/hobbitnk_header /etc/xymon/web/critical_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/menu.cfg /etc/xymon/xymonmenu.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbitlaunch.cfg /etc/xymon/tasks.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/bb-services /etc/xymon/protocols.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/hobbit-clients.cfg /etc/xymon/analysis.cfg 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bb_footer /etc/xymon/web/stdnormal_footer 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bb_header /etc/xymon/web/stdnormal_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bb2_header /etc/xymon/web/stdnongreen_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bbnk_header /etc/xymon/web/stdcritical_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bbsnap_header /etc/xymon/web/snapnormal_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bbsnap2_header /etc/xymon/web/snapnongreen_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bbsnapnk_header /etc/xymon/web/snapcritical_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/bbrep_header /etc/xymon/web/repnormal_header 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/nkack_form /etc/xymon/web/critack_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/nkedit_form /etc/xymon/web/critedit_form 4.3.7-1~~ xymon mv_conffile /etc/hobbit/web/nkedit_header /etc/xymon/web/critedit_header 4.3.7-1~~ xymon debian/patches/0000775000000000000000000000000012264570602010623 5ustar debian/patches/xymonnet-use-new-config-guess-sub0000664000000000000000000000122112264570602017162 0ustar Index: xymon-4.3.7/xymonnet/Makefile =================================================================== --- xymon-4.3.7.orig/xymonnet/Makefile 2011-08-19 07:26:58.000000000 -0400 +++ xymon-4.3.7/xymonnet/Makefile 2014-01-12 14:48:17.290907674 -0500 @@ -59,6 +59,8 @@ mv c-ares-$(ARESVER) c-ares # Must touch "configure", or it will trigger a rebuild because it is older than the tar.gz file. touch c-ares/configure + -cp /usr/share/misc/config.guess c-ares/. + -cp /usr/share/misc/config.sub c-ares/. beastat: $(BEASTATOBJS) ../lib/libxymon.a $(CC) $(CFLAGS) -o $@ $(RPATHOPT) $(BEASTATOBJS) ../lib/libxymon.a $(PCRELIBS) $(NETLIBS) $(LIBRTDEF) debian/patches/png-multiarch0000664000000000000000000000063311765656133013333 0ustar Description: tell the build script how to link to libpng Origin: vendor Forwarded: no Author: gregor herrmann Last-Update: 2011-12-26 --- a/build/rrd.sh +++ b/build/rrd.sh @@ -3,7 +3,7 @@ RRDDEF="" RRDINC="" RRDLIB="" - PNGLIB="" + PNGLIB="$(libpng12-config --ldflags)" ZLIB="" for DIR in /opt/rrdtool* /usr/local/rrdtool* /usr/local /usr /usr/pkg /opt/csw /opt/sfw /usr/sfw do debian/patches/hobbit-ghosts-menu0000664000000000000000000000046311765656133014300 0ustar --- a/web/ghostlist.sh.DIST +++ b/web/ghostlist.sh.DIST @@ -2,6 +2,9 @@ # This is the Xymon wrapper for the ghostlist CGI +include () { . $1 ; } . @XYMONHOME@/etc/cgioptions.cfg +. @XYMONHOME@/etc/xymonserver.cfg +export HOBBITMENU @RUNTIMEDEFS@ exec @XYMONHOME@/bin/ghostlist.cgi $CGI_GHOSTS_OPTS debian/patches/kfreebsd-makefile0000664000000000000000000000374311765703311014115 0ustar Add Makefile for GNU/kFreeBSD Index: xymon/build/Makefile.GNU_kFreeBSD =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ xymon/build/Makefile.GNU_kFreeBSD 2012-06-12 18:32:45.000000000 +0200 @@ -0,0 +1,27 @@ +# bbgen compile-time settings for GNU/kFreeBSD systems + +OSDEF = + +# NETLIBS: None needed on Linux +NETLIBS = + +# Compile flags for normal build +CC = gcc +CFLAGS += -Wall -Wno-unused -D_REENTRANT $(LFSDEF) $(OSDEF) + +ifndef PKGBUILD +RPATH = -Wl,--rpath, +endif + +# Compile flags for debugging +# CFLAGS = -g -DDEBUG -Wall -D_REENTRANT $(LFSDEF) $(OSDEF) + +# By default, Hobbit uses a static library for common code. +# To save some diskspace and run-time memory, you can use a +# shared library by un-commenting this. +# HOBBITLIBRARY=libhobbit.so + +# Mail program: This must support "CMD -s SUBJECT ADDRESS" to send out a mail with a subject +# Typically, this will be "mail" or "mailx" +MAILPROGRAM="mail" + Index: xymon/configure.server =================================================================== --- xymon.orig/configure.server 2012-06-12 18:32:39.000000000 +0200 +++ xymon/configure.server 2012-06-12 18:32:45.000000000 +0200 @@ -483,16 +483,17 @@ echo "LFSDEF = $LFS" >>Makefile echo "" >>Makefile -if test -r build/Makefile.`uname -s` +if test -r build/Makefile.`uname -s | tr '/' '_'` then - echo "include build/Makefile.`uname -s`" >>Makefile + # use sinclude here so "clean" works even when build/Makefile.GNU_kFreeBSD is not patched yet + echo "sinclude build/Makefile.`uname -s | tr '/' '_'`" >>Makefile echo "" - echo "Using `uname -s` Makefile settings" + echo "Using `uname -s | tr '/' '_'` Makefile settings" echo "" else echo "include build/Makefile.generic" >>Makefile echo "" - echo "Using GENERIC Makefile settings" + echo "Using GENERIC Makefile settings (uname -s is `uname -s`)" echo "" echo "If this fails, change the compile settings in Makefile" echo "" debian/patches/bbcombotest-fix0000664000000000000000000000117211765656133013647 0ustar Index: xymon/xymond/combostatus.c =================================================================== --- xymon.orig/xymond/combostatus.c 2011-09-30 01:03:29.000000000 +0200 +++ xymon/xymond/combostatus.c 2011-09-30 01:04:05.000000000 +0200 @@ -208,7 +208,7 @@ xymondresult = sendmessage("xymondboard fields=hostname,testname,color", NULL, XYMON_TIMEOUT, sres); board = getsendreturnstr(sres, 1); - if ((xymondresult != XYMONSEND_OK) || (board == NULL)) { + if (xymondresult != XYMONSEND_OK) { board = ""; *errptr += sprintf(*errptr, "Could not access xymond board, error %d\n", xymondresult); return COL_CLEAR; debian/patches/526176-ldap0000664000000000000000000000331311765656133012247 0ustar From: dann frazier To: submit@bugs.debian.org Subject: #526176: xymon: ldap_init implicitly converted to pointer Date: Wed, 29 Apr 2009 12:18:00 -0600 Package: xymon Version: 4.3.0~beta2.dfsg-1 Severity: serious Tags: patch Usertags: implicit-pointer-conversion Our automated buildd log filter[1] detected a problem that is likely to cause your package to segfault on architectures where the size of a pointer is greater than the size of an integer, such as ia64 and amd64. Function `ldap_init' implicitly converted to pointer at test-ldap.c:25 This is often due to a missing function prototype definition. For more information, see [2]. Though it is guaranteed that this codepath will cause a segfault on certain architectures, it is not guaranteed that this codepath would ever be executed (e.g., if the returned pointer is never dereferenced). However, this bug does prevent the ia64 buildd from successfully building this package, resulting in a practical FTBFS issue and warranting the serious severity. The libldap API has been updated and many functions used by the ldap plugin are now deprecated. This package should either update to the new API or define LDAP_DEPRECATED to continue using the deprecated interfaces. This patch implements the lazy solution. [1] http://people.debian.org/~dannf/check-implicit-pointer-functions [2] http://wiki.debian.org/ImplicitPointerConversions --- orig-xymon-4.3.0~beta2.dfsg/build/test-ldap.c 2009-02-12 06:00:50.000000000 -0700 +++ xymon-4.3.0~beta2.dfsg/build/test-ldap.c 2009-04-29 12:13:07.387783442 -0600 @@ -1,6 +1,7 @@ #include #include +#define LDAP_DEPRECATED 1 #include #include debian/patches/fix-spelling-errors0000664000000000000000000031031111766623247014472 0ustar Fixes tons of spelling errors found by lintian initally and then later by grep. Index: xymon/docs/install.html =================================================================== --- xymon.orig/docs/install.html 2012-06-15 13:07:38.000000000 +0200 +++ xymon/docs/install.html 2012-06-15 13:41:49.000000000 +0200 @@ -20,7 +20,7 @@

Prerequisites - before you install Xymon

There are a few things you should check before you begin to install Xymon. -Dont be scared of the number of items here - it is likely that you already have +Don't be scared of the number of items here - it is likely that you already have most or all of it in place.

A webbrowser capable of handling HTML 4, JavaScript and CSS

@@ -34,10 +34,10 @@ IPC mechanisms (shared memory, semaphores) - that should be just about anything Unix-like you are likely to have.

-

Sufficient SYSV IPC ressources on your system

+

Sufficient SYSV IPC resources on your system

Xymon uses 8 shared memory segments, ranging in size from 32 KB to 512 KB (2336 KB total) in the default configuration; and 8 sets of 3 semaphores. Experience shows that -some systems need tuning to provide the necessary IPC ressources that Xymon uses. +some systems need tuning to provide the necessary IPC resources that Xymon uses. Specifically, when installing on Solaris you must increase the "shmseg" kernel parameter from the default 6 to at least 8. Since other programs on your system may also use shared memory, a higher value may be required. See http://www.xymon.com/archive/2005/08/msg00183.html for more information about these issues.

Index: xymon/docs/known-issues.html =================================================================== --- xymon.orig/docs/known-issues.html 2012-06-12 17:12:06.000000000 +0200 +++ xymon/docs/known-issues.html 2012-06-15 13:12:18.000000000 +0200 @@ -84,7 +84,7 @@

Xymon fails on FreeBSD with "Could not get sem: No space left on device"

-

Xymon uses some kernel ressources - semaphores and shared memory. +

Xymon uses some kernel resources - semaphores and shared memory. If you get the following error message in xymonlaunch.log when trying to start Xymon:


Index: xymon/docs/manpages/man8/xymonproxy.8.html
===================================================================
--- xymon.orig/docs/manpages/man8/xymonproxy.8.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man8/xymonproxy.8.html	2012-06-15 14:09:29.000000000 +0200
@@ -68,7 +68,7 @@
 

 
--listen=LOCALIP[:PORT]

 Specifies the IP-adress where xymonproxy listens for incoming 
-connections. By default, xymonproxy listens on all IP-adresses
+connections. By default, xymonproxy listens on all IP-addresses
 assigned to the host. If no portnumber is given, port 1984
 will be used.
 

@@ -89,18 +89,18 @@
 
--lqueue=N

 Size of the listen-queue where incoming connections can
 queue up before being processed. This should be large to
-accomodate bursts of activity from clients. Default: 512.
+accommodate bursts of activity from clients. Default: 512.
 

 
--daemon

-Run in daemon mode, i.e. detach and run as a background proces.
+Run in daemon mode, i.e. detach and run as a background process.
 This is the default.
 

 
--no-daemon

-Runs xymonproxy as a foreground proces.
+Runs xymonproxy as a foreground process.
 

 
--pidfile=FILENAME

-Specifies the location of a file containing the proces-ID 
-of the xymonproxy daemon proces. Default: /var/run/xymonproxy.pid.
+Specifies the location of a file containing the process-ID 
+of the xymonproxy daemon process. Default: /var/run/xymonproxy.pid.
 

 
--logfile=FILENAME

 Sends all logging output to the specified file instead of stderr.
@@ -108,7 +108,7 @@
 
--log-details

 Log details (IP-address, message type and hostname) to the logfile.
 This can also be enabled and disabled at run-time by sending the
-xymonproxy proces a SIGUSR1 signal.
+xymonproxy process a SIGUSR1 signal.
 

 
--debug

 Enable debugging output.
@@ -150,13 +150,13 @@
 The number of other messages (data, notes, ack, query, ...)
 messages received from a client.
 

-
Proxy ressources - Connection table size

+
Proxy resources - Connection table size

 This is the number of connection table slots in the proxy.
 This measures the number of simultaneously active requests
 that the proxy has handled, and so gives an idea about the
 peak number of clients that the proxy has handled simultaneously.
 

-
Proxy ressources - Buffer space

+
Proxy resources - Buffer space

 This is the number of KB memory allocated for network buffers.
 

 
Timeout details - reading from client

Index: xymon/docs/xymon-mrtg.html
===================================================================
--- xymon.orig/docs/xymon-mrtg.html	2012-06-12 17:12:06.000000000 +0200
+++ xymon/docs/xymon-mrtg.html	2012-06-15 13:12:29.000000000 +0200
@@ -19,7 +19,7 @@
 
Simple Xymon-MRTG support

 
MRTG by default uses its own fileformat for the data files, and 
 continuously generates PNG- or GIF-images of the data. This is a 
-waste of ressources - most of the time, these images are never seen.
+waste of resources - most of the time, these images are never seen.
 This was in fact one of the reasons that RRDtool was developed, to
 separate the data-collection from the graph generation.

 
Index: xymon/xymonproxy/xymonproxy.8
===================================================================
--- xymon.orig/xymonproxy/xymonproxy.8	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymonproxy/xymonproxy.8	2012-06-15 14:02:39.000000000 +0200
@@ -48,7 +48,7 @@
 
 .IP "--listen=LOCALIP[:PORT]"
 Specifies the IP-adress where xymonproxy listens for incoming 
-connections. By default, xymonproxy listens on all IP-adresses
+connections. By default, xymonproxy listens on all IP-addresses
 assigned to the host. If no portnumber is given, port 1984
 will be used.
 
@@ -69,18 +69,18 @@
 .IP "--lqueue=N"
 Size of the listen-queue where incoming connections can
 queue up before being processed. This should be large to
-accomodate bursts of activity from clients. Default: 512.
+accommodate bursts of activity from clients. Default: 512.
 
 .IP "--daemon"
-Run in daemon mode, i.e. detach and run as a background proces.
+Run in daemon mode, i.e. detach and run as a background process.
 This is the default.
 
 .IP "--no-daemon"
-Runs xymonproxy as a foreground proces.
+Runs xymonproxy as a foreground process.
 
 .IP "--pidfile=FILENAME"
-Specifies the location of a file containing the proces-ID 
-of the xymonproxy daemon proces. Default: /var/run/xymonproxy.pid.
+Specifies the location of a file containing the process-ID 
+of the xymonproxy daemon process. Default: /var/run/xymonproxy.pid.
 
 .IP "--logfile=FILENAME"
 Sends all logging output to the specified file instead of stderr.
@@ -88,7 +88,7 @@
 .IP "--log-details"
 Log details (IP-address, message type and hostname) to the logfile.
 This can also be enabled and disabled at run-time by sending the
-xymonproxy proces a SIGUSR1 signal.
+xymonproxy process a SIGUSR1 signal.
 
 .IP "--debug"
 Enable debugging output.
@@ -126,13 +126,13 @@
 The number of other messages (data, notes, ack, query, ...)
 messages received from a client.
 
-.IP "Proxy ressources - Connection table size"
+.IP "Proxy resources - Connection table size"
 This is the number of connection table slots in the proxy.
 This measures the number of simultaneously active requests
 that the proxy has handled, and so gives an idea about the
 peak number of clients that the proxy has handled simultaneously.
 
-.IP "Proxy ressources - Buffer space"
+.IP "Proxy resources - Buffer space"
 This is the number of KB memory allocated for network buffers.
 
 .IP "Timeout details - reading from client"
Index: xymon/xymonproxy/xymonproxy.c
===================================================================
--- xymon.orig/xymonproxy/xymonproxy.c	2012-06-12 17:12:06.000000000 +0200
+++ xymon/xymonproxy/xymonproxy.c	2012-06-15 14:02:46.000000000 +0200
@@ -241,7 +241,7 @@
 	unsigned long msgs_recovered = 0;
 	struct timespec timeinqueue = { 0, 0 };
 
-	/* Dont save the output from errprintf() */
+	/* Don'T save the output from errprintf() */
 	save_errbuf = 0;
 
 	memset(&laddr, 0, sizeof(laddr));
@@ -354,7 +354,7 @@
 			printf("\t--lqueue=N                  : Listen-queue size\n");
 			printf("\t--daemon                    : Run as a daemon\n");
 			printf("\t--no-daemon                 : Do not run as a daemon\n");
-			printf("\t--pidfile=FILENAME          : Save proces-ID of daemon to FILENAME\n");
+			printf("\t--pidfile=FILENAME          : Save process-ID of daemon to FILENAME\n");
 			printf("\t--logfile=FILENAME          : Log to FILENAME instead of stderr\n");
 			printf("\t--debug                     : Enable debugging output\n");
 			printf("\n");
@@ -491,7 +491,7 @@
 			}
 
 			p = stentry->buf;
-			p += sprintf(p, "combo\nstatus %s green %s Proxy up %s\n\nxymonproxy for Xymon version %s\n\nProxy statistics\n\nIncoming messages        : %10lu (%lu msgs/second)\nOutbound messages        : %10lu\n\nIncoming message distribution\n- Combo messages         : %10lu\n- Status messages        : %10lu\n  Messages merged        : %10lu\n  Resulting combos       : %10lu\n- Other messages         : %10lu\n\nProxy ressources\n- Connection table size  : %10d\n- Buffer space           : %10lu kByte\n",
+			p += sprintf(p, "combo\nstatus %s green %s Proxy up %s\n\nxymonproxy for Xymon version %s\n\nProxy statistics\n\nIncoming messages        : %10lu (%lu msgs/second)\nOutbound messages        : %10lu\n\nIncoming message distribution\n- Combo messages         : %10lu\n- Status messages        : %10lu\n  Messages merged        : %10lu\n  Resulting combos       : %10lu\n- Other messages         : %10lu\n\nProxy resources\n- Connection table size  : %10d\n- Buffer space           : %10lu kByte\n",
 				proxyname, timestamp, runtime_s, VERSION,
 				msgs_total, (msgs_total - msgs_total_last) / (now - laststatus),
 				msgs_delivered,
@@ -665,7 +665,7 @@
 							currmsg = nextmsg;
 						} while (currmsg);
 
-						/* We dont do anymore with this conn_t */
+						/* We don't do anymore with this conn_t */
 						cwalk->state = P_CLEANUP;
 						break;
 					}
Index: xymon/docs/manpages/man1/xymonnet.1.html
===================================================================
--- xymon.orig/docs/manpages/man1/xymonnet.1.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man1/xymonnet.1.html	2012-06-15 13:24:26.000000000 +0200
@@ -115,7 +115,7 @@
 deprecated and should not be used.
 

 
--dns=[ip|only|standard]

-Determines how xymonnet finds the IP adresses of the hosts to test. 
+Determines how xymonnet finds the IP addresses of the hosts to test. 
 By default (the "standard"), xymonnet does a DNS lookup of the hostname 
 to determine the IP address, unless the host has the "testip" 
 tag, or the DNS lookup fails.
@@ -281,7 +281,7 @@
 
 

 
-If not specifed, xymonnet uses the CONNTEST environment
+If not specified, xymonnet uses the CONNTEST environment
 variable to determine if it should perform the ping test
 or not. So if you prefer to use another tool to implement 
 ping checks, either set the CONNTEST environment variable 
@@ -587,7 +587,7 @@
 
 In practice, the maximum size of a single Xymon message
 sets a limit - the default value for the maximum message
-size is 32 KB, but that will easily accomodate 100 status
+size is 32 KB, but that will easily accommodate 100 status
 messages per transmission. So if you want to experiment
 with this setting, I suggest starting with a value of 10.
 

Index: xymon/xymond/xymond.c
===================================================================
--- xymon.orig/xymond/xymond.c	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymond/xymond.c	2012-06-15 13:37:01.000000000 +0200
@@ -62,7 +62,7 @@
 #define DISABLED_UNTIL_OK -1
 
 /*
- * The absolute maximum size we'll grow our buffers to accomodate an incoming message.
+ * The absolute maximum size we'll grow our buffers to accommodate an incoming message.
  * This is really just an upper bound to squash the bad guys trying to data-flood us. 
  */
 #define MAX_XYMON_INBUFSZ (10*1024*1024)	/* 10 MB */
@@ -1004,7 +1004,7 @@
 {
 	/*
 	 * This routine takes care of finding existing status log records, or
-	 * (if they dont exist) creating new ones for an incoming status.
+	 * (if they don't exist) creating new ones for an incoming status.
 	 *
 	 * "msg" contains an incoming message. First list is of the form "KEYWORD host,domain.test COLOR"
 	 */
@@ -1053,7 +1053,7 @@
 	colstr = strtok(NULL, " \t"); /* ... and the color (if any) */
 	if (colstr) {
 		*color = parse_color(colstr);
-		/* Dont create log-entries if we get a bad color spec. */
+		/* Don't create log-entries if we get a bad color spec. */
 		if (*color == -1) createlog = 0;
 	}
 	else createlog = 0;
@@ -1262,7 +1262,7 @@
 	if (!modifyonly && log->modifiers) {
 		/*
 		 * Original status message - check if there is an active modifier for the color.
-		 * We dont do this for status changes triggered by a "modify" command.
+		 * We don't do this for status changes triggered by a "modify" command.
 		 */
 		modifier_t *mwalk;
 		int mcolor = -1;
@@ -1375,7 +1375,7 @@
 		}
 
 		if (log->acktime > now) {
-			/* Dont need to do anything about an acked test */
+			/* Don't need to do anything about an acked test */
 		}
 		else {
 			/* The acknowledge has expired. Clear the timestamp and the message buffer */
@@ -1588,7 +1588,7 @@
 		log->histsynced = 1;
 
 		/*
-		 * Dont update the log->lastchange timestamp while DOWNTIME is active.
+		 * Don't update the log->lastchange timestamp while DOWNTIME is active.
 		 * (It is only seen as active if the color has been forced BLUE).
 		 */
 		if (!log->downtimeactive && (log->oldcolor != newcolor)) {
@@ -1738,7 +1738,7 @@
 		 *
 		 * We must determine the color based ONLY on the modifications that
 		 * have been reported.
-		 * The reason we dont include the original status color in the scan
+		 * The reason we don't include the original status color in the scan
 		 * is because the modifiers override the original status - and they
 		 * can make it both worse (green -> red) or better (red -> green).
 		 *
@@ -2030,7 +2030,7 @@
 			newack = (ackinfo_t *)malloc(sizeof(ackinfo_t));
 		}
 		else {
-			/* Drop the old data so we dont leak memory */
+			/* Drop the old data so we don't leak memory */
 			dbgprintf("Dropping old ackinfo data: From %s, msg=%s\n", newack->ackedby, newack->msg);
 			if (newack->ackedby) xfree(newack->ackedby); 
 			if (newack->msg) xfree(newack->msg);
@@ -3187,7 +3187,7 @@
 		}
 
 		/* 
-		 * We dont validate the ID, because "notes" may also send messages
+		 * We don't validate the ID, because "notes" may also send messages
 		 * for documenting pages or column-names. And the "usermsg" stuff can be
 		 * anything in the "ID" field. So we just insist that there IS an ID.
 		 */
Index: xymon/xymond/xymond_worker.c
===================================================================
--- xymon.orig/xymond/xymond_worker.c	2012-06-12 17:12:06.000000000 +0200
+++ xymon/xymond/xymond_worker.c	2012-06-15 13:38:06.000000000 +0200
@@ -389,7 +389,7 @@
 		/* idlemsg is used to return the idle message in case of timeouts. */
 		idlemsg = strdup("@@idle\n");
 
-		/* We dont want to block when reading data. */
+		/* We don't want to block when reading data. */
 		fcntl(inputfd, F_SETFL, O_NONBLOCK);
 	}
 
@@ -414,7 +414,7 @@
 			endpos = NULL;
 		}
 
-		seqnum = 0; /* After skipping, we dont know what to expect */
+		seqnum = 0; /* After skipping, we don't know what to expect */
 	}
 
 startagain:
@@ -472,7 +472,7 @@
 
 		if (needmoredata) {
 			if (maymove && (bufleft < EXTRABUFSPACE)) {
-				/* Buffer is almost full - move data to accomodate a large message. */
+				/* Buffer is almost full - move data to accommodate a large message. */
 				dbgprintf("Moving %d bytes to start of buffer\n", usedbytes);
 				memmove(buf, startpos, usedbytes);
 				startpos = buf;
@@ -585,7 +585,7 @@
 	if (!locatorid) {
 		/* 
 		 * Get and check the message sequence number.
-		 * We dont do this for network based workers, since the
+		 * We don't do this for network based workers, since the
 		 * sequence number is globally generated (by xymond)
 		 * but a network-based worker may only see some of the
 		 * messages (those that are not handled by other network-based
Index: xymon/xymonnet/xymonnet.1
===================================================================
--- xymon.orig/xymonnet/xymonnet.1	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymonnet/xymonnet.1	2012-06-15 13:24:19.000000000 +0200
@@ -90,7 +90,7 @@
 deprecated and should not be used.
 
 .IP --dns=[ip|only|standard]
-Determines how xymonnet finds the IP adresses of the hosts to test. 
+Determines how xymonnet finds the IP addresses of the hosts to test. 
 By default (the "standard"), xymonnet does a DNS lookup of the hostname 
 to determine the IP address, unless the host has the "testip" 
 tag, or the DNS lookup fails.
@@ -236,7 +236,7 @@
 variable in 
 .I xymonserver.cfg(5).
 .br
-If not specifed, xymonnet uses the CONNTEST environment
+If not specified, xymonnet uses the CONNTEST environment
 variable to determine if it should perform the ping test
 or not. So if you prefer to use another tool to implement 
 ping checks, either set the CONNTEST environment variable 
@@ -499,7 +499,7 @@
 .br
 In practice, the maximum size of a single Xymon message
 sets a limit - the default value for the maximum message
-size is 32 KB, but that will easily accomodate 100 status
+size is 32 KB, but that will easily accommodate 100 status
 messages per transmission. So if you want to experiment
 with this setting, I suggest starting with a value of 10.
 
Index: xymon/docs/manpages/man1/report.cgi.1.html
===================================================================
--- xymon.orig/docs/manpages/man1/report.cgi.1.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man1/report.cgi.1.html	2012-06-15 13:17:36.000000000 +0200
@@ -22,7 +22,7 @@
 report.cgi
 is invoked as a CGI script via the report.sh CGI wrapper.
 It triggers the generation of a Xymon availability
-report for the timeperiod specified by the CGI paramaters.
+report for the timeperiod specified by the CGI parameters.
 

 report.cgi is passed a QUERY_STRING environment variable with the
 following parameters:
Index: xymon/docs/manpages/man8/xymond.8.html
===================================================================
--- xymon.orig/docs/manpages/man8/xymond.8.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man8/xymond.8.html	2012-06-15 13:21:48.000000000 +0200
@@ -81,7 +81,7 @@
 
--listen=IP[:PORT]

 Specifies the IP-address and port where xymond will listen for incoming
 connections. By default, xymond listens on IP 0.0.0.0 (i.e. all IP-
-adresses available on the host) and port 1984.
+addresses available on the host) and port 1984.
 

 
--daemon

 xymond is normally started by 
@@ -146,7 +146,7 @@
 are pushed to the CLICHG channel. If this option is specified with
 no parameter list, all status columns that go into an alert state
 will trigger the client data to be sent to the CLICHG channel. If
-a paramater list is added to this option, only those status columns
+a parameter list is added to this option, only those status columns
 listed in the list will cause the client data to be sent to the
 CLICHG channel. Several column names can be listed, separated by
 commas. If all columns are given as "!COLUMNNAME", then all status
@@ -158,12 +158,12 @@
 

 By default, any host can send status-updates. If this option is used, 
 then status-updates are accepted only if they are sent by one of the 
-IP-adresses listed here, or if they are sent from the IP-address of the 
+IP-addresses listed here, or if they are sent from the IP-address of the 
 host that the updates pertains to (this is to allow Xymon clients to send in their
 own status updates, without having to list all clients here). So typically
 you will need to list your servers running network tests here.
 

-The format of this option is a list of IP-adresses, optionally with a
+The format of this option is a list of IP-addresses, optionally with a
 network mask in the form of the number of bits. E.g. if you want to 
 accept status-updates from the host 172.16.10.2, you would use
 

Index: xymon/docs/manpages/man8/xymond_alert.8.html
===================================================================
--- xymon.orig/docs/manpages/man8/xymond_alert.8.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man8/xymond_alert.8.html	2012-06-15 13:17:42.000000000 +0200
@@ -82,7 +82,7 @@
 
 --group=GROUPNAME
 
-The GROUPNAME paramater is a groupid string from the analysis.cfg
+The GROUPNAME parameter is a groupid string from the analysis.cfg
 file.
 

 
Index: xymon/web/report.cgi.1
===================================================================
--- xymon.orig/web/report.cgi.1	2012-06-12 17:12:22.000000000 +0200
+++ xymon/web/report.cgi.1	2012-06-15 13:16:39.000000000 +0200
@@ -8,7 +8,7 @@
 \fBreport.cgi\fR
 is invoked as a CGI script via the report.sh CGI wrapper.
 It triggers the generation of a Xymon availability
-report for the timeperiod specified by the CGI paramaters.
+report for the timeperiod specified by the CGI parameters.
 
 report.cgi is passed a QUERY_STRING environment variable with the
 following parameters:
Index: xymon/xymond/xymond.8
===================================================================
--- xymon.orig/xymond/xymond.8	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymond/xymond.8	2012-06-15 13:20:45.000000000 +0200
@@ -63,7 +63,7 @@
 .IP "--listen=IP[:PORT]"
 Specifies the IP-address and port where xymond will listen for incoming
 connections. By default, xymond listens on IP 0.0.0.0 (i.e. all IP-
-adresses available on the host) and port 1984.
+addresses available on the host) and port 1984.
 
 .IP "--daemon"
 xymond is normally started by 
@@ -126,7 +126,7 @@
 are pushed to the CLICHG channel. If this option is specified with
 no parameter list, all status columns that go into an alert state
 will trigger the client data to be sent to the CLICHG channel. If
-a paramater list is added to this option, only those status columns
+a parameter list is added to this option, only those status columns
 listed in the list will cause the client data to be sent to the
 CLICHG channel. Several column names can be listed, separated by
 commas. If all columns are given as "!COLUMNNAME", then all status
@@ -138,12 +138,12 @@
 
 By default, any host can send status-updates. If this option is used, 
 then status-updates are accepted only if they are sent by one of the 
-IP-adresses listed here, or if they are sent from the IP-address of the 
+IP-addresses listed here, or if they are sent from the IP-address of the 
 host that the updates pertains to (this is to allow Xymon clients to send in their
 own status updates, without having to list all clients here). So typically
 you will need to list your servers running network tests here.
 
-The format of this option is a list of IP-adresses, optionally with a
+The format of this option is a list of IP-addresses, optionally with a
 network mask in the form of the number of bits. E.g. if you want to 
 accept status-updates from the host 172.16.10.2, you would use
 .br
Index: xymon/xymond/xymond_alert.8
===================================================================
--- xymon.orig/xymond/xymond_alert.8	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymond/xymond_alert.8	2012-06-15 13:17:14.000000000 +0200
@@ -56,7 +56,7 @@
 The SECONDS parameter is the duration of the alert in seconds. 
 .br
 .BI "--group=GROUPNAME"
-The GROUPNAME paramater is a groupid string from the analysis.cfg
+The GROUPNAME parameter is a groupid string from the analysis.cfg
 file.
 .br
 .BI "--time=TIMESTRING"
Index: xymon/xymond/xymond_sample.c
===================================================================
--- xymon.orig/xymond/xymond_sample.c	2012-06-12 17:12:06.000000000 +0200
+++ xymon/xymond/xymond_sample.c	2012-06-15 13:36:08.000000000 +0200
@@ -52,7 +52,7 @@
 			 * You can have a timeout when waiting for new
 			 * messages. If it happens, you will get a "@@idle\n"
 			 * message with sequence number 0.
-			 * If you dont want a timeout, just pass a NULL for the timeout parameter.
+			 * If you don't want a timeout, just pass a NULL for the timeout parameter.
 			 */
 			timeout = (struct timespec *)(malloc(sizeof(struct timespec)));
 			timeout->tv_sec = (atoi(argv[argi]+10));
@@ -89,8 +89,8 @@
 		 * All messages have a sequence number ranging from 1-999999.
 		 *
 		 *
-		 * The first paramater is the channel you're handling - this is used
-		 * to determine the needed input buffer size. If you dont know what
+		 * The first parameter is the channel you're handling - this is used
+		 * to determine the needed input buffer size. If you don't know what
 		 * channel you're handling, use C_LAST and you'll get a buffer large
 		 * enough for the largest channel.
 		 *
Index: xymon/README
===================================================================
--- xymon.orig/README	2012-06-12 17:12:05.000000000 +0200
+++ xymon/README	2012-06-15 13:22:24.000000000 +0200
@@ -82,7 +82,7 @@
 
 or on the web http://lists.xymon.com/mailman/listinfo/xymon
 
-Please note that mail sent from adresses that are not subscribed
+Please note that mail sent from addresses that are not subscribed
 to the list need to go through a moderator approval, and therefore
 may not show up on the list for some time.
 
Index: xymon/RELEASENOTES
===================================================================
--- xymon.orig/RELEASENOTES	2012-06-12 17:12:22.000000000 +0200
+++ xymon/RELEASENOTES	2012-06-15 13:20:01.000000000 +0200
@@ -210,8 +210,8 @@
 Modem-bank testing ("dialup" host definition) does not work
 ===========================================================
 Previous versions of Xymon supported the Big Brother "dialup"
-host definition for pinging a range of IP-adresses, e.g. a
-modem-bank or a pool of IP-adresses handed out by a DHCP server.
+host definition for pinging a range of IP-addresses, e.g. a
+modem-bank or a pool of IP-addresses handed out by a DHCP server.
 This feature is not supported in Xymon 4.2, but may re-appear
 in a different form in a later version.
 (Note: This has nothing to do with the "dialup" directive 
Index: xymon/client/localclient.cfg
===================================================================
--- xymon.orig/client/localclient.cfg	2012-06-15 13:07:39.000000000 +0200
+++ xymon/client/localclient.cfg	2012-06-15 14:00:37.000000000 +0200
@@ -257,7 +257,7 @@
 #             the output from netstat. This is typically "10.0.0.1:80" for the IP 
 #             10.0.0.1, port 80. Or "*:80" for any local address, port 80.
 #             NB: The Xymon clients normally report only the numeric data for
-#                 IP-adresses and port-numbers, so you must specify the port
+#                 IP-addresses and port-numbers, so you must specify the port
 #                 number (e.g. "80") instead of the service name ("www").
 #             "state" causes only the sockets in the specified state to be included;
 #             it is usually LISTEN or ESTABLISHED.
@@ -312,7 +312,7 @@
 # located in the hosts.cfg file, via the hosts' page/subpage/subparent
 # directives. This can be convenient to pick out all hosts on a specific page.
 #
-# Rules can be dependant on time-of-day, using the standard Xymon syntax 
+# Rules can be dependent on time-of-day, using the standard Xymon syntax 
 # (the hosts.cfg(5) about the NKTIME parameter). E.g. "TIME=W:0800:2200"
 # applied to a rule will make this rule active only on week-days between
 # 8AM and 10PM.
Index: xymon/common/hosts.cfg.5
===================================================================
--- xymon.orig/common/hosts.cfg.5	2012-06-15 13:07:39.000000000 +0200
+++ xymon/common/hosts.cfg.5	2012-06-15 13:22:01.000000000 +0200
@@ -103,11 +103,11 @@
 on other hosts as well.
 
 .IP multihomed
-Tell Xymon that data from the host can arrive from multiple IP-adresses.
+Tell Xymon that data from the host can arrive from multiple IP-addresses.
 By default, Xymon will warn if it sees data for one host coming from
-different IP-adresses, because this usually indicates a mis-configuration
+different IP-addresses, because this usually indicates a mis-configuration
 of the hostname on at least one of the servers involved. Some hosts
-with multiple IP-adresses may use different IP's for sending data to
+with multiple IP-addresses may use different IP's for sending data to
 Xymon, however. This tag disables the check of source IP when receiving
 data.
 
@@ -723,9 +723,9 @@
 decides the testname for the connectivity test.
 
 .IP "conn={best,|worst,}IP1[,IP2...]"
-This adds additional IP-adresses that are pinged during the
+This adds additional IP-addresses that are pinged during the
 normal "conn" test. So the normal "conn" test must be enabled
-(the default) before this tag has any effect. The IP-adresses
+(the default) before this tag has any effect. The IP-addresses
 listed here are pinged in addition to the main IP-address.
 
 When multiple IP's are pinged, you can choose if ALL IP's
Index: xymon/common/xymonclient.cfg.5
===================================================================
--- xymon.orig/common/xymonclient.cfg.5	2012-06-12 17:12:22.000000000 +0200
+++ xymon/common/xymonclient.cfg.5	2012-06-15 13:22:13.000000000 +0200
@@ -15,7 +15,7 @@
 Chosen when the Xymon client was compiled.
 
 .IP XYMSERVERS
-List of IP-adresses of Xymon servers. Data will be sent to
+List of IP-addresses of Xymon servers. Data will be sent to
 all of the servers listed here. This setting is only used if 
 XYMSRV=0.0.0.0.
 
Index: xymon/common/xymonserver.cfg.5
===================================================================
--- xymon.orig/common/xymonserver.cfg.5	2012-06-12 17:12:22.000000000 +0200
+++ xymon/common/xymonserver.cfg.5	2012-06-15 13:24:30.000000000 +0200
@@ -341,9 +341,9 @@
 Default: $XYMONSERVERIP
 
 .IP XYMSERVERS
-List of IP-adresses. Clients and network test tools will try to
+List of IP-addresses. Clients and network test tools will try to
 send status reports to a Xymon server running on each of these
-adresses. This setting is only used if XYMSRV=0.0.0.0.
+addresses. This setting is only used if XYMSRV=0.0.0.0.
 
 .IP XYMONDPORT
 The portnumber for used to contact the
@@ -665,7 +665,7 @@
 the maximum number of rows before repeating the column headings
 on a webpage. This sets the default value for the 
 .I xymongen(1)
-"--maxrows" option; if the command-line option is also specifed,
+"--maxrows" option; if the command-line option is also specified,
 then it overrides this environment variable. Note that unlike
 Jeff's patch, xymongen implements this for both the "All non-green" 
 page and all other pages (xymon.html, subpages, critical.html). 
Index: xymon/docs/manpages/man1/xymonping.1.html
===================================================================
--- xymon.orig/docs/manpages/man1/xymonping.1.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man1/xymonping.1.html	2012-06-15 14:00:34.000000000 +0200
@@ -13,7 +13,7 @@
  
 
SYNOPSIS

 
-xymonping [--retries=N] [--timeout=N] [IP-adresses]
+xymonping [--retries=N] [--timeout=N] [IP-addresses]
 
 

  
@@ -24,18 +24,18 @@
 is used for ping testing of the hosts monitored by the
 xymon(7)
 
-monitoring system. It reads a list of IP adresses from stdin,
+monitoring system. It reads a list of IP addresses from stdin,
 and performs a "ping" check to see if these hosts are alive.
 It is normally invoked by the
 xymonnet(1)
 
 utility, which performs all of the Xymon network tests.
 

-Optionally, if a list of IP-adresses is passed as command-line
+Optionally, if a list of IP-addresses is passed as command-line
 arguments, it will ping those IP's instead of reading them 
 from stdin.
 

-xymonping only handles IP-adresses, not hostnames.
+xymonping only handles IP-addresses, not hostnames.
 

 xymonping was inspired by the
 fping(1)
@@ -46,10 +46,10 @@
 of "fping -Ae".
 

 xymonping probes multiple systems in parallel, and the runtime
-is therefore mostly dependant on the timeout-setting and the
+is therefore mostly dependent on the timeout-setting and the
 number of retries. With the default options, xymonping takes
 approximately 18 seconds to ping all hosts (tested with an
-input set of 1500 IP adresses).
+input set of 1500 IP addresses).
 

  
 
SUID-ROOT INSTALLATION REQUIRED

Index: xymon/docs/manpages/man5/analysis.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/analysis.cfg.5.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man5/analysis.cfg.5.html	2012-06-15 13:42:16.000000000 +0200
@@ -163,7 +163,7 @@
 

 Example: Go yellow if more than 20% swap is used, and red if
 more than 40% swap is used or the actual memory utilisation exceeds
-90%. Dont alert on physical memory usage.
+90%. Don't alert on physical memory usage.
 

 

 
@@ -437,12 +437,12 @@
 "addr" is a (partial) local address specification in the format used on
 the output from netstat.
 
EXLOCAL=addr

-Exclude certain local adresses from the rule.
+Exclude certain local addresses from the rule.
 
REMOTE=addr

 "addr" is a (partial) remote address specification in the format used on
 the output from netstat.
 
EXREMOTE=addr

-Exclude certain remote adresses from the rule.
+Exclude certain remote addresses from the rule.
 
STATE=state

 Causes only the sockets in the specified state to be included, "state"
 is usually LISTEN or ESTABLISHED but can be any socket state reported by
@@ -454,7 +454,7 @@
 
 "addr" is typically "10.0.0.1:80" for the IP 10.0.0.1, port 80. 
 Or "*:80" for any local address, port 80. Note that the Xymon clients 
-normally report only the numeric data for IP-adresses and port-numbers, 
+normally report only the numeric data for IP-addresses and port-numbers, 
 so you must specify the port number (e.g. "80") instead of the service 
 name ("www").
 

Index: xymon/docs/manpages/man5/hosts.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/hosts.cfg.5.html	2012-06-15 13:07:39.000000000 +0200
+++ xymon/docs/manpages/man5/hosts.cfg.5.html	2012-06-15 13:21:11.000000000 +0200
@@ -130,11 +130,11 @@
 on other hosts as well.
 

 
multihomed

-Tell Xymon that data from the host can arrive from multiple IP-adresses.
+Tell Xymon that data from the host can arrive from multiple IP-addresses.
 By default, Xymon will warn if it sees data for one host coming from
-different IP-adresses, because this usually indicates a mis-configuration
+different IP-addresses, because this usually indicates a mis-configuration
 of the hostname on at least one of the servers involved. Some hosts
-with multiple IP-adresses may use different IP's for sending data to
+with multiple IP-addresses may use different IP's for sending data to
 Xymon, however. This tag disables the check of source IP when receiving
 data.
 

@@ -811,9 +811,9 @@
 decides the testname for the connectivity test.
 

 
conn={best,|worst,}IP1[,IP2...]

-This adds additional IP-adresses that are pinged during the
+This adds additional IP-addresses that are pinged during the
 normal "conn" test. So the normal "conn" test must be enabled
-(the default) before this tag has any effect. The IP-adresses
+(the default) before this tag has any effect. The IP-addresses
 listed here are pinged in addition to the main IP-address.
 

 When multiple IP's are pinged, you can choose if ALL IP's
Index: xymon/docs/manpages/man5/xymonclient.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/xymonclient.cfg.5.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man5/xymonclient.cfg.5.html	2012-06-15 13:21:30.000000000 +0200
@@ -29,7 +29,7 @@
 Chosen when the Xymon client was compiled.
 

 
XYMSERVERS

-List of IP-adresses of Xymon servers. Data will be sent to
+List of IP-addresses of Xymon servers. Data will be sent to
 all of the servers listed here. This setting is only used if 
 XYMSRV=0.0.0.0.
 

Index: xymon/docs/manpages/man5/xymonserver.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/xymonserver.cfg.5.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man5/xymonserver.cfg.5.html	2012-06-15 13:24:23.000000000 +0200
@@ -392,9 +392,9 @@
 Default: $XYMONSERVERIP
 

 
XYMSERVERS

-List of IP-adresses. Clients and network test tools will try to
+List of IP-addresses. Clients and network test tools will try to
 send status reports to a Xymon server running on each of these
-adresses. This setting is only used if XYMSRV=0.0.0.0.
+addresses. This setting is only used if XYMSRV=0.0.0.0.
 

 
XYMONDPORT

 The portnumber for used to contact the
@@ -759,7 +759,7 @@
 on a webpage. This sets the default value for the 
 xymongen(1)
 
-"--maxrows" option; if the command-line option is also specifed,
+"--maxrows" option; if the command-line option is also specified,
 then it overrides this environment variable. Note that unlike
 Jeff's patch, xymongen implements this for both the "All non-green" 
 page and all other pages (xymon.html, subpages, critical.html). 
Index: xymon/docs/xymon-alerts.html
===================================================================
--- xymon.orig/docs/xymon-alerts.html	2012-06-12 17:12:06.000000000 +0200
+++ xymon/docs/xymon-alerts.html	2012-06-15 13:41:59.000000000 +0200
@@ -8,7 +8,7 @@
 
 
Configuring Xymon Alerts

 
When something breaks, you want to know about it. Since you probably 
-dont have the Xymon webpages in view all of the time, Xymon can 
+don't have the Xymon webpages in view all of the time, Xymon can 
 generate alerts to draw your attention to problems. Alerts can go out
 as e-mail, or Xymon can run a script that takes care of activating
 a pager, sending an SMS, or however you prefer to get alerted.

@@ -172,7 +172,7 @@
 with Xymon.

 
 
Save on the typing - use macros

-
Say you have a long list of hosts or e-mail adresses that you want to use several times throughout the
+
Say you have a long list of hosts or e-mail addresses that you want to use several times throughout the
 alerts.cfg file. Do you have to write the full list every time ? No:

 
 	$WEBHOSTS=%(www|intranet|support|mail).foo.com 
@@ -185,7 +185,7 @@
 


 The first line defines $WEBHOSTS as a macro. So everywhere else in the file,
 "$WEBHOSTS" is automatically replaced with "%(www|intranet|support|mail).foo.com"
-before the rule is processed. The same method can be used for recipients, e.g. e-mail adresses.
+before the rule is processed. The same method can be used for recipients, e.g. e-mail addresses.
 In fact, you can put an entire line into a macro:

 
 	$UNIXSUPPORT=MAIL unixsupport@foo.com TIME=*:0800:1600 SERVICE=cpu,disk,memory
@@ -205,7 +205,7 @@
 
 
There are rules ... and exceptions: IGNORE

 
A common scenario is where you handle most of the alerts with a wildcard rule, but
-there is just that one exception where you dont want any cpu alerts
+there is just that one exception where you don't want any cpu alerts
 from the marketing server on Thursday afternoon. Then it is time for the 
 IGNORE recipient:

 
Index: xymon/rpm/xymon-client.default
===================================================================
--- xymon.orig/rpm/xymon-client.default	2012-06-12 17:12:06.000000000 +0200
+++ xymon/rpm/xymon-client.default	2012-06-15 13:21:55.000000000 +0200
@@ -2,7 +2,7 @@
 
 # You MUST set the list of Xymon servers that this
 # client reports to.
-# It is good to use IP-adresses here instead of DNS 
+# It is good to use IP-addresses here instead of DNS 
 # names - DNS might not work if there's a problem.
 #
 # E.g. (a single Xymon server)
Index: xymon/web/svcstatus-info.c
===================================================================
--- xymon.orig/web/svcstatus-info.c	2012-06-12 17:12:06.000000000 +0200
+++ xymon/web/svcstatus-info.c	2012-06-15 13:20:28.000000000 +0200
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-/* The following is for the DNS lookup we perform on DHCP adresses */
+/* The following is for the DNS lookup we perform on DHCP addresses */
 #include 
 #include 
 #include 
Index: xymon/xymond/analysis.cfg.5
===================================================================
--- xymon.orig/xymond/analysis.cfg.5	2012-06-15 13:07:39.000000000 +0200
+++ xymon/xymond/analysis.cfg.5	2012-06-15 13:38:00.000000000 +0200
@@ -121,7 +121,7 @@
 .sp
 Example: Go yellow if more than 20% swap is used, and red if
 more than 40% swap is used or the actual memory utilisation exceeds
-90%. Dont alert on physical memory usage.
+90%. Don't alert on physical memory usage.
 .IP
 .nf
 MEMSWAP 20 40
@@ -359,12 +359,12 @@
 "addr" is a (partial) local address specification in the format used on
 the output from netstat.
 .IP "EXLOCAL=addr"
-Exclude certain local adresses from the rule.
+Exclude certain local addresses from the rule.
 .IP "REMOTE=addr"
 "addr" is a (partial) remote address specification in the format used on
 the output from netstat.
 .IP "EXREMOTE=addr"
-Exclude certain remote adresses from the rule.
+Exclude certain remote addresses from the rule.
 .IP "STATE=state"
 Causes only the sockets in the specified state to be included, "state"
 is usually LISTEN or ESTABLISHED but can be any socket state reported by
@@ -374,7 +374,7 @@
 .LP
 "addr" is typically "10.0.0.1:80" for the IP 10.0.0.1, port 80. 
 Or "*:80" for any local address, port 80. Note that the Xymon clients 
-normally report only the numeric data for IP-adresses and port-numbers, 
+normally report only the numeric data for IP-addresses and port-numbers, 
 so you must specify the port number (e.g. "80") instead of the service 
 name ("www").
 .br
Index: xymon/xymond/etcfiles/analysis.cfg
===================================================================
--- xymon.orig/xymond/etcfiles/analysis.cfg	2012-06-15 13:07:39.000000000 +0200
+++ xymon/xymond/etcfiles/analysis.cfg	2012-06-15 14:00:29.000000000 +0200
@@ -255,7 +255,7 @@
 #             the output from netstat. This is typically "10.0.0.1:80" for the IP 
 #             10.0.0.1, port 80. Or "*:80" for any local address, port 80.
 #             NB: The Xymon clients normally report only the numeric data for
-#                 IP-adresses and port-numbers, so you must specify the port
+#                 IP-addresses and port-numbers, so you must specify the port
 #                 number (e.g. "80") instead of the service name ("www").
 #             "state" causes only the sockets in the specified state to be included;
 #             it is usually LISTEN or ESTABLISHED.
@@ -310,7 +310,7 @@
 # located in the hosts.cfg file, via the hosts' page/subpage/subparent
 # directives. This can be convenient to pick out all hosts on a specific page.
 #
-# Rules can be dependant on time-of-day, using the standard Xymon syntax 
+# Rules can be dependent on time-of-day, using the standard Xymon syntax 
 # (the hosts.cfg(5) about the NKTIME parameter). E.g. "TIME=W:0800:2200"
 # applied to a rule will make this rule active only on week-days between
 # 8AM and 10PM.
Index: xymon/xymonnet/xymonping.1
===================================================================
--- xymon.orig/xymonnet/xymonping.1	2012-06-12 17:12:22.000000000 +0200
+++ xymon/xymonnet/xymonping.1	2012-06-15 14:00:25.000000000 +0200
@@ -2,23 +2,23 @@
 .SH NAME
 xymonping \- Xymon ping tool
 .SH SYNOPSIS
-.B "xymonping [--retries=N] [--timeout=N] [IP-adresses]"
+.B "xymonping [--retries=N] [--timeout=N] [IP-addresses]"
 
 .SH DESCRIPTION
 .I xymonping(1)
 is used for ping testing of the hosts monitored by the
 .I xymon(7)
-monitoring system. It reads a list of IP adresses from stdin,
+monitoring system. It reads a list of IP addresses from stdin,
 and performs a "ping" check to see if these hosts are alive.
 It is normally invoked by the
 .I xymonnet(1)
 utility, which performs all of the Xymon network tests.
 
-Optionally, if a list of IP-adresses is passed as command-line
+Optionally, if a list of IP-addresses is passed as command-line
 arguments, it will ping those IP's instead of reading them 
 from stdin.
 
-xymonping only handles IP-adresses, not hostnames.
+xymonping only handles IP-addresses, not hostnames.
 
 xymonping was inspired by the
 .I fping(1)
@@ -28,10 +28,10 @@
 of "fping -Ae".
 
 xymonping probes multiple systems in parallel, and the runtime
-is therefore mostly dependant on the timeout-setting and the
+is therefore mostly dependent on the timeout-setting and the
 number of retries. With the default options, xymonping takes
 approximately 18 seconds to ping all hosts (tested with an
-input set of 1500 IP adresses).
+input set of 1500 IP addresses).
 
 .SH SUID-ROOT INSTALLATION REQUIRED
 xymonping needs to be installed with suid-root privileges,
Index: xymon/build/setup-newfiles.c
===================================================================
--- xymon.orig/build/setup-newfiles.c	2012-06-12 17:12:05.000000000 +0200
+++ xymon/build/setup-newfiles.c	2012-06-15 13:27:39.000000000 +0200
@@ -67,7 +67,7 @@
 		if (stat(destfn, &st) == 0) {
 			/* Destination file exists, see if it's a previous version */
 
-			if (sumbuf == NULL) continue; /* No md5-data, dont overwrite an existing file */
+			if (sumbuf == NULL) continue; /* No md5-data, don't overwrite an existing file */
 			if (!S_ISREG(st.st_mode)) continue;
 
 			fd = fopen(destfn, "r"); if (fd == NULL) continue;
@@ -99,13 +99,13 @@
 
 			infd = fopen(srcfn, "r");
 			if (infd == NULL) {
-				/* Dont know how this can happen, but .. */
+				/* Don't know how this can happen, but .. */
 				fprintf(stderr, "Cannot open input file %s: %s\n", srcfn, strerror(errno));
 				return 1;
 			}
 			outfd = fopen(destfn, "w");
 			if (outfd == NULL) {
-				/* Dont know how this can happen, but .. */
+				/* Don't know how this can happen, but .. */
 				fprintf(stderr, "Cannot create output file %s: %s\n", destfn, strerror(errno));
 				return 1;
 			}
Index: xymon/client/logfetch.c
===================================================================
--- xymon.orig/client/logfetch.c	2012-06-12 17:12:05.000000000 +0200
+++ xymon/client/logfetch.c	2012-06-15 13:42:56.000000000 +0200
@@ -37,7 +37,7 @@
 #include "libxymon.h"
 
 /* Is it ok for these to be hardcoded ? */
-#define MAXCHECK   102400   /* When starting, dont look at more than 100 KB of data */
+#define MAXCHECK   102400   /* When starting, don't look at more than 100 KB of data */
 #define MAXMINUTES 30
 #define POSCOUNT ((MAXMINUTES / 5) + 1)
 #define LINES_AROUND_TRIGGER 5
Index: xymon/client/msgcache.c
===================================================================
--- xymon.orig/client/msgcache.c	2012-06-12 17:12:05.000000000 +0200
+++ xymon/client/msgcache.c	2012-06-15 13:42:52.000000000 +0200
@@ -205,7 +205,7 @@
 			addtobuffer(conn->msgbuf, client_response);
 
 			/* 
-			 * Dont drop the client response data. If for some reason
+			 * Don't drop the client response data. If for some reason
 			 * the "client" request is repeated, he should still get
 			 * the right answer that we have.
 			 */
@@ -284,7 +284,7 @@
 	struct sigaction sa;
 	int opt;
 
-	/* Dont save the output from errprintf() */
+	/* Don't save the output from errprintf() */
 	save_errbuf = 0;
 
 	memset(&laddr, 0, sizeof(laddr));
Index: xymon/client/xymonclient-freebsd.sh
===================================================================
--- xymon.orig/client/xymonclient-freebsd.sh	2012-06-12 17:12:05.000000000 +0200
+++ xymon/client/xymonclient-freebsd.sh	2012-06-15 13:43:01.000000000 +0200
@@ -45,7 +45,7 @@
 echo "[ports]"
 (netstat -na -f inet; netstat -na -f inet6) | grep "^tcp"
 echo "[ps]"
-# Dont use "args". "command" works also in FreeBSD 4.x.
+# Don't use "args". "command" works also in FreeBSD 4.x.
 ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,command
 
 # $TOP must be set, the install utility should do that for us if it exists.
Index: xymon/client/xymonclient-sunos.sh
===================================================================
--- xymon.orig/client/xymonclient-sunos.sh	2012-06-12 17:12:05.000000000 +0200
+++ xymon/client/xymonclient-sunos.sh	2012-06-15 13:42:40.000000000 +0200
@@ -25,7 +25,7 @@
 # Print the root filesystem first, with the header, and those fs's that have the same type.
 ROOTFSTYPE=`/bin/df -n / | awk '{print $3}'`
 /bin/df -F $ROOTFSTYPE -k
-# Then see what fs types are in use, and weed out those we dont want.
+# Then see what fs types are in use, and weed out those we don't want.
 FSTYPES=`/bin/df -n -l|cut -d: -f2 | awk '{print $1}'|egrep -v "^${ROOTFSTYPE}|^proc|^fd|^mntfs|^ctfs|^devfs|^objfs|^nfs|^lofs"|sort|uniq`
 set $FSTYPES
 while test "$1" != ""; do
Index: xymon/client/xymonclient.cfg.DIST
===================================================================
--- xymon.orig/client/xymonclient.cfg.DIST	2012-06-15 13:07:38.000000000 +0200
+++ xymon/client/xymonclient.cfg.DIST	2012-06-15 13:43:04.000000000 +0200
@@ -6,7 +6,7 @@
 
 PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/lib/xymon/client/bin"  # PATH setting for the client scripts.
 
-# You normally dont need to modify anything below here
+# You normally don't need to modify anything below here
 XYMONDPORT="1984"                   # Portnumber where xymond listens
 XYMONCLIENTHOME="/usr/lib/xymon/client"
 XYMONHOME="$XYMONCLIENTHOME"       # Directory for the Xymon client files
Index: xymon/common/tasks.cfg.5
===================================================================
--- xymon.orig/common/tasks.cfg.5	2012-06-12 17:12:22.000000000 +0200
+++ xymon/common/tasks.cfg.5	2012-06-15 13:42:35.000000000 +0200
@@ -89,7 +89,7 @@
 
 The \fBGROUP\fR keyword can be used to limit the number of tasks 
 that may run simultaneously. E.g. if you are generating multiple
-pagesets of webpages, you dont want them to run at the same time.
+pagesets of webpages, you don't want them to run at the same time.
 Putting them into a GROUP will cause xymonlaunch to delay the start
 of new tasks, so that only one task will run per group. You can
 change the limit by defining the group before the tasks, with
Index: xymon/docs/configure.txt
===================================================================
--- xymon.orig/docs/configure.txt	2012-06-12 17:12:05.000000000 +0200
+++ xymon/docs/configure.txt	2012-06-15 13:42:04.000000000 +0200
@@ -105,7 +105,7 @@
 top-level directory. I can set this up if you tell me
 what group-ID your webserver runs with. This is typically
 'nobody' or 'apache' or 'www-data'
-If you dont know, just hit ENTER and we will handle it later.
+If you don't know, just hit ENTER and we will handle it later.
 
 What group-ID does your webserver use ?
 www-data
Index: xymon/docs/manpages/man1/combostatus.1.html
===================================================================
--- xymon.orig/docs/manpages/man1/combostatus.1.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man1/combostatus.1.html	2012-06-15 13:42:26.000000000 +0200
@@ -62,7 +62,7 @@
 combostatus.
 

 
--no-update

-Dont send any status messages - instead, the result of the combotests
+Don't send any status messages - instead, the result of the combotests
 is simply dumped to stdout. Useful for debugging.
 

 

Index: xymon/docs/manpages/man1/xymongen.1.html
===================================================================
--- xymon.orig/docs/manpages/man1/xymongen.1.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man1/xymongen.1.html	2012-06-15 13:42:23.000000000 +0200
@@ -550,7 +550,7 @@
 
 The syntax is identical to the normal "page" and "subpage"
 directives in hosts.cfg, but the directive is prefixed with
-the pageset name. Dont put any hosts in-between the page
+the pageset name. Don't put any hosts in-between the page
 and subpage directives - just add all the directives at
 the top of the hosts.cfg file.
 

Index: xymon/docs/manpages/man5/alerts.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/alerts.cfg.5.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man5/alerts.cfg.5.html	2012-06-15 13:42:19.000000000 +0200
@@ -170,7 +170,7 @@
 
 This is used to define a recipient that does NOT trigger any alerts, and also terminates the
 search for more recipients. It is useful if you have a rule that handles most alerts, but
-there is just that one particular server where you dont want cpu alerts on Monday morning.
+there is just that one particular server where you don't want cpu alerts on Monday morning.
 Note that the IGNORE recipient always has the STOP flag defined, so when the IGNORE recipient
 is matched, no more recipients will be considered. So the location of this recipient in your
 set of recipients is important.
Index: xymon/docs/manpages/man5/tasks.cfg.5.html
===================================================================
--- xymon.orig/docs/manpages/man5/tasks.cfg.5.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man5/tasks.cfg.5.html	2012-06-15 13:42:09.000000000 +0200
@@ -118,7 +118,7 @@
 

 The GROUP keyword can be used to limit the number of tasks 
 that may run simultaneously. E.g. if you are generating multiple
-pagesets of webpages, you dont want them to run at the same time.
+pagesets of webpages, you don't want them to run at the same time.
 Putting them into a GROUP will cause xymonlaunch to delay the start
 of new tasks, so that only one task will run per group. You can
 change the limit by defining the group before the tasks, with
Index: xymon/docs/manpages/man8/xymon-mailack.8.html
===================================================================
--- xymon.orig/docs/manpages/man8/xymon-mailack.8.html	2012-06-12 17:12:22.000000000 +0200
+++ xymon/docs/manpages/man8/xymon-mailack.8.html	2012-06-15 13:42:31.000000000 +0200
@@ -85,7 +85,7 @@
 Load environment from FILENAME, usually xymonserver.cfg.
 

 
--debug

-Dont send a message to xymond, but dump the message to
+Don't send a message to xymond, but dump the message to
 stdout.
 

 

Index: xymon/docs/xymon-tips.html.DIST
===================================================================
--- xymon.orig/docs/xymon-tips.html.DIST	2012-06-12 17:12:06.000000000 +0200
+++ xymon/docs/xymon-tips.html.DIST	2012-06-15 13:41:54.000000000 +0200
@@ -41,7 +41,7 @@
 
 

 
-
My client-side tests dont show up on the webpages

+
My client-side tests don't show up on the webpages

 
Did you install a client ? The Xymon client package is installed
 automatically only on the Xymon server - on other systems, you must
 build the client package by running Xymon's configure-script with
@@ -228,7 +228,7 @@
 Big Brother at the www.deadcat.net archive,
 and these will typically work without modifications if you run them in
 Xymon. Sometimes a few minor tweaks are needed - the Xymon mailing list
-can help you if you dont know how to go about that.

+can help you if you don't know how to go about that.

 
But if you have something unique you need to test, writing an extension
 script is pretty simple. You need to figure out some things: