[mapserver-commits] r12787 - branches/branch-6-0/docs/en/include
branches/branch-6-0/docs/en/ogc trunk/docs/en/include
trunk/docs/en/ogc
svn at osgeo.org
svn at osgeo.org
Fri Nov 18 08:56:59 EST 2011
Author: havatv
Date: 2011-11-18 05:56:59 -0800 (Fri, 18 Nov 2011)
New Revision: 12787
Modified:
branches/branch-6-0/docs/en/include/labels.inc
branches/branch-6-0/docs/en/ogc/ogc_support.txt
branches/branch-6-0/docs/en/ogc/wms_client.txt
trunk/docs/en/include/labels.inc
trunk/docs/en/ogc/ogc_support.txt
trunk/docs/en/ogc/wms_client.txt
Log:
Added notes on WMS client version support (#4088).
Modified: branches/branch-6-0/docs/en/include/labels.inc
===================================================================
--- branches/branch-6-0/docs/en/include/labels.inc 2011-11-17 17:42:42 UTC (rev 12786)
+++ branches/branch-6-0/docs/en/include/labels.inc 2011-11-18 13:56:59 UTC (rev 12787)
@@ -77,6 +77,27 @@
management :ref:`File Management <management>`
map :ref:`MAP <map>`
map_context :ref:`Map Context <map_context>`
+ mapcache_formats :ref:`MapCache Image Formats <mapcache_formats>`
+ mapcache_jpeg_format :ref:`MapCache JPEG Format <mapcache_jpeg_format>`
+ mapcache_png_format :ref:`MapCache PNG Format <mapcache_png_format>`
+ mapcache_mixed_format :ref:`MapCache Mixed PNG+JPEG Format <mapcache_mixed_format>`
+ mapcache_caches :ref:`MapCache Cache Backends <mapcache_caches>`
+ mapcache_grids :ref:`MapCache Tile Grids <mapcache_grids>`
+ mapcache_cache_sqlite :ref:`MapCache Sqlite Caches <mapcache_cache_sqlite>`
+ mapcache_cache_disk :ref:`MapCache Disk Caches <mapcache_cache_disk>`
+ mapcache_cache_memcache :ref:`MapCache Memcache Caches <mapcache_cache_memcache>`
+ mapcache_cache_tiff :ref:`MapCache TIFF Caches <mapcache_cache_tiff>`
+ mapcache_services :ref:`MapCache Tile Services <mapcache_services>`
+ mapcache_ve :ref:`MapCache VirtualEarth Quadkey Tile Service <mapcache_ve>`
+ mapcache_tms :ref:`MapCache Tile Map Service <mapcache_tms>`
+ mapcache_kml :ref:`MapCache Super-Overlay KML Services <mapcache_kml>`
+ mapcache_wmts :ref:`MapCache OGC WMTS Service <mapcache_wmts>`
+ mapcache_wms :ref:`MapCache OGC WMS Service <mapcache_wms>`
+ mapcache_gmaps :ref:`MapCache GoogleMaps Tile Service <mapcache_gmaps>`
+ mapcache_proxying :ref:`MapCache Proxying Support <mapcache_proxying>`
+ mapcache_dimensions :ref:`MapCache Tileset Dimensions <mapcache_dimensions>`
+ mapcache_featureinfo :ref:`MapCache FeatureInfo Requests <mapcache_featureinfo>`
+ mapcache_tile_assembling :ref:`MapCache Tile Assembling <mapcache_tile_assembling>`
mapcontext_cgi :ref:`Map Context Files <mapcontext_cgi>`
mapfile :ref:`Mapfile <mapfile>`
mapfile_tuning :ref:`Mapfile <mapfile_tuning>`
@@ -93,6 +114,7 @@
oci :ref:`Oracle Spatial <oci>`
oci_install :ref:`Oracle Installation <oci_install>`
ogc :ref:`OGC Support and Configuration <ogc>`
+ ogc_support :ref:`OGC Support <ogc_support>`
ogr :ref:`OGR <ogr>`
online_resource_wms :ref:`More About the Online Resource URL <online_resource_wms>`
optimization :ref:`Optimization <optimization>`
Modified: branches/branch-6-0/docs/en/ogc/ogc_support.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/ogc_support.txt 2011-11-17 17:42:42 UTC (rev 12786)
+++ branches/branch-6-0/docs/en/ogc/ogc_support.txt 2011-11-18 13:56:59 UTC (rev 12787)
@@ -1,9 +1,18 @@
-.. _ogcsupport:
+.. index::
+ single: OGC Support
+.. _ogc_support:
+
+*******************************************************************************
Mapserver OGC Specification support
--------------------------------------------------------------------------------
+*******************************************************************************
-* Web Map Service (OGC:WMS) 1.0.0, 1.0.7, 1.1.0, 1.1.1, 1.3.0
+* Web Map Service (OGC:WMS)
+
+ * Server: 1.0.0, 1.0.7, 1.1.0, 1.1.1, 1.3.0
+
+ * Client: 1.0.0, 1.0.7, 1.1.0, 1.1.1
+
* Web Feature Service (OGC:WFS) 1.0.0, 1.1.0
* Web Coverage Service (OGC:WCS) 1.0.0, 1.1.0, 2.0.0
* Geography Markup Language (OGC:GML) 2.1.2, 3.1.0 Level 0 Profile
Modified: branches/branch-6-0/docs/en/ogc/wms_client.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/wms_client.txt 2011-11-17 17:42:42 UTC (rev 12786)
+++ branches/branch-6-0/docs/en/ogc/wms_client.txt 2011-11-18 13:56:59 UTC (rev 12787)
@@ -25,6 +25,10 @@
MapServer's WMS connection type to include layers from remote WMS servers in
MapServer applications.
+Mapserver supports the following WMS versions when acting as client:
+1.0.0, 1.0.7, 1.1.0, 1.1.1 (see :ref:`ogc_support` for an updated
+list).
+
This document assumes that you are already familiar with certain aspects of
MapServer:
@@ -247,7 +251,7 @@
- **PROJECTION object**
- it is optional at this point. MapServer will create one internally if needed. Including one may
- allow MapServer to avoid looking up a definition in the PROJ.4 init files.
+ allow MapServer to avoid looking up a definition in the PROJ.4 init files.
- **"wms_auth_username" metadata**
- msEncrypt-style authorization string. Empty strings are also accepted.
Modified: trunk/docs/en/include/labels.inc
===================================================================
--- trunk/docs/en/include/labels.inc 2011-11-17 17:42:42 UTC (rev 12786)
+++ trunk/docs/en/include/labels.inc 2011-11-18 13:56:59 UTC (rev 12787)
@@ -114,6 +114,7 @@
oci :ref:`Oracle Spatial <oci>`
oci_install :ref:`Oracle Installation <oci_install>`
ogc :ref:`OGC Support and Configuration <ogc>`
+ ogc_support :ref:`OGC Support <ogc_support>`
ogr :ref:`OGR <ogr>`
online_resource_wms :ref:`More About the Online Resource URL <online_resource_wms>`
optimization :ref:`Optimization <optimization>`
Modified: trunk/docs/en/ogc/ogc_support.txt
===================================================================
--- trunk/docs/en/ogc/ogc_support.txt 2011-11-17 17:42:42 UTC (rev 12786)
+++ trunk/docs/en/ogc/ogc_support.txt 2011-11-18 13:56:59 UTC (rev 12787)
@@ -1,9 +1,18 @@
-.. _ogcsupport:
+.. index::
+ single: OGC Support
-Support for OGC Specifications
--------------------------------------------------------------------------------
+.. _ogc_support:
-* Web Map Service (OGC:WMS) 1.0.0, 1.0.7, 1.1.0, 1.1.1, 1.3.0
+*******************************************************************************
+Mapserver OGC Specification support
+*******************************************************************************
+
+* Web Map Service (OGC:WMS)
+
+ * Server: 1.0.0, 1.0.7, 1.1.0, 1.1.1, 1.3.0
+
+ * Client: 1.0.0, 1.0.7, 1.1.0, 1.1.1
+
* Web Feature Service (OGC:WFS) 1.0.0, 1.1.0
* Web Coverage Service (OGC:WCS) 1.0.0, 1.1.0, 2.0.0
* Geography Markup Language (OGC:GML) 2.1.2, 3.1.0 Level 0 Profile
Modified: trunk/docs/en/ogc/wms_client.txt
===================================================================
--- trunk/docs/en/ogc/wms_client.txt 2011-11-17 17:42:42 UTC (rev 12786)
+++ trunk/docs/en/ogc/wms_client.txt 2011-11-18 13:56:59 UTC (rev 12787)
@@ -25,6 +25,10 @@
MapServer's WMS connection type to include layers from remote WMS servers in
MapServer applications.
+Mapserver supports the following WMS versions when acting as client:
+1.0.0, 1.0.7, 1.1.0, 1.1.1 (see :ref:`ogc_support` for an updated
+list).
+
This document assumes that you are already familiar with certain aspects of
MapServer:
@@ -247,7 +251,7 @@
- **PROJECTION object**
- it is optional at this point. MapServer will create one internally if needed. Including one may
- allow MapServer to avoid looking up a definition in the PROJ.4 init files.
+ allow MapServer to avoid looking up a definition in the PROJ.4 init files.
- **"wms_auth_username" metadata**
- msEncrypt-style authorization string. Empty strings are also accepted.
More information about the mapserver-commits
mailing list