Merge pull request #74 from deegree/handbook

Last minute handbook fixes for 3.2

deegree-services/deegree-webservices-handbook/src/main/sphinx/coveragestores.rst

@@ -4,12 +4,7 @@
 Coverage stores
 ===============
 
-Coverage stores are resources that provide access to raster data. The two most common use cases for coverage stores in a deegree workspace are:
-
-* Accessing via WCS
-* Providing of data for raster layers
-
-You can access this configuration level by clicking on the **coverage stores** link in the administration console. The configuration files are located in the **datasources/coverage/** subdirectory of the active deegree workspace directory.
+Coverage stores are resources that provide access to raster data. The most common use case for coverage stores is to provide data for coverage layers. You can access this configuration level by clicking the **coverage stores** link in the service console. The corresponding resource configuration files are located in subdirectory **datasources/coverage/** of the active deegree workspace directory.
 
 .. figure:: images/workspace-overview-coverage.png
    :figwidth: 80%
@@ -27,7 +22,6 @@ Raster
 The most common method to provide coverages with deegree, is to use Raster.
 With the Raster configuration it is possible to provide single RasterFiles or a complete RasterDirectory directly.
 
-
 Here are two examples showing RasterFile and RasterDirectory configuration:
 
 .. code-block:: xml
@@ -44,10 +38,11 @@ Here are two examples showing RasterFile and RasterDirectory configuration:
     <RasterDirectory>../../../data/utah/raster/Satellite_Provo/</RasterDirectory>
   </Raster>
 
-* A Raster can have several attributes:
- * The originLocation attribute can have the values center or outer to declare the pixel origin of the coverage.
- * The nodata attribute can be optionally used to declare a nodata value.
- * The readWorldFiles parameter can have the values true or false to indicate if worlfiles will be read. Default value is true.
+A Raster can have several attributes:
+
+* The originLocation attribute can have the values center or outer to declare the pixel origin of the coverage.
+* The nodata attribute can be optionally used to declare a nodata value.
+* The readWorldFiles parameter can have the values true or false to indicate if worlfiles will be read. Default value is true.
 * The StorageCRS paramter is optional but recommended. It contains the EPSG code of the coverage sources.
 * The RasterFile and RasterDirectory parameters contain the path to your coverage sources. The RasterDirectory paramter can additionally have the recursive attribute with true and false as value to declare subdirectories to be included.
 
@@ -102,10 +97,10 @@ The following example shows, how to configure a coverage pyramid:
 
 .. code-block:: xml
 
-<Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/datasource/coverage/raster/3.1.0/pyramid.xsd" configVersion="3.1.0">
-      <PyramidFile>data/example.tif</PyramidFile>
-      <CRS>EPSG:4326</CRS>
-</Pyramid>
+  <Pyramid xmlns="http://www.deegree.org/datasource/coverage/pyramid" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.deegree.org/datasource/coverage/pyramid http://schemas.deegree.org/datasource/coverage/raster/3.1.0/pyramid.xsd" configVersion="3.1.0">
+    <PyramidFile>data/example.tif</PyramidFile>
+    <CRS>EPSG:4326</CRS>
+  </Pyramid>
 
 * A Pyramid contains a PyramidFile parameter with the path to the pyramid as its value.
-* A Pyramid contains a CRS parameter describing the source CRS of the pyramid as EPSG code.
+* A Pyramid contains a CRS parameter describing the source CRS of the pyramid as EPSG code.

deegree-services/deegree-webservices-handbook/src/main/sphinx/installation.rst

@@ -21,7 +21,7 @@ Supported Java versions are `OpenJDK <http://openjdk.java.net>`_ version 7 (curr
 Downloading
 -----------
 
-deegree webservices ${project.version} downloads are available on the `deegree home page <http://www.deegree.org>`_. You have the choice of two flavors:
+deegree webservices downloads are available on the `deegree home page <http://www.deegree.org>`_. You have the choice of two flavors:
 
 * *ZIP*: Multi-operating system package bundled with Apache Tomcat
 * *WAR*: Plain Java Web Archive for deployment in an existing servlet container [#f2]_

deegree-services/deegree-webservices-handbook/src/main/sphinx/intro.rst

@@ -32,7 +32,7 @@ deegree WFS is an implementation of the `OGC Web Feature Service specification <
 * Supports numerous backends, such as PostGIS, Oracle Spatial, MS SQL Server, Shapefiles or GML instance documents
 
 .. tip::
-  In order to learn about configuring a deegree-based WFS, it is recommended to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-utah` and :ref:`anchor-workspace-inspire` for example deegree WFS configurations. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wfs`.
+  In order to learn the setup and configuration of a deegree-based WFS, we recommend to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-inspire` and :ref:`anchor-workspace-utah` for example deegree WFS configurations. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wfs`.
 
 ------------------------------
 Characteristics of deegree WMS
@@ -54,7 +54,7 @@ deegree WMS is an implementation of the `OGC Web Map Service specification <http
 * Can render rich data models directly
 
 .. tip::
-  In order to learn about configuring a deegree-based WMS, it is recommended to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-utah` and :ref:`anchor-workspace-inspire` for example deegree WMS configurations. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wms`.
+  In order to learn the setup and configuration of a deegree-based WMS, we recommend to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-utah` and :ref:`anchor-workspace-inspire` for example deegree WMS configurations. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wms`.
 
 -------------------------------
 Characteristics of deegree WMTS
@@ -69,7 +69,7 @@ deegree WMTS is an implementation of the `OGC Web Map Tile Service specification
 * Supports GetFeatureInfo for remote WMS backends
 
 .. tip::
-  In order to learn about configuring a deegree-based WMTS, it is recommended to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. TODO: provide example workspace for WMTS. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wmts`.
+  In order to learn the setup and configuration of a deegree-based WMTS, we recommend to read :ref:`anchor-installation` and :ref:`anchor-lightly` first. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wmts`.
 
 ------------------------------
 Characteristics of deegree CSW
@@ -89,7 +89,7 @@ deegree CSW is an implementation of the `OGC Catalogue Service specification <ht
 * Complex filter expressions
 
 .. tip::
-  In order to learn about configuring a deegree-based CSW, it is recommended to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-csw` for an example deegree CSW configuration. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-csw`.
+  In order to learn the setup and configuration of a deegree-based CSW, we recommend to read :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-csw` for an example deegree CSW configuration. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-csw`.
 
 ------------------------------
 Characteristics of deegree WPS
@@ -99,8 +99,8 @@ deegree WPS is an implementation of the `OGC Processing Service specification <h
 
 * Implements WPS standard 1.0.0
 * Supports KVP, XML and SOAP requests
+* Pluggable process provider layer
 * Easy-to-use API for implementing Java processes
-* Pluggable process provider layer (included: Java, Sextante)
 * Supports all variants of input/output parameters: literal, bbox, complex (binary and xml)
 * Streaming access for complex input/output parameters
 * Processing of huge amounts of data with minimal memory footprint
@@ -110,7 +110,7 @@ deegree WPS is an implementation of the `OGC Processing Service specification <h
 * Supports asynchronous execution (with polling of process status)
 
 .. tip::
-  In order to learn about configuring a deegree-based WPS, it is recommended to read chapters :ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-wps` for an example deegree WPS configuration. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wps`.
+  In order to learn the setup and configuration of a deegree-based WPS, we recommend to read:ref:`anchor-installation` and :ref:`anchor-lightly` first. Check out :ref:`anchor-workspace-wps` for an example deegree WPS configuration. Continue with :ref:`anchor-configuration-basics` and :ref:`anchor-configuration-wps`.
 
 .. rubric:: Footnotes
 

deegree-services/deegree-webservices-handbook/src/main/sphinx/layers.rst

@@ -211,6 +211,7 @@ Here is an example snippet:
     <l:AntiAliasing>TEXT</l:AntiAliasing>
   </l:LayerOptions>
 
+.. _anchor-configuration-feature-layers:
 
 --------------
 Feature layers