--- a/doc/config-manual/model_of_transitions.tex	Tue May 04 13:36:36 2010 +0000
+++ b/doc/config-manual/model_of_transitions.tex	Tue May 04 14:10:35 2010 +0000
@@ -17,7 +17,7 @@
     (Implementation)
 \end{enumerate}
 
-%% TODO: Add a screenshoot of the GNV WebClient marking GUI elements for FIS,
+%% TODO: Add a Screenshot of the GNV WebClient marking GUI elements for FIS,
 %% product, states and transitions
 
 Main entry point for the configuration is the file \verb+ conf/conf.xml +
@@ -73,7 +73,7 @@
 
 Within each of these files, the steps for gathering the values for the
 parameterisation are configured by defining states, transitions and outputs
-(c.f. \ref{ref:config-a-product}).  The defintion of states, transitions and
+(c.f. \ref{ref:config-a-product}).  The definition of states, transitions and
 outputs reference the actual SQL-statements via identifier. The SQL-statements
 are gathered in the file \verb+conf/queries.txt+.
 
@@ -83,9 +83,9 @@
 It is possible to configure the GNV in many ways.
 It is possible to add or remove FIS, add or remove Products from a FIS or
 to manipulate the steps which must be gone until a product can be create
-a diagramm or generate an CSV-Export.
+a diagram or generate an CSV-Export.
 
-The configuration of the provided FIS are devided in three main parts.
+The configuration of the provided FIS are divided in three main parts.
 
 \begin{itemize}
     \item Configuration of the list of FIS via Artifactfactories
@@ -96,7 +96,7 @@
 \end{itemize}
 
 \subsubsection{Configuration of a FIS}
-The Point of Enty into the system is to configure an Artifactfactory.
+The Point of Entry into the system is to configure an Artifactfactory.
 Each Artifactfactory represents one FIS.
 It is possible to configure several Artifactfactories.
 The Artifactfactories will be configured in the Section 
@@ -111,12 +111,12 @@
 </artifact-factory>
 \end{lstlisting}
 
-At this moment the following Attributes of an Artifact-Factory are configurabel.
+At this moment the following Attributes of an Artifact-Factory are configurable.
 \begin{itemize}
     \item name: The Name of the Artifact. Must be unique in one Artifact-Server
     \item description: Short description which Job the Artifactfactory has to do.
     \item  ttl: The Time to Live: The Time using Milliseconds an Artifact, created using this 
-                factory, can live without any Userinteraction.
+                factory, can live without any User interaction.
     \item artifact: The Name of the Class of the Artifact which should be created.
 \end{itemize}
 
@@ -149,7 +149,7 @@
 For each Artifact-Factory it is necessary to configure one Artifact which will be 
 created using the Factory.
 This Artifact is the representation of the specific FIS.
-It contains the Configuration which products will be serverd for ths FIS.
+It contains the Configuration which products will be served for this FIS.
 
 The Artifacts are configured in the Section /artifact-database/artifacts of 
 the Configurationfile.
@@ -205,11 +205,11 @@
 \subsubsection{Configuration of an Product}
 \label{ref:config-a-product}
 The Products of the different FIS are also modeled as Artifact-Objects.
-The different Products which are currently avaliable are stored in separate
+The different Products which are currently available are stored in separate
 Files in the Folder project.
 
 In those Files the Workflow of each product is configured.  Each step which is
-required to model a new Diagramm is represented using a state in the
+required to model a new diagram is represented using a state in the
 Configuration-File.
 
 To move between those States it is required to model Transitions which define
@@ -217,12 +217,12 @@
 fulfilled.
 
 The Last step is called OutputState. This State is responsible to generate the
-output for the different Formats which can be served from the Product (Diagramm,
+output for the different Formats which can be served from the Product (Diagram,
 CSV, ODV, WMS,...).
 
 \paragraph{States}
 A state is one Step which is required to fetch the Data for generating e.g. an
-Diagramm.
+Diagram.
 
 For example in each Product it is Possible to choose one or more Parameters.
 
@@ -239,16 +239,17 @@
 </state>
 \end{lstlisting}
 
-At this moment the following Attributes of an Artifact-Factory are configurabel.
+At this moment the following Attributes of an Artifact-Factory are configurable.
 \begin{itemize}
     \item id: The Name of the Artifact. Must be unique in one Artifact-Server
     \item description: Short description which Job the Artifactfactory has to do.
     \item queryID: The ID of the Query which should be used to fetch the Data 
-                   displayed in this state. //TODO: Reference to queries.properties
-    \item dataname: The ID of the Data which will be displaied in this State.
+                   displayed in this state. All Queries are defined in the File
+                   conf/queries.properties
+    \item dataname: The ID of the Data which will be displayed in this State.
                     The ID will be use to localize the description of the Data.
     \item data-multiselect: true it is possible to select 1 or more Items.
-                            false ist is possible to select only one Item.
+                            false it is possible to select only one Item.
     \item inputvalues: The Values which can be "feed" to this State and which 
                        will be used as Values in SQL-statements.
 \end{itemize}
@@ -268,7 +269,7 @@
 be put into the SQL-Statement.
 
 It is possible to add one InputValue twice or more often to put its value at
-different positions of the SQl-Statement.
+different positions of the SQL-statement.
 
 \begin{lstlisting}
 <inputvalues>
@@ -279,18 +280,18 @@
 \end{lstlisting}
 
 \begin{itemize}
-    \item name: Name of the Value that could be feed or should be used in SQl-statment.
+    \item name: Name of the Value that could be feed or should be used in SQL-statment.
                 The name must fit to one dataname configured in this State or one other
                 State which was visited before.
     \item type: The type of the Value. This is required for the Validation 
                 of the Value.
                 This might be String, Integer, Double, Date, Point, LineString, 
                 Polygon, Coordinate, Geometry and AttributeName.
-    \item multiselect: true if more than on Value can be feed or put into the SQl-statement.
+    \item multiselect: true if more than on Value can be feed or put into the SQL-statement.
                        false if one on Value will be accepted.
     \item usedinquery: Number how often the value should be put into the SQL-Statement:
                        0: Value will not out into the Statement.
-                       1: Value will put once into the Staement,
+                       1: Value will put once into the Statement,
                        2 or more: Value will be put as often as configured 
                                   into the SQL-Statement (this is useful if 
                                   Inner-Selects are used)
@@ -298,7 +299,7 @@
 
 The next part will explain the usage of inputvalues.
 
-This SQL-statment is configured to use in the State above.
+This SQL-statement is configured to use in the State above.
 
 \begin{lstlisting}
 SELECT DISTINCT 
@@ -425,7 +426,7 @@
 There are different Kind of Transitions which can be used.
 \begin{itemize}
   \item Transitions which only link two States
-  \item Transition which link two States with a aditional Condition. 
+  \item Transition which link two States with a additional Condition. 
         (e.g. If a region was selected in the Regionfilter or not )
 \end{itemize}
 
@@ -468,7 +469,7 @@
 All these Outputstates are Implemented in package de.intevation.gnv.state
 and its subpackages. 
 
-You have to put the fullqulified name of the Outputstate to the Attribute State
+You have to put the fullqualified name of the Outputstate to the Attribute State
 as shown below.
 
 You can configure an OutputState as shown below:
@@ -500,7 +501,7 @@
          IMPLEMENT THE REQUIRED FUNCTIONALITY BEFORE IT IS POSSIBLE
          TO OFFER THIS OUTPUTMODE.
 
-Currently the following outputmodes are supported:
+Currently the following OutputModes are supported:
 
 \begin{itemize}
    \item chart
@@ -533,7 +534,7 @@
 
 \begin{itemize}
    \item name: The name of the Mode. This must not be changed because it is used 
-               by the Programm.
+               by the Program.
    \item description: a short description of this OutputMode. 
    \item parameters: one ore more parameters which will be shown in the GUI e.g. 
                      for changing the Size of an Chart.
@@ -571,7 +572,7 @@
 This Example shows how to add an FIS and which effects it took to the 
 REST-Server.
 
-At first we add the follwing Artifactfactory into the file conf/conf.xml
+At first we add the following Artifactfactory into the file conf/conf.xml
 in Section /artifact-database/artifact-factories which add a new 
 FIS called justanewfis to the Server:
 
@@ -584,14 +585,18 @@
 </artifact-factory>
 \end{lstlisting}
 
-Then we restart the Artifact-database executing the followinig command:
+Then we restart the Artifact-database executing the following command:
 
+\begin{lstlisting}
 /etc/init.d/artifactdb restart
+\end{lstlisting}
 
 Then we check if the new FIS is served by the REST-Server
 calling the following command:
 
+\begin{lstlisting}
 curl http://localhost:8181/factories | xmllint --format - | grep fis\_justanewfis
+\end{lstlisting}
 
 If the FIS was added the new Artifactfactory will be found in the generated 
 XML-Output and it will be shown.
@@ -609,10 +614,10 @@
 </artifact>
 \end{lstlisting}
 
-In this XML- Fragment it is also required to replave the placeholder NEWFISNAME 
+In this XML- Fragment it is also required to replace the placeholder NEWFISNAME 
 with the name which was used to configure the Artifact-Factory.
 
-Now the ArtifactServer can serv an additional FIS without any Products yet.
+Now the ArtifactServer can handle an additional FIS without any Products yet.
 
 To prevent needless Configuration-Work it is useful way to clone an Artifact 
 which handle the same Kind of work as the new FIS.
@@ -693,7 +698,7 @@
 To let the Products work we will choose a Product which
 will contain the sourceid of an existing FIS (e.g 4 Marnet).
 
-At first add the following XMl-Fragment to the new Artifact.
+At first add the following XML-Fragment to the new Artifact.
 \begin{lstlisting}
 <product name= "timeSeries">
     <artifact-factory name="timeSeries" 
@@ -722,23 +727,22 @@
 curl -d "@sample-documents/create-artifact.xml"  http://localhost:8181/create | xmllint --format -
 \end{lstlisting}
 
-The Product timeSeries should be available for ths FIS justanewfis.
+The Product timeSeries should be available for the FIS justanewfis.
  
 Now we should be able to choose the Product.
 This Product should work and you should be able to generate even the defined
 Outputformats.
 
-\subsubsection{Putting SourceID to specific Artifact}
 \subsection{Adding a new Product}
 To add a new Product to the System it is necessary that the required 
-Artifactrepresentation is Implemented in the SourceCode.
+Artifact representation is Implemented in the SourceCode.
 Without doing that step it is not possible to create a new Product.
 
 All Products are configured in separate Files that will be included into the 
-Mainconfiguration using Xlink-References.
+main configuration using Xlink-References.
 
 First Step is to create a new File in the Folder products and there in the 
-subfolder where the Product belongs to (timeseries,verticalprofile,
+sub-folder where the Product belongs to (timeseries,verticalprofile,
 horizontalprofile,horizontalcrosssection,layer,...)
 
 Then you have tor reference this File in the File /conf/conf.xml in the Section