[Dive4elements-commits] [PATCH 2 of 2] merged

[Wald Commits]

# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1369390925 -7200
# Node ID 127cc609c12b96b9c19b77fab4615c35ee56f57f
# Parent  47775e3a8cf678b1adc0ba814a665da1c271d0e6
# Parent  af29a0bc254a8ffb98e48a96030ed2ec5b7d9d15
merged

diff -r 47775e3a8cf6 -r 127cc609c12b artifacts/doc/conf/mapserver/mapfile.vm
--- a/artifacts/doc/conf/mapserver/mapfile.vm	Fri May 24 12:19:25 2013 +0200
+++ b/artifacts/doc/conf/mapserver/mapfile.vm	Fri May 24 12:22:05 2013 +0200
@@ -20,6 +20,7 @@
       METADATA
         "wms_title"             "FLYS Web Map Service"
         "wms_onlineresource"    "$MAPSERVERURL"
+        "wms_encoding"          "UTF-8"
         "wms_accessconstraints" "none"
         "wms_fees"              "none"
         "wms_addresstype"       "postal"
diff -r 47775e3a8cf6 -r 127cc609c12b artifacts/doc/conf/mapserver/river-mapfile.vm
--- a/artifacts/doc/conf/mapserver/river-mapfile.vm	Fri May 24 12:19:25 2013 +0200
+++ b/artifacts/doc/conf/mapserver/river-mapfile.vm	Fri May 24 12:22:05 2013 +0200
@@ -20,6 +20,7 @@
       METADATA
         "wms_title"             "FLYS Rivers Web Map Service"
         #"wms_onlineresource"    "http://localhost:7777/river-wms" # "$MAPSERVERURL"
+        "wms_encoding"          "UTF-8"
         "wms_accessconstraints" "none"
         "wms_fees"              "none"
         "wms_addresstype"       "postal"