[MXD2map-commits] r235:00a39e8b6eed

[scm-commit@wald.intevation.org]

details:   http://hg.intevation.org/geospatial/mxd2map/rev/00a39e8b6eed

changeset: 235:00a39e8b6eed

user:      Stephan Holl <stephan.holl at intevation.de>

date:      Fri Aug 05 09:18:53 2011 +0200

description:
* INSTALL.txt: Added a paragraph to make the env-vars available in Apache
* doku/source/_templates/layout.html: defining a custom footer with the
  version-string included
* doku/source/conf.py: adopt versionstring and copyright
* doku/source/functionality.txt: formating-cosmetics, correct icon


diffstat:

 INSTALL.txt                        |  12 ++++++++++++
 doku/source/_templates/layout.html |   8 ++++++++
 doku/source/conf.py                |   6 +++---
 doku/source/functionality.txt      |  15 ++++++++-------
 4 files changed, 31 insertions(+), 10 deletions(-)

diffs (103 lines):

diff -r d20477c1a7f8 -r 00a39e8b6eed INSTALL.txt
--- a/INSTALL.txt	Fri Aug 05 08:41:42 2011 +0200
+++ b/INSTALL.txt	Fri Aug 05 09:18:53 2011 +0200
@@ -147,6 +147,18 @@
 
 #. Copy mapserv.exe from ``c:/ms_6.1-dev/bin/apps/ms`` to ``c:/ms_6.1-dev/bin/``
 
+#. Add environment-variables to apache in order to have WMS-server available::
+
+    SetEnv PROJ_LIB "c:/ms_6.1-dev/bin/proj/SHARE"
+    SetEnv PATH "c:/ms_6.1-dev/bin"
+    SetEnv PATH "c:/ms_6.1-dev/bin/gdal/python/osgeo"
+    
+    # set GDAL_DATA environment variable to location of supporting gdal files
+    SetEnv GDAL_DATA "c:/ms_6.1-dev/bin/gdaldata"
+    
+    # set GDAL_DRIVER_PATH environment variable for gdal plugins
+    SetEnv GDAL_DRIVER_PATH "c:/ms_6.1-dev/bin/gdal/plugins"
+
 
 Configure Logging
 -----------------
diff -r d20477c1a7f8 -r 00a39e8b6eed doku/source/_templates/layout.html
--- a/doku/source/_templates/layout.html	Fri Aug 05 08:41:42 2011 +0200
+++ b/doku/source/_templates/layout.html	Fri Aug 05 09:18:53 2011 +0200
@@ -22,3 +22,11 @@
         <li><a href="http://mxd2map.org">MXD2map website</a>&nbsp;|&nbsp;</li>
         <li><a href="{{ pathto('index') }}">Contents</a></li>
 {% endblock %}
+
+{% block footer %}
+<div class="footer">
+    Version {{ release }} &nbsp;|&nbsp;
+   (&copy) {{ copyright }} &nbsp;|&nbsp;
+    Last updated: {{ last_updated }}
+</div>
+{% endblock %}
diff -r d20477c1a7f8 -r 00a39e8b6eed doku/source/conf.py
--- a/doku/source/conf.py	Fri Aug 05 08:41:42 2011 +0200
+++ b/doku/source/conf.py	Fri Aug 05 09:18:53 2011 +0200
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'MXD2map'
-copyright = u'2011, Bundesamt fuer Seeschifffahrt und Hydrographie, Intevation GmbH'
+copyright = u'2011, Intevation GmbH'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '0.8'
 # The full version, including alpha/beta/rc tags.
-release = '0.1'
+release = '0.8-nightly'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -r d20477c1a7f8 -r 00a39e8b6eed doku/source/functionality.txt
--- a/doku/source/functionality.txt	Fri Aug 05 08:41:42 2011 +0200
+++ b/doku/source/functionality.txt	Fri Aug 05 09:18:53 2011 +0200
@@ -11,7 +11,7 @@
 must have a valid and available data source and must not fit the
 :ref:`restriction-label` described in the appropriate section.
 
-.. image:: ../funktionsweise/funktionsweise-MXD-konverter.png
+.. image:: ../funktionsweise/funktionsweise-MXD2map.png
     :align: center
     :alt: MXD2map-Schema
     :width: 500px
@@ -57,7 +57,9 @@
 the ESRI fonts available. ArcGIS products install these fonts to the default
 windows font folder ``c:\\windows\\fonts``. To make them available for the converter
 there has to be a MapServer font set (see
-http://mapserver.org/mapfile/fontset.html). The MXD2map converter comes with an
+http://mapserver.org/mapfile/fontset.html). 
+
+The MXD2map converter comes with an
 initial fontset containing all relevant ESRI fonts and the free font FreeSans.
 The font set file named fonts.txt can be edited and further fonts can be added.
 To use a font set, the file needs to be referenced in the MapServer template
@@ -65,7 +67,6 @@
 in the conversion process.
 
 The converter uses a separate symbol file to provide symbol sets to the
-
 template to have initial symbols available. If no symbol file is referenced a
 new one is created by the converter if necessary. The resulting symbol set is
 written to the same directory as the output mapfile named
@@ -116,7 +117,7 @@
  * Other features
 
    * Umlauts are translated into its equivalents within LAYER-names,
-   CLASS-names and also mapfile-names. Though it is good standard not to
-   use them since they mostly cause problems when using them within
-   OWS-related services.
-   * 
+     CLASS-names and also mapfile-names. Though it is good standard not to
+     use them since they mostly cause problems when using them within
+     OWS-related services.
+