--- a/doc/config-manual/general_settings.tex	Mon May 10 21:47:24 2010 +0000
+++ b/doc/config-manual/general_settings.tex	Wed May 12 11:35:25 2010 +0000
@@ -8,7 +8,7 @@
 {\bf Within the configuration the key 
 {\verb+${artifacts.config.dir}+} can be used to reference the central
 configuration directory of the artifact-server instance, e.g. 
-{\tt /opt/artifact-server}.}
+{\tt /opt/artifact-server/conf}.}
 
 The following structure gives an overview of the entire structure
 starting from {\tt conf/}:
@@ -66,7 +66,8 @@
 The documentation of the configuration will be split up in 4 sections
 addressing different tasks:
 \begin{enumerate}
-    \item "Configuring and Running Artifact-Server" covering the main elements {\tt
+    \item "Configuring and Running Artifact-Server" covering the main elements 
+    \texttt{
 geo-backend, rest-server, database, ehcache, cleaner, export-secret}
     \item "Generating Charts -- Background and Configuration" covering
     the main element {\tt gnv}
@@ -76,51 +77,3 @@
     SQL-Statements" covering the main elements {\tt factories,
     artifacts}
 \end{enumerate}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Some additional Configurations will be done using Systemproperties. This 
-Properties will be listed in the last Section of this chapter.
-
-
-\subsubsection{artifact-factories}
-
-These Section configures the Factories for Artifacts which can be used.
-The meaning of artifact-factories are explained in Section TODO: LINK to Model of Transition
-
-\subsubsection{artifacts}
-
-These Section configures the Artifacts which could be reached using the Artifact-Server.
-The meaning of artifacts are explained in Section TODO: LINK to Model of Transition
-
-\subsection{Configure ArtifactServer using Systemproperties}
-\begin{itemize}
-    \item artifact.database.dir The folder where the Configuration is located-
-    \item query.executor.factory: The absolute  Classname which QueryExecutorfactory should be used
-    \begin{itemize}
-        \item de.intevation.gnv.geobackend.base.query.QueryExecutorFactory :
-              Standardfactory without any Addons.
-        \item de.intevation.gnv.geobackend.base.query.CachingQueryExecutorFactory: 
-              Factory with Cache for SQL-Query-Results
-    \end{itemize}
-    \item caching.query.executor.config: The absolute Path to the Configurationfile 
-                                         for the Cache which stores the SQL-Query-
-                                         Results. This only take effect if the
-                                         query.executor.factory-Property is set
-                                         to de.intevation.gnv.geobackend.base.query.CachingQueryExecutorFactory.
-    \item caching.cleaner.interval: The Interval in seconds the Caches should be cleaned using the Cachecleaner
-\end{itemize}
-