--- a/doc/ChangeLog	Wed May 05 10:07:24 2010 +0000
+++ b/doc/ChangeLog	Wed May 05 10:33:25 2010 +0000
@@ -1,3 +1,13 @@
+2010-05-05  Hans Plum <hans@intevation.de>
+
+	* admin-manual/overview.tex,
+	admin-manual/operating-the-system.tex,
+	admin-manual/installation-base.tex,
+	admin-manual/installation-webclient.tex,
+	admin-manual/installation-artefact-server.tex:
+	Removed sections about deinstallation and monitoring because they were
+	not tested.
+
 2010-05-05  Hans Plum <hans@intevation.de>
 
 	* admin-manual/installation-admin-manual.tex,

--- a/doc/admin-manual/installation-artefact-server.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/installation-artefact-server.tex	Wed May 05 10:33:25 2010 +0000
@@ -135,19 +135,3 @@
   
   Task: Check for a XML-document describing possible expert information
   systems (FIS)
-
-
-\subsubsection*{Deinstallation}
-  Stop server process:
-  /etc/init.d/artefact-server stop
-  
-  Remove integration in INIT-process:
-  rm -fi /etc/init.d/artefact-server
-  update-rc.d artefact-server remove
-
-  Remove Binaries, Configuration, Caches, Artefact-Database:
-  rm -rfi /opt/artefact-server
-  rm -rfi /opt/artefact-server-\$VERSION
-
-  Remove logging directories
-  rm -rfi /var/log/artifacts

--- a/doc/admin-manual/installation-base.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/installation-base.tex	Wed May 05 10:33:25 2010 +0000
@@ -1,4 +1,4 @@
-\section{Installationguide}
+\section{Installation and Configuration}
 
 This section describes preconditions for the entire system and an
 installation on a Debian 5.0.x (Lenny) for the GNV-System without an
@@ -13,7 +13,7 @@
 
 \subsection{Preconditions}
 
-\subsubsection{System}
+\subsubsection*{System}
 
 \begin{itemize}
   \item Storage for the delivered software: 100 MB
@@ -27,7 +27,7 @@
     caching
 \end{itemize}
 
-\subsubsection{Database: Software and Data}
+\subsubsection*{Database: Software and Data}
 
 The software has been developed for the following system:
 
@@ -42,7 +42,7 @@
     ENC Data Model. - ESRI Data Models. http://support.esri.com/datamodels
   \item CONTIS -- Federal Maritime and Hydrographic Agency (BSH). Continental 
     Shelf Information System --
-    http://www.bsh.de/en/Marine\_uses/Industry/CONTIS\_maps/index.jsp
+    \url{http://www.bsh.de/en/Marine\_uses/Industry/CONTIS\_maps/index.jsp}
   \item GNV specific schema MapViewer interface -- Schema for integrating with MapViewer and
     their WMS services
   \item GNV specific schema for managing the cache -- The central
@@ -54,7 +54,7 @@
 \subsection{Operating System}
 
 {\em Hint}: Configuring of partitions, firewalls, etc. for the system is out of
-the scope of this project.
+the scope of this documentation.
 
 \subsection{Java Environment}
 
@@ -96,7 +96,7 @@
 
 \subsubsection*{Configuration}
 
-To ensure that the Apache Tomcat and the GNV Artefact Server will use
+To ensure that the Apache Tomcat and the GNV Artifact-Server will use
 Sun Java 6 exclusively, switch to the default Java version
 globally\footnote{This manual assumes that there are no other packages
 depending to another Java version.}.
@@ -136,13 +136,6 @@
 \end{lstlisting}
 
 
-\subsubsection*{Uninstalling}
-
-For removing Sun Java from the operating system, use:
-
-\verb+apt-get --purge remove sun-java6-jdk+
-
-
 \subsection{Tomcat Application Server}
 To run the GNV-System a Apache Tomcat Server Version 5.5 is required.
 This section describes the steps for installing and configuring
@@ -211,12 +204,6 @@
 If there are problems, setup \verb+ mod_jk+ module in Apache WebServer
 and check its according log files.
 
-\subsubsection*{Uninstalling Apache Tomcat}
-
-To uninstall the Apache Tomcat, use the following:
-\verb+ apt-get --purge remove tomcat5.5+
-
-
 \subsection{Apache Webserver}
 This section describes the required steps for the installation and configuration 
 of the Apache Webserver Version 2.2. Apache WebServer controls all
@@ -288,12 +275,6 @@
 the startpage of the GNV WebClient.
 
 
-\subsubsection*{Uninstalling the Apache Webserver}
-To uninstall the Apache Webserver and its configuration, you can use the
-following command:
-\verb+ apt-get purge apache2+
-
-
 \subsection{UMN MapServer: Installation and configuration}
 The UMN MapServer is part of the artifact server. It is responsible for
 rendering shapefiles produced by the artifact-server and publish them as
@@ -343,14 +324,3 @@
 
 For a sucessful configuration, the response document \verb+ mapserver+
 contains a XML document describing the capabilities of the mapserver.
-
-
-\subsubsection*{Un-installing UMN- Mapserver}
-
-To uninstall the UMN-mapserver without its dependencies, execute the following:
-
-\begin{lstlisting}
-cd /usr/lib/cgi-bin
-rm -i gnv-wrapper
-apt-get purge cgi-mapserv-gp
-\end{lstlisting}

--- a/doc/admin-manual/installation-webclient.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/installation-webclient.tex	Wed May 05 10:33:25 2010 +0000
@@ -46,18 +46,3 @@
 
 The file \verb+gnv+ includes HTML describing the startpage of the
 GNV-WebClient.
-
-\subsubsection*{Uninstall the GNV-WebClient}
-To uninstall the GNV-Client, the war-Archive can be removed.
-\begin{lstlisting}
-  rm /usr/share/tomcat5.5/webapps/gnv.war
-\end{lstlisting}
-
-The Tomcat application server should undeploy /remove the application
-automatically. If not, execute the following commands additionally:
-
-\begin{lstlisting}
-  /etc/init.d/tomcat5.5 stop
-  rm -rf /usr/share/tomcat5.5/webapps/gnv
-  /etc/init.d/tomcat5.5 start
-\end{lstlisting}

--- a/doc/admin-manual/operating-the-system.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/operating-the-system.tex	Wed May 05 10:33:25 2010 +0000
@@ -36,12 +36,6 @@
   /etc/init.d/artefact-server restart
   \end{lstlisting}
 
-\subsubsection*{Monitoring the System}
-
-C.f. Chapter~\ref{ref:artifact-server-testing},
-p.~\pageref{ref:artifact-server-testing} for testing the installation on
-different levels: operating system, network and service availability.
-
 \subsubsection*{Troubleshooting}
 
 \paragraph*{Database problems}
@@ -94,10 +88,6 @@
    /etc/init.d/tomcat5.5 restart
  \end{lstlisting}
 
-\subsubsection*{Monitoring the System}
-
-For different possibilities c.f. Testing the installation
-
 \subsubsection*{Troubleshooting}
 
 If the GNV-WebClient can not be accessed through the Apache WebServer, do the

--- a/doc/admin-manual/overview.tex	Wed May 05 10:07:24 2010 +0000
+++ b/doc/admin-manual/overview.tex	Wed May 05 10:33:25 2010 +0000
@@ -6,8 +6,8 @@
 % TODO: Add architecture of the system in english
 
 \begin{enumerate}
-\item Artefact-Server
-The Artefact-Server is a middleware component, managing the core tasks:
+\item Artifact-Server \\
+The Artifact-Server is a middleware component, managing the core tasks:
 \begin{itemize}
    \item Access to the database backend
    \item Providing a RESTful-Interface with a XML-based protocol to serve
@@ -20,17 +20,17 @@
    \item Managing the WMS-Server for creating maps dynamically
 \end{itemize}
 
-\item Database Backend
+\item Database Backend \\
 Database schemata like ESRI ArcMarineBSH, ArcS57 and CONTIS can be
 served out of a ESRI ArcSDE 9.3.1 database.
 
-\item WMS-Server
+\item WMS-Server \\
 The WMS-Server provides maps via the standardized interface of the OGC
 Web Map Service. The configuration is managed through the
 artefact-server depending on the parameterization done be the user in
 the GNV-WebClient
 
-\item GNV-WebClient
+\item GNV-WebClient \\
 The GNV-WebClient is a thin webbased client providing a HTML-based user
 interface for the user to parameterize the FIS and products via the
 XML-based protocol provided by the artefact-server through its
@@ -59,7 +59,7 @@
 
 \section{Deliverables}
 \begin{enumerate}
-  \item \verb+ artefact-server-$VERSION.tar.bz2+ -- Artefact-Server of the 
+  \item \verb+ artefact-server-$VERSION.tar.bz2+ -- Artifact-Server of the 
     GNV-System as package for installation
   \item \verb+ gnv-$VERSION.war+ -- Web Application Archive for
     deploying in Apache Tomcat