[mapserver-commits] r8106 - in trunk/docs: . cgi input/vector ogc
svn at osgeo.org
svn at osgeo.org
Tue Nov 25 15:47:57 EST 2008
Author: hobu
Date: 2008-11-25 15:47:56 -0500 (Tue, 25 Nov 2008)
New Revision: 8106
Modified:
trunk/docs/cgi/mapserv.txt
trunk/docs/index.txt
trunk/docs/input/vector/index.txt
trunk/docs/input/vector/postgis.txt
trunk/docs/msdocs_style.txt
trunk/docs/ogc/mapcontext.txt
trunk/docs/ogc/mapscript.txt
trunk/docs/ogc/sld.txt
trunk/docs/ogc/sos_server.txt
trunk/docs/ogc/wcs_format.txt
trunk/docs/ogc/wcs_server.txt
trunk/docs/ogc/wfs_client.txt
trunk/docs/ogc/wfs_server.txt
trunk/docs/ogc/wms_client.txt
trunk/docs/ogc/wms_server.txt
trunk/docs/ogc/wms_time.txt
Log:
more document referencing
Modified: trunk/docs/cgi/mapserv.txt
===================================================================
--- trunk/docs/cgi/mapserv.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/cgi/mapserv.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -1,3 +1,9 @@
+.. _mapserv:
+
+*****************************************************************************
+ mapserv
+*****************************************************************************
+
The CGI interface can be tested at the commandline by using the "QUERY_STRING" switch, such as:
::
Modified: trunk/docs/index.txt
===================================================================
--- trunk/docs/index.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/index.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -8,7 +8,7 @@
Contents:
.. toctree::
- :maxdepth: 1
+ :maxdepth: 2
new_users
mapfile/index
Modified: trunk/docs/input/vector/index.txt
===================================================================
--- trunk/docs/input/vector/index.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/input/vector/index.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -80,6 +80,7 @@
arcsde
ArcInfo
pgeo
+ postgis
shapefiles
gml
S57
Modified: trunk/docs/input/vector/postgis.txt
===================================================================
--- trunk/docs/input/vector/postgis.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/input/vector/postgis.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -1,4 +1,4 @@
-.. _postgis:
+.. _input_postgis:
*****************************************************************************
PostGIS/PostgreSQL
@@ -7,9 +7,9 @@
PostGIS/PostgreSQL
------------------
-`PostGIS`_ spatially enables the Open Source `PostgreSQL`_ database.
+`PostGIS <http://postgis.refractions.net/>`_ spatially enables the
+Open Source `PostgreSQL`_ database.
-.. _`PostGIS`: http://postgis.refractions.net/
.. _`PostgreSQL`: http://www.postgresql.org/
Modified: trunk/docs/msdocs_style.txt
===================================================================
--- trunk/docs/msdocs_style.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/msdocs_style.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -19,7 +19,9 @@
MapScript instead of mapscript, Mapscript, or map script.
+HowTo instead of howto or HOWTO.
+
ReStructured Text Formatting
----------------------------
Modified: trunk/docs/ogc/mapcontext.txt
===================================================================
--- trunk/docs/ogc/mapcontext.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/mapcontext.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -456,7 +456,6 @@
.. _`Web Map Context Specification v1.0.0`: http://www.opengeospatial.org/docs/03-036r2.pdf
.. _`Map Context 1.0.0 specification`: http://www.opengeospatial.org/docs/03-036r2.pdf
-.. _`MapServer WMS Client howto`: http://mapserver.gis.umn.edu/docs/howto/wms_client/
.. _`Web Map Server Specification (WMS) v1.1.1`: http://www.opengeospatial.org/docs/01-068r2.pdf
.. _`WMS 1.1.1 specification`: http://www.opengeospatial.org/docs/01-068r2.pdf
.. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
Modified: trunk/docs/ogc/mapscript.txt
===================================================================
--- trunk/docs/ogc/mapscript.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/mapscript.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -48,7 +48,7 @@
The OWSRequest object is used to manage a parsed list of OWS processing
options. In the above example they are loaded from the environment using
the loadParams() call which fetches and parses them from QUERY_STRING in the
-same way the mapserv executable would.
+same way the :ref:`mapserv` executable would.
Then we load a map, and invoke OWSDispatch with the given arguments on that
map. By default the results of the dispatched request are written to stdout
@@ -224,8 +224,8 @@
PHP Example
=============================================================================
-Most of the same capabilities are accessable in php mapscript. Here
-is an example displaying a wms capabilities.
+Most of the same capabilities are accessible in php mapscript. Here
+is an example displaying a :ref:`wms capabilities <wms_capabilities>`.
@@ -303,9 +303,15 @@
=============================================================================
The loadParams() call establish parses the cgi environment varabiables
-(QUERY_STRING, and REQUEST_METHOD) into parameters in the OWSRequest object. In non-cgi environments, such as when php, python and perl are used as "loaded modules" in Apache, or Java with Tomcat, the loadParams() call will not work - in fact in 4.10.x it will terminate the web server instance.
+(QUERY_STRING, and REQUEST_METHOD) into parameters in the OWSRequest object.
+In non-cgi environments, such as when php, python and perl are used as
+"loaded modules" in Apache, or Java with Tomcat, the loadParams() call
+will not work - in fact in 4.10.x it will terminate the web server instance.
-It is necessary in these circumstances for the calling script/application to parse the request url into keyword/value pairs and assign to the OWSRequest object by other means, as shown in some of the above examples explicitly setting the request parameters.
+It is necessary in these circumstances for the calling script/application
+to parse the request url into keyword/value pairs and assign to the
+OWSRequest object by other means, as shown in some of the above examples
+explicitly setting the request parameters.
=============================================================================
Post Processing Capabilities
Modified: trunk/docs/ogc/sld.txt
===================================================================
--- trunk/docs/ogc/sld.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/sld.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -37,14 +37,12 @@
--------------------------------
- `Styled Layer Descriptor Implementation Specification`_.
-- `MapServer WMS Client HOWTO`_.
-- `MapServer WMS Server HOWTO`_.
+- :ref:`MapServer WMS Client HowTo <wms_client>`.
+- :ref:`MapServer WMS Server HowTo <wms_server>`.
- `MapServer OGC Web Services Workshop`_.
- `Open GIS Consortium (OGC) home page`_.
.. _`Styled Layer Descriptor Implementation Specification`: http://www.opengeospatial.org/docs/02-070.pdf
-.. _`MapServer WMS Client HOWTO`: /docs/howto/wms_client
-.. _`MapServer WMS Server HOWTO`: /docs/howto/wms_server
.. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
.. _`Open GIS Consortium (OGC) home page`: http://www.opengeospatial.org
@@ -100,13 +98,14 @@
When MapServer gets a valid SLD through a request, it parses this SLD to extract
all the styles attached to the NamedLayers, and then it applies these styles to
-the map before it is returned to the client. When applying the SLD, MapServer compares the <Name> parameter of the NamedLayers in the SLD document to the WMS layer names (WMS layer names are available in a `GetCapabilities`_ request).
+the map before it is returned to the client. When applying the SLD, MapServer compares the <Name> parameter of the NamedLayers in the SLD document to the WMS layer names (WMS layer names are available in a :ref:`GetCapabilities <wms_capabilities>` request).
-.. _`GetCapabilities`: /howto/wms_server/#validate-the-capabilities-metadata
-Note: All the examples given in this document are live uses of valid SLDs and
-a MapServer installation with SLD support.
+.. note::
+ All the examples given in this document are live uses of valid SLDs
+ and a MapServer installation with SLD support.
+
Additional WMS features related to SLDs have also been developed:
**Table1. Additional WMS Features**
@@ -121,11 +120,14 @@
GetStyles Yes Uses MapScript to get the SLD
===================== ========= =============================
-Note: As of MapServer version 4.2.3, the GetLegendGraphic request (see section 12 of the
-`Styled Layer Descriptor Implementation Specification`_)
-works as follows: if the RULE keyword is absent from the request, an image containing the entire legend for the specified layer will be returned.
-This image consists of the layer name and a symbolization graphic and label for each class.
+.. note::
+ As of MapServer version 4.2.3, the GetLegendGraphic request (see section 12 of
+ the `Styled Layer Descriptor Implementation Specification`_) works as follows:
+ if the RULE keyword is absent from the request, an image containing the
+ entire legend for the specified layer will be returned. This image consists
+ of the layer name and a symbolization graphic and label for each class.
+
Specific SLD Elements Supported
-------------------------------
@@ -198,13 +200,11 @@
For each rule containing a filter, there is a class created with the class
expression set to reflect that filter. Available filters that can be used
- are Comparison Filters and Logical Filters (see the `Filter Encoding HOWTO`_).
+ are Comparison Filters and Logical Filters (see the :ref:`Filter Encoding HowTo <filter_encoding>`).
The ElseFilter parameters are converted into a class in MapServer and placed
at the end of the class list with no expression set. They are used to render
elements that did not fit into any other classes.
-.. _`Filter Encoding HOWTO`: http://mapserver.gis.umn.edu/doc/filter-encoding-howto.html
-
- MinScaleDenomibator and MaxScaleDenominator are translated in minscale and
maxscale in MapServer.
@@ -496,17 +496,21 @@
- on a layer object: ``applysld``
-*Note*: When generating an SLD from MapServer classes, if there is a pixmap symbol
-you need to have this symbol available through a URL so it can be converted as an
-ExternalGraphic symbol in the SLD. To do this, you need to define the URL through
-a web object level metadata called WMS_SLD_SYMBOL_URL in your map file. The SLD
-generated uses this URL and concatenates the name of the pixmap symbol file to get
-the value that is generated as the ExternaGraphic URL.
+.. note::
+
+ When generating an SLD from MapServer classes, if there is a pixmap symbol
+ you need to have this symbol available through a URL so it can be converted
+ as an ExternalGraphic symbol in the SLD. To do this, you need to define
+ the URL through a web object level metadata called WMS_SLD_SYMBOL_URL in
+ your map file. The SLD generated uses this URL and concatenates the
+ name of the pixmap symbol file to get the value that is generated as
+ the ExternaGraphic URL.
PHP/Mapscript Example that Generates an SLD from a Mapfile
----------------------------------------------------------
-The following is a small script that calls the generateSLD() function to create an SLD for a specific layer in a mapfile:
+The following is a small script that calls the generateSLD() function
+to create an SLD for a specific layer in a mapfile:
::
Modified: trunk/docs/ogc/sos_server.txt
===================================================================
--- trunk/docs/ogc/sos_server.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/sos_server.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -61,7 +61,7 @@
Install the Required Software
-----------------------------
-SOS requests are handled by the "mapserv" CGI program. The first step is to check that your mapserv executable includes SOS support. One way to verify this is to use the "-v" command-line switch and look for "SUPPORTS=SOS_SERVER".
+SOS requests are handled by the ":ref:`mapserv`" CGI program. The first step is to check that your mapserv executable includes SOS support. One way to verify this is to use the "-v" command-line switch and look for "SUPPORTS=SOS_SERVER".
Example 1. On Unix:
@@ -95,7 +95,7 @@
- requires ICONV support (*-DUSE_ICONV*) on Windows
-For more help with MapServer compilation see the appropriate howto: `Unix`_ / `Windows`_
+For more help with MapServer compilation see the appropriate HowTo: :ref:`Unix <unix>` / :ref:`Windows <win32>`
Configure a Mapfile For SOS
---------------------------
@@ -155,9 +155,10 @@
http://my.host.com/cgi-bin/mapserv?
-This is covered in more detail in the section "`More About the Online Resource URL`_"
-of the WMS Server document.
+This is covered in more detail in the "More About the Online Resource URL" section
+of the :ref:`WMS Server <online_resource_wms>` document.
+
Example SOS Server Mapfile
--------------------------
@@ -676,5 +677,4 @@
.. _`Unix`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix/
.. _`Windows`: http://mapserver.gis.umn.edu/docs/howto/win32_compiling
.. _`More About the Online Resource URL`: http://mapserver.gis.umn.edu/docs/howto/wms_server/#more-about-the-online-resource-url
-.. _`Reference Section`: ./#reference-section
.. _`http://www.opengeospatial.org/functional/?page=swe`: http://www.opengeospatial.org/functional/?page=swe
\ No newline at end of file
Modified: trunk/docs/ogc/wcs_format.txt
===================================================================
--- trunk/docs/ogc/wcs_format.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wcs_format.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -23,7 +23,7 @@
Landsat
=======
-To serve Landsat imagery through the MapServer Web Coverage Service specify the OutputFormat Object. For format support install the GDAL library and from the Command Prompt cd to where GDAL is installed and use the command, gdalinfo --formats. A list of all supported formats will appear and will specify if the format is read only **<ro>** or read and write **<rw>** for WCS the format needs to be supported for read and write (except for *GDAL's* own WCS format, however).
+To serve Landsat imagery through the MapServer Web Coverage Service specify the :ref:`OUTPUTFORMAT` object. For format support install the GDAL library and from the command prompt and cd to where GDAL is installed and use the command, gdalinfo --formats. A list of all supported formats will appear and will specify if the format is read only **<ro>** or read and write **<rw>** for WCS the format needs to be supported for read and write (except for *GDAL's* own WCS format, however).
For the example below the Landsat 7 15m resolution mosaic is in a Enhanced Compressed Wavelets format (ECW). By running the gdalinfo.exe program I could verify that the ECW format has write permissions, therefore the format can be specified in the MapFile and requested using the GetCoverage request. ::
Modified: trunk/docs/ogc/wcs_server.txt
===================================================================
--- trunk/docs/ogc/wcs_server.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wcs_server.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -30,7 +30,7 @@
- `WCS 1.0.0 specification`_
- `WCS 1.1.1c1 specification`_
-- `WMS Server HOWTO`_
+- :ref:`WMS Server HowTo <wms_server>`
Software Requirements
---------------------
@@ -46,8 +46,8 @@
- libxml2: An xml parser and generation library.
-Please see the `MapServer UNIX Compilation and Installation HOWTO`_ for detailed
-instructions on compiling mapserver with support for these librairies and features.
+Please see the :ref:`MapServer UNIX Compilation and Installation HowTo <unix>` for detailed
+instructions on compiling MapServer with support for these libraries and features.
For Windows users, `MapServer for Windows (MS4W)`_ comes WCS Server support.
Configuring Your Mapfile to Serve WCS Layers
@@ -615,6 +615,4 @@
.. _`WCS 1.0.0 specification`: https://portal.opengeospatial.org/files/?artifact_id=3837
.. _`WCS 1.1.1c1 specification`: http://portal.opengeospatial.org/files/?artifact_id=22560
.. _`Open Geospatial Consortium (OGC)`: http://www.opengeospatial.org/
-.. _`MapServer UNIX Compilation and Installation HOWTO`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix/
.. _`MapServer for Windows (MS4W)`: http://www.maptools.org/ms4w/index.phtml
-.. _`WMS Server HOWTO`: http://mapserver.gis.umn.edu/docs/howto/wms_server/
Modified: trunk/docs/ogc/wfs_client.txt
===================================================================
--- trunk/docs/ogc/wfs_client.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wfs_client.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -48,7 +48,7 @@
Software Requirements
---------------------
-In order to enable MapServer to serve WFS, it MUST be compiled against certain librairies:
+In order to enable MapServer to serve WFS, it MUST be compiled against certain libraries:
- PROJ.4: The reprojection library. Version 4.4.3 or greater is required.
- GDAL/OGR: I/O support librairies. Version 1.1.8 or greater is required.
@@ -65,11 +65,9 @@
Storing Temporary Files
-----------------------
-You must set the IMAGEPATH_ parameter in your mapfile since MapServer uses this
+You must set the :ref:`IMAGEPATH <web>` parameter in your mapfile since MapServer uses this
directory to store temporary files downloaded from the remote WFS server.
-.. _IMAGEPATH: http://mapserver.gis.umn.edu/docs/reference/mapfile/web
-
::
MAP
Modified: trunk/docs/ogc/wfs_server.txt
===================================================================
--- trunk/docs/ogc/wfs_server.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wfs_server.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -53,7 +53,7 @@
- GDAL/OGR: I/O support libraries. Version 1.1.8 or greater is required.
-Please see the MapServer `UNIX Compilation and Installation howto`_ for detailed
+Please see the MapServer :ref:`UNIX Compilation and Installation HowTo <unix>` for detailed
instructions on compiling mapserver with support for these libraries and features.
For Windows users, the `MS4W`_ installer comes ready to serve both WFS and WMS.
@@ -114,7 +114,7 @@
http://my.host.com/cgi-bin/mywfs?
- This is covered in more detail in the section "`More About the Online Resource URL`_"
+ This is covered in more detail in the section ":ref:`More About the Online Resource URL <more-about-the-online-resource-url>`"
of the WMS Server document.
Example WFS Server Mapfile
@@ -197,7 +197,7 @@
using an EPSG code, or of a "wfs_srs" metadata at this level.
Note that at the map top-level the "wfs_srs" metadata value takes precedence over the
-contents of the PROJECTION block.
+contents of the :ref:`PROJECTION` block.
At the layer level, if both the wfs_srs metadata and the PROJECTION object are set
to different values, then the wfs_srs metadata defines the projection to use in
@@ -255,7 +255,7 @@
If you don't have your own WFS client installed already, here are a few pointers:
-- MapServer itself can be used as a WFS client, see the `WFS Client howto`_.
+- MapServer itself can be used as a WFS client, see the :ref:`WFS Client HowTo <wfs_client>`.
- `Deegree`_ provides a WFS client.
@@ -275,7 +275,7 @@
Starting from version 4.2 MapServer supports Filter Encoding (FE) in WFS
GetFeature requests. For more information on the server side of Filter Encoding
-see the `Filter Encoding howto`_.
+see the :ref:`Filter Encoding HowTo <filter_encoding>`.
Reference Section
=================
@@ -543,17 +543,14 @@
.. _`OGC Web Feature Service Implementation Specification`: https://portal.opengeospatial.org/files/?artifact_id=7176
.. _`Geography Markup Language Implementation Specification`: https://portal.opengeospatial.org/files/?artifact_id=7174
.. _`OGC Web Services Workshop package`: http://ms-ogc-workshop.maptools.org/
-.. _`UNIX Compilation and Installation howto`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix
.. _`MS4W`: http://www.maptools.org/ms4w/
.. _`WFS 1.0.0 specification`: https://portal.opengeospatial.org/files/?artifact_id=7176
-.. _`More About the Online Resource URL`: http://mapserver.gis.umn.edu/docs/howto/wms_server/#more-about-the-online-resource-url
-.. _`WFS Client howto`: http://mapserver.gis.umn.edu/docs/howto/wfs_client/
+.. _`More About the Online Resource URL`: http://mapserver.gis.umn.edu/docs/HowTo/wms_server/#more-about-the-online-resource-url
.. _`Deegree`: http://deegree.sourceforge.net/
.. _`owsview`: http://devgeo.cciw.ca/owsview
.. _`uDig`: http://udig.refractions.net/confluence/display/UDIG/Home
-.. _`Filter Encoding howto`: http://mapserver.gis.umn.edu/docs/howto/filterencoding/
.. _`WFS 1.0.0 spec`: https://portal.opengeospatial.org/files/?artifact_id=7176
.. _`GeoServer`: http://docs.codehaus.org/display/GEOS/Home
.. _`GML2 request output`: http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?SERVICE=WFS&VERSION=1.0.0&REQUEST=getfeature&TYPENAME=park&maxfeatures=1&OUTPUTFORMAT=gml2
.. _`GML3 request output`: http://www2.dmsolutions.ca/cgi-bin/mswfs_gmap?SERVICE=WFS&VERSION=1.0.0&REQUEST=getfeature&TYPENAME=park&maxfeatures=1&OUTPUTFORMAT=gml3
-.. _`bug#884`: http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=884
+.. _`bug#884`: http://trac.osgeo.org/mapserver/ticket/884
Modified: trunk/docs/ogc/wms_client.txt
===================================================================
--- trunk/docs/ogc/wms_client.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wms_client.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -34,7 +34,7 @@
WMS-Related Information
-----------------------
-- :ref:`MapServer WMS Server howto <wms_server>`
+- :ref:`MapServer WMS Server HowTo <wms_server>`
- `WMS 1.1.1 specification`_
- `MapServer OGC Web Services Workshop package`_
@@ -47,7 +47,7 @@
`MS4W`_ (which comes ready for WMS/WFS client and server use), or check for the
availability of other `win32 binaries`_ with WMS support.
-- For PROJ4 and GDAL installation, see the MapServer Compilation howto (:ref:`unix` / :ref:`win32`_)
+- For PROJ4 and GDAL installation, see the MapServer Compilation HowTo (:ref:`unix` / :ref:`win32`_)
- For `libcurl`_, make sure you have version 7.10.1 or more recent installed on your
system. You can find out your libcurl version using *curl-config --version*.
(if your system came with an older version of libcurl preinstalled then you MUST
@@ -65,7 +65,7 @@
Once the required libraries are installed, then configure MapServer using the
*--with-wmsclient* switch (plus all the other switches you used to use) and recompile.
This will give you a new set of executables (and possibly php_mapscript.so if you
-requested it). See the MapServer Compilation howto (links above) for installation details.
+requested it). See the MapServer Compilation HowTo (links above) for installation details.
Check your MapServer executable
-------------------------------
@@ -412,11 +412,11 @@
END
- For more information on SLDs in MapServer see the :ref:`SLD howto document <sld>`.
+ For more information on SLDs in MapServer see the :ref:`SLD HowTo document <sld>`.
- **"wms_time" metadata**
- value to use for the TIME parameter in GetMap requests for this layer. Please see the
- `WMS Time Support howto`_ for more information.
+ :ref:`WMS Time HowTo <wms_time>` for more information.
- **"wms_bgcolor" metadata**
- specifies the color to be used as the background of the map. The general format of BGCOLOR is a hexadecimal encoding of an RGB value where two hexadecimal characters are used for each of Red, Green, and Blue color values. The values can range between 00 and FF for each (0 and 255, base 10). The format is 0xRRGGBB; either upper or lower case characters are allowed for RR, GG, and BB values. The "0x" prefix shall have a lower case "x".
@@ -484,5 +484,3 @@
.. _`win32 binaries`: http://mapserver.gis.umn.edu/download/current/windows/
.. _`download a custom Canadian epsg file`: http://www.maptools.org/dl/proj4-epsg-with-42xxx.zip
.. _`custom ESRI epsg file`: http://www.maptools.org/dl/proj4-epsg-with-42xxx-and-esri.zip
-.. _`SLD howto document`: http://mapserver.gis.umn.edu/docs/howto/sldhowto/
-.. _`WMS Time Support howto`: http://mapserver.gis.umn.edu/docs/howto/wms_time_support/
\ No newline at end of file
Modified: trunk/docs/ogc/wms_server.txt
===================================================================
--- trunk/docs/ogc/wms_server.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wms_server.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -35,7 +35,7 @@
Links to WMS-Related Information
--------------------------------
-- `MapServer WMS Client howto`_
+- :ref:`MapServer WMS Client HowTo <wms_client>`
- `WMS 1.1.1 specification`_
- `Open Geospatial Consortium (OGC)`_ home page
- `WMS-Dev mailing list and archive`_
@@ -43,7 +43,7 @@
- `WMS XML Capabilities validator`_
- `WMS Cookbook`_
- `MapServer OGC Web Services Workshop`_ package
-- `MapServer Styled Layer Descriptor (SLD) howto`_
+- :ref:`MapServer Styled Layer Descriptor (SLD) HowTo <sld>`
How does a WMS Work
-------------------
@@ -86,7 +86,7 @@
With respect to MapServer specifically, it is the "mapserv" CGI program that knows
how to handle WMS requests. So setting up a WMS server with MapServer involves installing
-the mapserv CGI program and a setting up a mapfile with appropriate metadata in it.
+the :ref:`mapserv` CGI program and a setting up a mapfile with appropriate metadata in it.
This is covered in the rest of this document.
Setting Up a WMS Server Using MapServer
@@ -95,13 +95,13 @@
Install the Required Software
-----------------------------
-WMS requests are handled by the "mapserv" CGI program. Not all versions of the mapserv
+WMS requests are handled by the :ref:`mapserv` :ref:`CGI` program. Not all versions of the mapserv
program do include WMS support (it is included by default when you compile together
with the PROJ library), so the first step is to check that your mapserv executable
includes WMS support. One way to verify this is to use the "-v" command-line switch
and look for "SUPPORTS=WMS_SERVER".
-(Unix users should refer to the `Unix Compilation and Installation`_ document for any
+(Unix users should refer to the :ref:`unix` document for any
compiling instructions, and Windows users might want to use `MS4W`_, which comes ready
with WMS/WFS support)
@@ -192,7 +192,7 @@
(Note that "epsg" has to be in lowercase when used in the PROJ4 'init' directive.)
- If the MAP PROJECTION block is provided in the format "init=epsg:xxxx" then MapServer
+ If the :ref:`MAP` :ref:`PROJECTION` block is provided in the format "init=epsg:xxxx" then MapServer
will also use this information to generate a <BoundingBox> tag for the top-level
layer in the WMS capabilities document. Note that the BoundingBox is an optional
element of WMS capabilities, but it is good practice to allow MapServer to include
@@ -305,6 +305,8 @@
Test Your WMS Server
--------------------
+.. _wms_capabilities:
+
Validate the Capabilities Metadata
**********************************
@@ -396,7 +398,7 @@
If you don't have your own WMS client installed already, here are a few pointers:
-- MapServer itself can be used as a WMS client, see the `MapServer WMS Client howto`_.
+- MapServer itself can be used as a WMS client, see the :ref:`MapServer WMS Client HowTo <wms_client>`.
- `Deegree`_ provides a WMS client.
@@ -413,6 +415,8 @@
that offer WMS support and could be used to interact with your new MapServer WMS
server instance.
+.. _online_resource_wms:
+
More About the Online Resource URL
----------------------------------
@@ -537,10 +541,10 @@
for (as opposed to generating an icon and label for ALL classes for the layer).
Note that all rules that are used to draw the legend in normal CGI mode apply here.
-See the `CGI Reference doc`_ if necessary.
+See the :ref:`CGI Reference doc <cgi>` if necessary.
-The CLASS object's KEYIMAGE parameter can also be used to specify a legend image for a
-CLASS. See the `MapFile Reference doc`_ if necessary.
+The :ref:`CLASS` object's KEYIMAGE parameter can also be used to specify a legend image for a
+CLASS. See the :ref:`MapFile Reference doc <mapfile>` if necessary.
Example Request
@@ -732,7 +736,7 @@
**wms_timeformat**
- *Description:* The time format to be used when a request is sent. (e.g. "wms_timeformat"
- "%Y-%m-%d %H, %Y-%m-%d %H:%M"). Please see the `WMS Time Support howto`_ for more information.
+ "%Y-%m-%d %H, %Y-%m-%d %H:%M"). Please see the :ref:`WMS Time Support HowTo <wms_time>` for more information.
**wms_title**
@@ -1001,19 +1005,19 @@
**wms_timedefault**
- *Description:* (Optional for Time Support) This value is used if it is defined
- and the Time value is missing in the request. Please see the `WMS Time Support howto`_
+ and the Time value is missing in the request. Please see the :ref:`WMS Time Support HowTo <wms_time>`
for more information.
**wms_timeextent**
- *Description:* (Mandatory for Time Support) This is used in the capabilities to return
the valid time values for the layer. The value defined here should be a valid time range.
- Please see the `WMS Time Support howto`_ for more information.
+ Please see the :ref:`WMS Time Support HowTo <wms_time>` for more information.
**wms_timeitem**
- *Description:* (Mandatory for Time Support) This is the name of the field in the DB that
- contains the time values. Please see the `WMS Time Support howto`_ for more information.
+ contains the time values. Please see the :ref:`WMS Time Support HowTo <wms_time>` for more information.
**wms_title**
@@ -1165,7 +1169,6 @@
.. #### rST Link Section ####
.. _`Web Map Server Interfaces Implementation Specification v1.1.1`: http://www.opengeospatial.org/docs/01-068r2.pdf
-.. _`MapServer WMS Client howto`: http://mapserver.gis.umn.edu/docs/howto/wms_client/
.. _`WMS 1.1.1 specification`: http://www.opengeospatial.org/docs/01-068r2.pdf
.. _`Open Geospatial Consortium (OGC)`: http://www.opengeospatial.org/
.. _`WMS-Dev mailing list and archive`: http://www.intl-interfaces.net/mailman/listinfo/wms-dev
@@ -1173,8 +1176,6 @@
.. _`WMS XML Capabilities validator`: http://www.digitalearth.gov/wmt/xml/validator.html
.. _`WMS Cookbook`: http://www.intl-interfaces.net/cookbook/WMS/
.. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
-.. _`MapServer Styled Layer Descriptor (SLD) howto`: http://mapserver.gis.umn.edu/docs/howto/sldhowto/
-.. _`Unix Compilation and Installation`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix/
.. _`MS4W`: http://www.maptools.org/ms4w/
.. _`MapBrowser`: http://www.maptools.org/maplab/
.. _`OpenJUMP`: http://www.openjump.org
@@ -1182,9 +1183,6 @@
.. _`owsview`: http://devgeo.cciw.ca/owsview
.. _`uDig`: http://udig.refractions.net/confluence/display/UDIG/Home
.. _`WMS 1.1.1 section 6.2.2`: http://www.opengeospatial.org/docs/01-068r2.pdf
-.. _`CGI Reference doc`: http://mapserver.gis.umn.edu/docs/reference/cgi
-.. _`MapFile Reference doc`: http://mapserver.gis.umn.edu/docs/reference/mapfile
-.. _`WMS Time Support howto`: http://mapserver.gis.umn.edu/docs/howto/wms_time_support/
.. _`MapServer error descriptions`: http://mapserver.gis.umn.edu/docs/error
.. _`valid request`: http://www2.dmsolutions.ca/cgi-bin/mswms_gmap?SERVICE=WMS&VERSION=1.1.1&REQUEST=getmap&layers=park,popplace&STYLES=&SRS=EPSG:4326&BBOX=-173.537,35.8775,-11.9603,83.8009&WIDTH=400&HEIGHT=300&FORMAT=image/png
.. _`text/plain`: http://www2.dmsolutions.ca/cgi-bin/mswms_gmap?&SERVICE=wms&VERSION=1.1.1&REQUEST=getfeatureinfo&LAYERS=popplace&QUERY_LAYERS=popplace&x=305&y=200&INFO_FORMAT=text/plain
Modified: trunk/docs/ogc/wms_time.txt
===================================================================
--- trunk/docs/ogc/wms_time.txt 2008-11-25 19:41:35 UTC (rev 8105)
+++ trunk/docs/ogc/wms_time.txt 2008-11-25 20:47:56 UTC (rev 8106)
@@ -25,8 +25,8 @@
Links to WMS-Related Information
--------------------------------
-- `MapServer WMS Server howto`_
-- `MapServer WMS Client howto`_
+- :ref:`MapServer WMS Server HowTo <wms_server>`
+- :ref:`MapServer WMS Client HowTo <wms_client>`
- `WMS 1.1.1 specification`_
- `MapServer OGC Web Services Workshop`_
@@ -176,7 +176,7 @@
expression built has slightly different syntax. For example, the expression
set in the filter for the first example above would be ([time_field] = '2004-10-12').
-2. For PostGIS layers, the time expression built uses the *date_trunc* function
+2. For :ref:`input_postgis` layers, the time expression built uses the *date_trunc* function
available in PostgreSQL. For example, if the user passes a time value of '2004-10-12',
the expression set in the filter is date_trunc('day', time_field) = '2004-10-12'.
The use of the date_trunc function allows requests to use the concept of time
@@ -258,8 +258,7 @@
END
-You can find more information on Time and tileindexes in the WCS documentation.
-http://mapserver.gis.umn.edu/docs/howto/wcs_server/#d45e385
+You can find more information on Time and tileindexes in the :ref:`WCS documentation <wcs_server>`.
Future Additions
================
@@ -274,9 +273,7 @@
.. #### rST Link Section ####
-.. _`MapServer WMS Client howto`: http://mapserver.gis.umn.edu/docs/howto/wms_client/
-.. _`MapServer WMS Server howto`: http://mapserver.gis.umn.edu/docs/howto/wms_server/
.. _`WMS 1.1.1 specification`: http://www.opengeospatial.org/docs/01-068r2.pdf
.. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
.. _`PostgreSQL documentation`: http://www.postgresql.org/docs/8.1/static/functions-datetime.html
-.. _`Bug#970`: http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=970
\ No newline at end of file
+.. _`Bug#970`: http://trac.osgeo.org/mapserver/ticket/970
\ No newline at end of file
More information about the mapserver-commits
mailing list