2006-11-21 Raul Mateos <raulofpandora@gmail.com>

* en/pandora_install.xml, en/pandora_advanced.xml,
	en/pandora_chapter1.xml, en/pandora_chapter2.xml,
	en/pandora_chapter3.xml, en/pandora_chapter4.xml,
	en/pandora_chapter5.xml, en/pandora_chapter6.xml,
	en/pandora_chapter7.xml, en/pandora_chapter8.xml,	
	en/pandora_chapter9.xml, en/pandora_introduction.xml
	en/pandora_migration.xml, en/pandora_userguide.xml:
	Text correction.

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@267 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f

pandora_doc/en/pandora_advanced.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <chapter>
-  <title>Pandora. Advanced section</title>
+  <title>Pandora FMS advanced section</title>
-  <sect1><title>Pandora High availabilty features</title>
+  <sect1><title>Pandora FMS High Availability features</title>
   <para>
     You may setup Pandora for use HA in several scenarios:
     <itemizedlist mark='bullet'>
@@ -9,17 +9,17 @@
 	<para>
 	  <emphasis>Database Clustering for HA</emphasis>. You need to
 	  setup a MySQL5 Cluster. In support forums / wiki are
-	  information to make this, you only need to convert DB schama
+	  information to make this, you only need to convert DB schema
 	  in a MySQL Cluster compatible tables. This scenario has been
-	  tested and works fine, but you need some advanced knowledgue
+	  tested and works fine, but you need some advanced knowledge
-	  for MySQL Clustering administration.
+	  about MySQL Clustering administration.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <emphasis>Multiple Pandora Console</emphasis>. It's easy,
 	  you only need to setup another one. No locking problems or
-	  incompatibility has been detected in several Pandora
+	  incompatibility has been detected in several Pandora FMS
 	  deployments.
 	</para>
       </listitem>
@@ -103,13 +103,13 @@
     Data compression based on interpolation and data purge, makes a
     smaller database, but this was not enought. Production systems has
     a limit based on 100 agents, with about ten modules each one. This
-    was not a high limit for huge enviroments.
+    was not a high limit for huge environments.
   </para>
   <para>
     This problem was very important for Pandora future, so we are
-    changed the way Pandora store its pada. New data management system
+    changed the way Pandora store its data. New data management system
     store only "new" data. If a duplicate value enter the system, it
-    doesnt be stored in database. It's very useful to keep database
+    won't be stored in database. It's very useful to keep database
     small. This works for all pandora data modules: numerical,
     incremental, boolean and string.
   </para>
@@ -125,11 +125,11 @@
   <para>
     Changes come with some different ways to reading data. With new
     version, if an agent cannot communicate with Pandora, and Pandora
-    Server doesnt receive data from agent, this "no data" cannot have
+    Server doesn't receive data from agent, this "no data" cannot have
     a graphical representation, for module graph there will be no
     changes. You will have a graph with a perfect horizontal
-    line. Pandora, if doesnt receive new values, thinks that is no new
+    line. Pandora, if doesn't receive new values, thinks that there 
-    values, and everything seems to be equal that in the last
+	are no new values, and everything seems to be equal that in the last
     notification.
   </para>
   <para>
@@ -138,8 +138,8 @@
 
     <graphic fileref="images/module_graph_full.jpg" scale="60" align="center"/>
 
-    This would be the equivalent graph for the same data, excepting a
+    This would be the equivalent graph for the same data, except a
-    conexión failure, from 05:55 to 15:29 aproximately.
+    connection failure, from 05:55 to 15:29 aproximately.
 
     <graphic fileref="images/module_graph_peak.jpg" scale="60" align="center"/>
   </para>

pandora_doc/en/pandora_chapter1.xml

@@ -3,10 +3,10 @@
 <chapter id="chapter1">
   <title>Introduction</title>
   <sect1 id="sec1.1">
-    <title>What is Pandora?</title>
+    <title>What is Pandora FMS?</title>
     
     <para>
-      Pandora is a monitoring tool that allows a system administrator
+      Pandora FMS is a monitoring tool that allows a system administrator
       to visually analise the status and efficiency of Operating
       Systems, Servers, Applications and Hardware Systems - such as
       firewalls, proxies, databases, Web servers, tunnelling servers,
@@ -53,7 +53,7 @@
     <para>
       The core server accesses Pandora database, which is shared with
       the Web server, and stores the processed data packages. The
-      server is executed under the name of "Demonio", and processes
+      server is executed under the name of "Demon", and processes
       the packages stored in its file system. The data is generated
       by the system agents. Despite the server's low system resources
       comsumption and simple installation and operation, the core
@@ -67,8 +67,8 @@
       system only supports MySQL. The central database keeps all the
       information Pandora needs to work - agent data, settings, user
       information, incidents, system settings, etc. The system can use
-      a MySQL cluster to store the information, or a high
+      a MySQL cluster to store the information, or a High
-      disponibility solution for larger sytems.
+      Availability (HA) solution for larger sytems.
     </para>
     
     <para>
@@ -89,7 +89,7 @@
       They have been developed to work under a specific platform,
       making use of the specific tools of the used language:
       VBSCript/Windows Scripting for Microsoft platforms (Win2000,
-      WinXP y Win2003) and ShellScripting for Unix - which includes
+      WinXP and Win2003) and ShellScripting for Unix - which includes
       GNU/Linux, Solaris, AIX, HP-UX and BSD, as well as the Nokia's
       IPSO. Pandora agents can be developed in virtually any language,
       given its simple API and being open source.

pandora_doc/en/pandora_chapter3.xml

@@ -5,30 +5,30 @@
   <title>Agents</title>
 
   <para>
-    The agents collect information. There are agent based on a software 
+    The agents collect information. There are agents based on a software 
-    agent and install in the System to monitor, and network agent, a 
+    agent and installed in the System to monitor, and network agents - a 
     non-physical agent, without need of installing any software, that 
-    execute network tasks in Pandora Network servers, and showing 
+    execute network tasks in Pandora Network servers and shows 
-    information on console inside an Agent.
+    information on console.
   </para>
   <para>
-    For agents who need to install software onto remote systems,
+    For agents who need to install software into remote systems,
-    public key of the machine to be monitored needs to be copied onto
+    public key of the machine to be monitored needs to be copied into
-    Pandora Data server to be able to collect data, as it's specified
+    Pandora Data server to be able to collect data, as it is specified
     in detail in Pandora Install documentation.
   </para>
   <para>
     Data collected from the agents are stored in small pieces of
-    information called "modules". Each module store only a kind of
+    information called "modules". Each module stores only a kind of
-    data. Value of each module is the value of one monitored
+    data. The value of each module is the value of one monitored
-    variable. The agent must be activated in Pandora's server and a
+    variable. The agent must be activated in Pandora Server and a
-    group assigned to the agent. The data starts then been
+    group assigned to the agent. The data then begin to be
     consolidated in the database and can be accessed.
   </para>
   <para>
     A network agent NEEDs to be assigned to a Network Server to
     execute network tasks. If you cannot see any Network Servers it's
-    because you has not executed any Network Servers. Please configure
+    because you don't have any Network Server running. Please configure
     and run a Network Server before trying to assign a network module
     to an Agent.
   </para>
@@ -72,19 +72,20 @@
     <para>
       Pandora groups are common to agents, incidents and
       profiles. Groups are added in "Manage Profiles" &gt; "Manage
-      Groups", Administration menu.
+      Groups" in the Administration menu.
     </para>
 
     <graphic scale='70' fileref="images/image007.png" valign="bottom" 
 	     align="center"/>
 
-    <para>There are several default groups defined in Pandora. You also can
+    <para>
+	 There are several default groups defined in Pandora. You also can
      create your own (please use given icons or edit and add your own icons).
-     You can also modify default ones.</para>
+     You can also modify default ones.
+	 </para>
 
     <para>
-      A group is added by clicking "Create group" and assigning a name
+      A group is added by clicking "Create group" and assigning a name to it.
-      to it.
     </para>
     <para>
       A group is deleted by clicking the delete icon
@@ -95,18 +96,18 @@
   <sect1 id="sec3.2">
     <title>Adding an agent</title>
     <para>
-      You can define new agents. Once defined in Pandora console, its
+      You can define new agents. Once defined in Pandora console, it is
       ready to receive data from a Software agent (old agents, based
       on software installed in a remote machine), or from Network
-      Agents (assined to a Network Server who run network tasks to
+      Agents (assined to a Network Server who runs network tasks to
-      monitorize remote systems). You also mix both types of module in
+      monitor remote systems). You can also mix both types of module
-      the same agent.
+	  in the same agent.
     </para>
     <para>
       Please remember that a network agent NEEDs to be assigned to a
-      Network Server to execute network tasks. If you cannot see any
+      Network Server to execute network tasks. If you can't see any
-      Network Servers it's because you has not executed any Network
+	  Network Servers it's because you don't have any Network Server
-      Servers. Please configure and run a Network Server before trying
+	  running. Please configure and run a Network Server before trying
       to assign a network module to an Agent.
     </para>
     <para>
@@ -118,8 +119,7 @@
 	     align="center"/>
 
     <para>
-      To add a new agent the following parameters must be
+      To add a new agent the following parameters must be configured:
-      configured:
     </para>
 
     <itemizedlist>
@@ -134,36 +134,35 @@
       <listitem>
 	<para>
 	  <emphasis>IP Address:</emphasis> IP address of an agent. An
-	  agent can share its IP address with other agents. Its only
+	  agent can share its IP address with other agents. It's only
-	  for informational purposes. In network agents its useful,
+	  used for informational purposes. In network agents it's useful,
-	  because use this IP address for all new network module
+	  because the Server uses this IP address for all new
-	  definition by default.
+	  network module definition by default.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <emphasis>Group:</emphasis> Pandora's group the agent
-	  belongs. In this version of Pandora, an agent only can
+	  belongs to. In this version of Pandora, an agent only can
 	  belong to a group.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <emphasis>Interval:</emphasis> Execution interval of an
-	  agent. It is the time elapsed in seconds, between two
+	  agent. It is the time elapsed in seconds between two
-	  executions. An agent could have a defined interval, but
+	  consecutive agent executions. An agent could have a 
-	  could have modules with different (bigger or smaller)
+	  defined interval, but could have modules with different
-	  intervals. An agent its considered "down" (not responding)
+	  (bigger or smaller) intervals. An agent is considered 
-	  when Pandora servers (any of them) has no contact with agent
+	  "down" (not responding) when Pandora servers (any of them)
-	  in Interval x 2 seconds.
+	  has no contact with agent in Interval x 2 seconds.
 	</para>
       </listitem>
       <listitem>
 	<para>
 	  <emphasis>OS:</emphasis> The Operating System to be
 	  monitored. The supported Operating Systems are: AIX, BeOS,
-	  BSD, Cisco, HPUX, Linux, MacOS, Other, Solaris,
+	  BSD, Cisco, HP-UX, Linux, MacOS, Other, Solaris, Windows. 
-	  Windows. 
 	</para>
       </listitem>
       <listitem>
@@ -183,7 +182,7 @@
 	  by the agent are accepted. If modules are not defined, they
 	  are automatically defined by the system. It is recommended
 	  to activate the agents in this mode and change it once the
-	  user is familiar with the system.
+	  user is familiar with Pandora FMS.
 	</para>
       </listitem>
       <listitem>
@@ -207,14 +206,14 @@
 
       <para>Pandora's agents use the operating system own commands to
       monitor a device. Pandora's server will store and process the
-      output generated by those commands. The commandos are called
+      output generated by those commands. The commands are called
       "modules".</para>
 
       <para>If the agent had been added in "normal mode", the modules
       to be monitored should have been assigned. Those modules must be
       configured in the agent configuration file.</para>
 
-      <para>The modules to be processed by Pandora's server are
+      <para>The modules to be processed by Pandora Server are
       assigned in the "Manage Agents" option, Administration menu. A
       list with all the agents in Pandora will be shown here.</para>
 
@@ -226,7 +225,7 @@
 	       align="center"/>
 
       <para>
-	To add a module is neccesary fill some of the following field:
+	To add a module is necessary to fill some of the following fields:
       </para>
       <para>
 	 <emphasis>Module type</emphasis>: type of module,there are the 
@@ -250,9 +249,9 @@
 	    <emphasis>generic_data_proc</emphasis>: Boolean data type:
 	    0 means False or "bad values", and 1 means True or "good"
 	    value. Generic Proc types are also called "monitors"
-	    because could say if something is "ok" or is "wrong". Are
+	    because could say if something is "ok" or is "wrong". They
-	    displayed in agent view as little lamps. Red if 0, Green
+		Are displayed in agent view as little lamps. Red if 0, Green
-	    is 1.
+	    if 1.
 	  </para>
 	</listitem>
 	<listitem>
@@ -285,7 +284,7 @@
 	    SEND" (you can use the macro ^M to send carriage returns)
 	    and wait to receive string defined in "TCP RECEIVE". If
 	    Pandora Network Server received TCP RECEIVE string, it
-	    returns 1 (ok), else return 0 (wrong). 
+	    returns 1 (ok), else returns 0 (wrong). 
 	  </para>
 	</listitem>
 
@@ -293,18 +292,18 @@
 	  <para>
 	    <emphasis>generic_tcp_data: generic_tcp_string,
 	    generic_tcp_inc</emphasis>, gets numerical data, string
-	    data or incremental data from TCP open port. If cannot
+	    data or incremental data from TCP open port. If it cannot
 	    connect, no value returned.
 	  </para>
 	</listitem>
 	<listitem>
 	  <para>
-	    <emphasis>generic_snmp types:</emphasis>: they obtain
+	    <emphasis>generic_snmp types:</emphasis>: they get
-	    informacion using SNMP interface. If you enter SNMP
+	    information using SNMP interface. If you enter SNMP
-	    community, and IP address, you can walk SNMP MIB from
+	    community and IP address, you can walk SNMP MIB from
 	    target using SNMP v1 protocol, and all MIB variables will
-	    be listed to allow you choose one. You also can enter MIB
+	    be listed to allow you choose one. You can also enter MIB
-	    using numerical OID or human - comprenhensive format.
+	    using numerical OID or human - understandable format.
 	  </para>
 	</listitem>
 	<listitem>
@@ -316,30 +315,30 @@
 	</listitem>
       </itemizedlist>
       <para>
-	 <emphasis>Module Group</emphasis>: Is possible group the module 
+	 <emphasis>Module Group</emphasis>: It is possible to group
-	 in the following groups: General, Networking, Application, 
+	 modules in the following groups: General, Networking,
-	 System and Misscellaneous:
+	 Application, System and Misscellaneous:
       </para>
       <para>
 	  <emphasis>Module Name</emphasis>: Name of the module.
       </para>
       <para>
-	  <emphasis>Module Interval</emphasis>: Interval of time, in seconds 
+	  <emphasis>Module Interval</emphasis>: Interval of time in seconds 
-	  that the agent wait between each run.
+	  that the agent waits between two consecutive executions.
       </para>
       <para>
 	 <emphasis>Target IP</emphasis>: IP of the agent.
       </para>
       <para>
-	 <emphasis>TCP port</emphasis>: TCP port to monitor, is possible 
+	 <emphasis>TCP port</emphasis>: TCP port to monitor, it is possible 
-	 configure UDP port if the module type generic_udp_proc is choose.
+	 to configure UDP port if the module type generic_udp_proc is chosen.
       </para>
       <para>
 	  <emphasis>SNMP OID</emphasis>: SNMP OID to monitor. If you 
-	  configure  the MIBs in pandora is possible get the value.
+	  configure the MIBs in pandora is possible to get the value.
       </para>
       <para>
-	  <emphasis>SNMP Community</emphasis>: Community neccesary to monitor 
+	  <emphasis>SNMP Community</emphasis>: Community necessary to monitor 
 	  a SNMP OID.
       </para>
       <para>
@@ -347,7 +346,7 @@
       </para>
       <para>
 	   <emphasis>TCP receive</emphasis>: Field to configure the 
-	   parameters which we hope receive in a TCP conexion.
+	   parameters which we expect to receive in a TCP connection.
       </para>
       <para>
           <emphasis>Maximum:</emphasis>: Upper threshold for the
@@ -366,8 +365,8 @@
 	    module.
 	  </para>
       <para>
-	All the modules to be monitored by an agent can be reviewed by
+		All the modules to be monitored by an agent can be reviewed
-	accessing the agent in the "Manage Agents" option,
+		by accessing the agent in the "Manage Agents" option,
 		Administration menu.
       </para>
       
@@ -400,12 +399,12 @@
       <title>Alerts</title>
       
       <para>
-	An alert is Pandora's reaction to an out of range module
+	An alert is Pandora's reaction to an "out of range" module
-	value. The Alert can consist in sending and e-mail or SMS to
+	value. The Alert can consist of sending an e-mail or SMS to
 	the administrator, sending a SNMP trap, write the incident
-	into the system syslog or Pandora log file, etc. And basically
+	into the system syslog or Pandora log file, etc. Basically,
-	anything that can be triggered by a script configured in
+	it's anything that can be triggered by a script configured 
-	Pandora's Operating System.
+	in the Operating System where Pandora Servers run.
       </para>
       <sect3 id="sec3.2.2.1">
 	<title>Adding an Alert</title>
@@ -538,13 +537,13 @@
 	<title>Assigning Alerts</title>
 	
 	<para>
-	  The next step after an Agent has been added, its 
+	  The next step after an agent has been added, its 
 	  modules have been configurated and the alerts have been 
-	  defined, it is time to assign those Alerts to the agent.
+	  defined, is to assign those alerts to the agent.
 	</para>
 	
 	<para>
-	  This is done by clicking on the Agent to be configured on the 
+	  This is done by clicking on the agent to be configured in the 
 	  "Manage Agents" option, Administration menu. 
 	  The Alert Assignation form is placed at the bottom of that 
 	  page.
@@ -554,7 +553,7 @@
 		 valign="bottom" align="center"/>
 	
 	<para>
-	 To assign an Alert the next fields must be filled in:
+	 To assign an alert the next fields must be filled in:
  	</para>
 	
 	<itemizedlist>
@@ -699,7 +698,7 @@
   <sect1 id="sec3.3">
     <title>Agent monitoring</title>
     <para>
-      When the agents start the data transmission to the server, and
+      When the agents begin to send data to the server, and
       it is added in the Web console, Pandora processes and inserts
       the data in the Database. The data are consolidated and can be
       accessed from the Web console, either as row data or as
@@ -711,10 +710,10 @@
 	All the Agents can be accessed from the Operation menu.
      </para>
      <para>
-	You can view the agents in group you must click in "View aggent"
+	You can view the agents in group you must click in "View agent"
 	From here the status of the agents can be quickly reviewed 
-	thanks to a simple system  coloured circles and windows taht 
+	thanks to a simple system coloured circles and windows that 
-	appaer when the user pass the mouse on a group.
+	appear when the user pass the mouse on a group.
       </para>
 	<graphic scale='70' fileref="images/groups.png" valign="bottom"
 		 align="center"/>
@@ -756,7 +755,7 @@
       </para>
       <para>
 	<inlinegraphic scale='70' fileref="images/b_green.png"/> 
-	All the monitors OK. It's the ideal status.
+	All the monitors are OK. It's the ideal status.
       </para>
       <para>
 	<inlinegraphic scale='70' fileref="images/b_white.png"/> 
@@ -797,17 +796,17 @@
       </para>
       <para>
 	<inlinegraphic scale='70' fileref="images/dot_red.png"/> 
-	When at least one alert has been sent within 
+	Shown when at least one alert has been sent within 
 	the time threshold of the alert.
       </para>
       <para>
-       <emphasis>Last contact:</emphasis> Shows the time and date of 
+       <emphasis>Last contact:</emphasis> Shows date and time of 
        the last data package sent by the agent, using a progress bar, 
        according to value of the interval. If you see the image 
        <inlinegraphic scale='70' fileref="images/outof.png"/>, 
        the agent has not send data during the interval. 
        Passing the mouse over the image will show you the last contact 
-       in time and date format.
+       in date and time format.
       </para>
       <para>
        <emphasis>Note:</emphasis> The icon <inlinegraphic scale='70'
@@ -818,8 +817,10 @@
     </sect2>
     <sect2 id="sec3.3.2">
       <title>Accessing the data of an agent</title>
-      <para>When an agent is accessed, by clicking on its name, all the
+      <para>
-      information related to that agent is displayed.</para>
+	  When an agent is accessed, by clicking on its name, all the
+      information related to that agent is displayed.
+	  </para>
       <sect3 id="sec3.3.2.1">
 	<title>Agent general info</title>
 	<para>
@@ -937,7 +938,7 @@
 	defined.
         </para>
 	<para>
-	 <emphasis>Type:</emphasis> Data type of the monitor. For a ç
+	 <emphasis>Type:</emphasis> Data type of the monitor. For a
 	 monitor this value is always of the generic_proc type.
         </para>
 	<para>
@@ -1106,7 +1107,8 @@
 	  <para>
 	   A graph with number of packages sent by each Agent. A 
 	   package is the number of values from the modules the agent 
-	   sends after each time interval</para>
+	   sends after each time interval
+	   </para>
 	</listitem>
       </itemizedlist>
       <graphic scale='70' fileref="images/image031.png"
@@ -1120,42 +1122,42 @@
   <sect1 id="sec3.4">
     <title>SNMP Console</title>
     <para>
-      Almost all device can send snmp traps when have any problem as
+      Almost all device can send SNMP traps when have any problem as
-      reboot lost interface, the temperature is very high, CPU crash,
+      reboot, lost interface, the temperature is very high, CPU crash,
-      etc ... .With Traps is possible know the problem when it happend.
+      etc. With Traps is possible to know the problem when it happens.
     </para>
     <para>
-      In Pandora 1.2 there is a SNMP console to recieve snmp trap. 
+      In Pandora 1.2 there is a SNMP console to receive SNMP traps. 
-      Is possible configure any device to send snmp trap to Pandora,
+      It is possible configure any device to send SNMP traps to
-	only need the Pandora IP and Pandora Community. 
+	  Pandora FMS, you only need the Pandora IP and Community. 
     </para>
     <para>      
-      in Operation, SNMP Console the users can see the snmp traps send 
+      From SNMP Console in the Operation menu the users can see
-      to Pandora Server.
+	  the SNMP traps sent to Pandora Server.
     </para>
        <graphic scale='70' fileref="images/SNMP_console.png" 
 		valign="bottom" align="center"/>
     <sect2 id="sec3.4.1">
       <title>SNMP Alerts</title>
       <para>
-	Just like is posible to generat alert if there is an out of 
+	Just like is possible to generat alert if there is an out of 
-	range module value. Is posible generate a alert if a snmp trap 
+	range module value. It is possible to generate an alert if an
-	is received with a anorma value. The Alert can consist in 
+	SNMP trap is received with a anorma value. The Alert can consist of 
-	sending and e-mail or SMS to the administrator, sending a SNMP 
+	sending and e-mail or SMS to the administrator, sending an SNMP 
 	trap, write the incident into the system syslog or Pandora log 
-	file, etc. And basically anything that can be triggered by a 
+	file, etc. Basically anything that can be triggered by a 
-	script configured in Pandora's Operating System.
+	script configured in the Operating System when Pandora Servers run.
       </para>
       <para> 
-	 in Operation, SNMP Console, SNMP Alerts the users can see the 
+	 In "SNMP Console" &gt; "SNMP Alerts" from Operation menu, the users
-	 snmp Alert configured.
+	 can see the configured SNMP Alerts.
       </para>
       <graphic scale='70' fileref="images/SNMP_alert.png" 
 	       valign="bottom" align="center"/>
     <para> - 
 	To create a new alert the administrator must click in 
 	<inlinegraphic scale='50' 
-	fileref="images/SNMP_alert_create.png"/>.  Then appear the
+	fileref="images/SNMP_alert_create.png"/>. Then appears the
 	following screen:
 	</para>
 	<graphic scale='70' fileref="images/SNMP_alert_create1.png" 

pandora_doc/en/pandora_chapter4.xml

@@ -287,23 +287,24 @@
   <sect1 id="sec4.5">
 	<title>Messages</title>
 	<para>
-	 In Pandora 1.2 is possible send messages to others user. Each user can 
+	 In Pandora 1.2 it is possible to send messages to others user. 
-	 see his/her messages in Operation, Messages.
+	 Each user can see his/her messages in "Messages" in the Operation
+	 menu.
 	</para>
 	
 	<graphic scale='80' fileref="images/messages.png" valign="bottom" 
 		 align="center"/>
 
 	<para>
-	To send a message to other user you must click in  Operation, Messages, 
+	To send a message to other user you must click in "Messages" &gt; 
-	"New mesage" 
+	"New mesage" in the Operation menu.
 	</para>
 	
 	<graphic scale='80' fileref="images/messages1.png" valign="bottom" 
 		 align="center"/>
 	<para>
-	Is possible send a mmesage a group in Operation, Messages, Messages to 
+	It is possible to send a message to a group from "Messages to groups"
-	group. 
+	&gt; "New mesage" in the Operation menu. 
 	</para>
 	<graphic scale='80' fileref="images/messages2.png" valign="bottom" 
 		 align="center"/>

pandora_doc/en/pandora_chapter5.xml

@@ -110,7 +110,7 @@
 	    </listitem>
 	    <listitem>
 	      <para>
-		Total events divided by the group the agent raising
+		Total events divided by the group the agent that launched
 		the event belongs to
 	      <graphic fileref="images/image048.png" valign="bottom" 
 		       align="center"/>

pandora_doc/en/pandora_chapter6.xml

@@ -10,8 +10,8 @@
   
   <para>
     The system audit includes actions that somehow try to by pass the 
-    security system: attempts to delete an incident by an unauthorised 
+    security system: attempts to delete an incident by an unauthorized 
-    user, attemps to change user profiles by unauthoried users, etc.
+    user, attempts to change user profiles by unauthorized users, etc.
     Its main function is, however, to trace the user connections 
     (login/logout).
   </para>

pandora_doc/en/pandora_chapter7.xml

@@ -6,8 +6,8 @@
     Data Server or SNMP Server.
   </para>
   <para>
-   Is posible manage the Pandora Servers in "Manage Servers" option of the
+   It is possible to manage the Pandora Servers from the "Manage Servers"
-   Administration menu.
+   option of the Administration menu.
   </para>
   <graphic scale='60' fileref="images/Servers.png" valign="bottom" 
 	   align="center"/>
@@ -74,18 +74,18 @@
   </listitem>
   <listitem>
     <para>
-     <emphasis>Action:</emphasis> Icons to modify a server´s properties or
+     <emphasis>Action:</emphasis> Icons to modify a server's properties or
      to delete a server.
     </para> 
   </listitem>
   </itemizedlist>
   <para>
-   Is posible delete a with the icon <inlinegraphic 
+   It is possible delete a server using the icon <inlinegraphic 
    fileref="images/cancel.png"/> 
    </para>
    <para>
-    Is posible change the server´s propirties with the icon <inlinegraphic
+    It is posible to change the server's properties using the icon 
-    fileref="images/config.png"/> 
+	<inlinegraphic fileref="images/config.png"/> 
    </para>
    <para>
     In a Server is posiible modify: Name, IP Address and Description.

pandora_doc/en/pandora_chapter8.xml

@@ -13,7 +13,7 @@
   <para>
     It is obvious that the efficiency and reliability of this
     module is vital for the correct functioning of Pandora.
-    A regular data base maintainance is needed. To do so the data base
+    A regular data base maintenance is needed. To do so the data base
     managers can use standard MySQL commands. Maintaining Pandora database
     in good condition is critital for Pandora to work properly.
   </para>
@@ -63,8 +63,8 @@
      "View Agents" &gt; "Statistics" in the Operation menu.
     </para>
     <para>
-     Is posible to view the Data Base information in mode text pich in the
+     It is possible to view the Data Base information in text mode 
-     link "Press here to get DB Info as text" 
+	 pressing "Press here to get DB Info as text" 
     </para>
     <graphic scale='70' fileref="images/DBText.png" valign="bottom" 
 	     align="center"/>
@@ -74,7 +74,7 @@
     <para>
      Pandora counts with powerful tools for the Administrator to manually
      purge the majority of data stored in the Database. This includes data
-     generated by both the agents and the own server.
+     generated by both the agents and the server by its own.
     </para>
     <sect2 id="sec8.2.1">
     <title>Agent's data purge</title>
@@ -113,7 +113,7 @@
       <title>Purging all the agent's data</title>
       <para>
 	All the out of range data received by an agent can be deleted
-	from the "DB Maintainance"&gt;"Database Purge" option in the
+	from the "DB Maintenance" &gt; "Database Purge" option in the
 	Administration menu.
       </para>
       <para>

pandora_doc/en/pandora_chapter9.xml

@@ -15,7 +15,7 @@
    <emphasis>Language:</emphasis> In following versions or 
    revisions of the actual Pandora version will support more 
    languages. At the moment version 1.2 supports English, Spanish, 
-   Spanish Latin-AMerica Bable, Italian, French, Catalan and 
+   Spanish Latin-America, Bable, Italian, French, Catalan and 
    Portuguese of Brazil.
   </para>
   <para>
@@ -52,17 +52,17 @@
   </para>
   <para>
    <emphasis>Graph order:</emphasis> This value represents the order
-   to create the graphs. The posibility are Righ to left, or left to
+   to create the graphs. The possibility are right to left, or left to
    right.
   </para>
   <para>
   <emphasis>Truetype fonts:</emphasis> This value represents the 
-  capacity to active the truetypefonts.The posibility are Active or 
+  capacity to active the truetypefonts. The possible values are
-  Disable.
+  Active or Disable.
   </para>
   <para>
    <emphasis>Background image:</emphasis> This value represents the 
-   image to background, is possibel change it bettwen severaql 
+   image to background, it is possible to change it between several 
    different images. 
   </para>
   <sect1 id="sec9.1">

pandora_doc/en/pandora_install.xml

@@ -4,9 +4,9 @@
   <sect1 id="prereq">
     <title>Prerequisites</title>
     <para>
-      &pandora; is not only a single app, its composed by
+      &pandora; is not only a single app, it is made up by
-      several shellscript files (Unix Agents), a WEB application in
+      several shellscript files (Unix/Linux Agents), a WEB application
-      PHP (Console), some code in C++ (Windows Agent), some code in
+	  in PHP (Console), some code in C++ (Windows Agent), some code in
       PERL5 (Server) and some structure and data in SQL (Database),
       so, to get all this running you need to have some pieces of
       software installed in your system. This is a list of packages,
@@ -16,10 +16,10 @@
   <sect1 id="servers">
     <title>Pandora Servers</title>
     <para>
-      Pandora 1.2 has three kind of servers: Data server, Network
+      Pandora FMS 1.2 has three kind of servers: Data server, Network
       Server and SNMP Server/Trap console. All of them could be
       installed in the same machine or in different machines, also,
-      you could setup many of them in a High Availability enviroment
+      you could setup many of them in a High Availability environment
       or using it to manage highs loads of data.
     </para>
     <sect2 id="dataserver"><title>Pandora Data Server</title>
@@ -51,16 +51,9 @@
       You can find them at http://www.cpan.org or install using your
       default package instalation system. These packages are in the
       default distribution of Suse 9.1 and Debian 3.0 GNU/Linux. Also
-      available for Solaris in CPAN repository. If you use Windows go
+      available for Solaris in CPAN repository.
-      to http://ppm.activestate.com. Or you can use the ppm tool to
-      download the modules:
-      <programlisting>
-	ppm install DBI
-	ppm install DBD-mysql
-	ppm install Datemanip
-      </programlisting>
       Next, you need to set the TZ (Time Zone) environment
-      variable. In Windows: set TZ=WET (for example)
+      variable.
     </para>
     </sect2>
 
@@ -129,7 +122,7 @@
       <filename>pandora_server_1.2.tar.gz</filename> file.
     </para>
     <para>
-      Create an user pandora in OS. Usually you do that (in GNU/Linux)
+      Create an user pandora in OS. Usually you do that in GNU/Linux
       with commands:
       <programlisting>
 	useraddd pandora -d /home/pandora
@@ -179,11 +172,7 @@
       dbhost localhost
     </programlisting>
     Please change them to your own data. For security reasons isn't
-    recommended use the default values. If you run Pandora Server in
+    recommended use the default values.
-    Windows, you need to use the backslash twice in $dirname, that is:
-    "\\", for example: my
-    $dirname="C:\\pandora\\pandora_server\\data_in";, not needed in
-    $log_file.
   </para>
   <para>
     These are default values, and all must be existing directory and
@@ -193,7 +182,7 @@
     Remember: you need to create the directory /opt/pandora/data_in
     where Pandora Server will read and write data, sent by remote
     agents using ssh/scp. This directory must be owned or with
-    permissions to write for user "pandora". If you dont have a
+    permissions to write for user "pandora". If you don't have a
     "pandora" user yet, create it.
   </para>
   <para>
@@ -302,10 +291,6 @@
       cat pandoradb.sql | mysql -D pandora -u root -p
       cat pandoradb_data.sql | mysql -D pandora -u root -p
     </programlisting>
-    <para>	
-      Note: if your system is Windows, use the command type instead of
-      cat.
-    </para>
     <para>	
       You can also use the source command, if you are connected to
       MySQL, from the MySQL prompt:
@@ -317,9 +302,7 @@
     </programlisting>
     <para>	
       This example is valid using root user in
-      MySQL<footnote><para>Remember if you're in Windows use the
+      MySQL
-      double slash ("//") with the path to the files, not the
-      backslash ("\").</para></footnote>
     </para>
     <para>
       Now we will create an user "pandora" and will be given to it
@@ -340,15 +323,14 @@
       authenticating Web Console, you have to change the way the
       password is stored into the database:
       <programlisting>
-	mysql> set password for 'babel'@'localhost' = old_password('babel');
+		mysql> set password for 'pandora'@'localhost' = old_password('pandora');
       </programlisting>
-      Please note this user will be used by several babel
+      Please note this user will be used by several pandora
-      subcomponents(babel Server, babel Web Console) to access
+      subcomponents (Pandora Server, Pandora Web Console) to access
       database.
     </para>
     </sect2>
     
-    
     <sect2 id="console_install">
       <title>Pandora console install.</title>
       <para>Prior to install Pandora console, you need the following
@@ -486,7 +468,7 @@
     They are developed to work under a given platform, making use of
     the specific tools of the language being used: VBSCript/Windows
     Scripting for Microsoft platforms (Win2000, WinXP y Win2003),
-    ShellScripting for UNIX - which includes Linux, Solaris, AIX, HPUX
+    ShellScripting for UNIX - which includes Linux, Solaris, AIX, HP-UX
     and BSD, as well as the Nokia's IPSO. Pandora agents can be
     developed in virtually any language, given its simple API system
     and being open source. There are branches of the Pandora project

pandora_doc/en/pandora_introduction.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <chapter>
-  <title>Introduction to Pandora</title>
+  <title>Introduction to Pandora FMS</title>
-  <sect1><title>Pandora. The Free monitoring system</title>
+  <sect1><title>Pandora. The Free Monitoring System</title>
   <para>
-    Pandora is a monitoring application to watch systems and
+    Pandora FMS is a monitoring application to watch systems and
     applications. Pandora allows to know the status of any element of
     your bussiness systems. Pandora watch for your hardware, your
     software, your multilayer system and of course your Operating
     System. Pandora could detect a network interface down and the
     movement of any value of the NASDAQ new technology market. If you
     want, Pandora could sent a SMS message when your systems
-    fails... or when Google value low below 330$.
+    fails... or when Google value low below US$ 330.
   </para>
   <para>
-    Pandora adapt, like an octopus, to your systems and requirements,
+    Pandora FMS will adjust, like an octopus, to your systems and
-    because has been designed to be open, modular, multiplattform and
+	requirements, because it has been designed to be open, modular,
-    easy to customize.
+	multiplattform and easy to customize.
   </para>
   </sect1>
   <sect1>
-    <title>Introducing Pandora.</title>
+    <title>Introducing Pandora FMS.</title>
     <para>
       &pandora; is a monitoring tool that allows a system
       administrator to visually analise the status and efficiency of
@@ -90,13 +90,13 @@
 	  the information Pandora needs to work - agent data,
 	  settings, user information, incidents, system settings,
 	  etc. The system can use a MySQL cluster to store the
-	  information, or a high disponibility solution for larger
+	  information, or a High Availability (HA) solution for larger
 	  sytems.
 	</para>
 	<para>
 	  This database can work with any of the platform officially
 	  supported by MySQL. Pandora can be implemented with MySQL
-	  versions 3.0 and 4.0, although the latest is recommended.
+	  versions from 3.0 to 5.0, although the latest is recommended.
 	</para>
       </listitem>
       <listitem>
@@ -114,7 +114,7 @@
 	  AIX, HP-UX and BSD, as well as the Nokia's IPSO. Pandora
 	  agents can be developed in virtually any language, given its
 	  simple API and being open source. Windows agent are
-	  developed in a free development enviroment for C++ and uses
+	  developed in a free development environment for C++ and uses
 	  the same interface and modularity than Unix agents.
 	</para>
 	<para>
@@ -261,7 +261,7 @@
   <para>   
     The XML data file generated by every agent is the core of
     Pandora. This file has the information gathered by the Agent. Its
-    easy structure allows that any user could create it's own
+    easy structure allows that any user could create its own
     developments to be processed in Pandora, or use the included ones.
     An example of the information included into the data file is the
     following one:
@@ -338,8 +338,8 @@
 	<para>
 	  <emphasis>Pandora SNMP Server</emphasis>. This is a PERL
 	  application that parse output from standard snmptradp (we
-	  provide one binary for snmptrapd, but its possible you need
+	  provide one binary for snmptrapd, but it is possible that
-	  to replace it with a binary that runs better in your
+	  you need to replace it with a binary that runs better in your
 	  system). This daemon receives SNMP traps, and Pandora SNMP
 	  Server stores in database and fire alerts assigned in
 	  Pandora SNMP Console.

pandora_doc/en/pandora_migration.xml

@@ -28,7 +28,7 @@
 	<para>
 	  Read documentation about new features of Pandora 1.2.
 	  Migration process doesnt delete any data, you don't loss any
-	  agente, config, or enviroment data, but please, read
+	  agente, config, or environment data, but please, read
 	  _carefully_ all documentation about this process before
 	  trying it.
 	</para>

pandora_doc/en/pandora_userguide.xml

@@ -32,7 +32,7 @@
     <releaseinfo>&pandora_version;</releaseinfo>
     <edition>First Edition(&pandora_version;)</edition>
     <pubdate>
-    November 19th, 2006</pubdate>
+    November 21st, 2006</pubdate>
     <keywordset>
       <keyword>pandora user manual</keyword>
     </keywordset>
@@ -48,18 +48,23 @@
     </legalnotice>
     <revhistory>
 	    <revision>
+	<revnumber>1.2</revnumber>
+	<date>21 November 2006</date>
+	<revremark>Submitted.</revremark>
+      </revision>
+       <revision>
 	<revnumber>1.1</revnumber>
 	<date>10 October 2006</date>
 	<revremark>Submitted.</revremark>
       </revision>
       <revision>
 	<revnumber>1.0</revnumber>
-	<date>11 Sept 2006</date>
+	<date>11 September 2006</date>
 	<revremark>Submitted.</revremark>
       </revision>
       <revision>
 	<revnumber>0.1</revnumber>
-	<date>11 Sept 2006</date>
+	<date>11 September 2006</date>
 	<revremark>First draft for review.</revremark>
       </revision>
     </revhistory>