[mapserver-commits] r8104 - in trunk/docs: cgi ogc output

svn at osgeo.org svn at osgeo.org
Tue Nov 25 14:40:38 EST 2008


Author: hobu
Date: 2008-11-25 14:40:38 -0500 (Tue, 25 Nov 2008)
New Revision: 8104

Added:
   trunk/docs/cgi/index.txt
Modified:
   trunk/docs/ogc/filterencoding.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
   trunk/docs/output/agg.txt
   trunk/docs/output/antialias.txt
   trunk/docs/output/dynamic_charting.txt
   trunk/docs/output/html_legend.txt
   trunk/docs/output/imagemaps.txt
   trunk/docs/output/pdf.txt
   trunk/docs/output/svg.txt
   trunk/docs/output/tile_mode.txt
Log:
work on internal referencing

Added: trunk/docs/cgi/index.txt
===================================================================
--- trunk/docs/cgi/index.txt	                        (rev 0)
+++ trunk/docs/cgi/index.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -0,0 +1,16 @@
+.. _cgi:
+
+*****************************************************************************
+ CGI
+*****************************************************************************
+
+.. toctree::
+   :maxdepth: 2
+
+   introduction
+   mapserv
+   mapcontext
+   controls
+   
+   
+

Modified: trunk/docs/ogc/filterencoding.txt
===================================================================
--- trunk/docs/ogc/filterencoding.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/filterencoding.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _filter_encoding:
+
 *****************************************************************************
  WFS Filter Encoding
 *****************************************************************************
@@ -34,14 +36,12 @@
 --------------------------------
 
 - `Filter Encoding Implementation Specification`_.
-- `MapServer WFS Client HOWTO`_.
-- `MapServer WFS Server HOWTO`_.
+- :ref:`MapServer WFS Client Howto <wfs_client>`.
+- :ref:`MapServer WFS Server Howto <wfs_server>`.
 - `MapServer OGC Web Services Workshop`_.
 - `Open GIS Consortium (OGC) home page`_.
 
 .. _`Filter Encoding Implementation Specification`: http://www.opengeospatial.org/docs/02-059.pdf
-.. _`MapServer WFS Client HOWTO`: http://mapserver.gis.umn.edu/docs/howto/wfs_client
-.. _`MapServer WFS Server HOWTO`: http://mapserver.gis.umn.edu/docs/howto/wfs_server
 .. _`Open GIS Consortium (OGC) home page`: http://www.opengeospatial.org
 .. _`MapServer OGC Web Services Workshop`: http://ms-ogc-workshop.maptools.org/
 
@@ -139,10 +139,8 @@
 -----------
 
 To be able to use Filter Encoding, you need to create a valid WFS server using 
-MapServer. Please refer to the `WFS Server HOWTO`_ for specifics. 
+MapServer. Please refer to the :ref:`WFS Server HOWTO <wfs_server>` for specifics. 
 
-.. _`WFS Server HOWTO`: http://mapserver.gis.umn.edu/docs/howto/wfs_server
-
 There is nothing special that should be added to a WFS server for Filter 
 Encoding, but you should note that, when requesting the capabilities of 
 your WFS server, the document returned should contain the supported filters. 

Modified: trunk/docs/ogc/mapcontext.txt
===================================================================
--- trunk/docs/ogc/mapcontext.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/mapcontext.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _map_context:
+
 *****************************************************************************
  OGC Map Context
 *****************************************************************************
@@ -30,14 +32,14 @@
 
 This document assumes that you are already familiar with certain aspects of MapServer:
 
-- MapServer application development and setting up `mapfiles`_.
+- MapServer application development and setting up :ref:`mapfiles <mapfile>`.
 - Familiarity with the WMS spec would be an asset. Please see the following section 
   for links to associated sources. 
 
 Links to WMS / Map Context Related Information
 ----------------------------------------------
 
-- `MapServer WMS Client howto`_
+- :ref:`MapServer WMS Client HowTo <wms_client>`
 - `Open Geospatial Consortium (OGC)`_ home page
 - `WMS 1.1.1 specification`_
 - `Map Context 1.0.0 specification`_
@@ -54,7 +56,7 @@
 Build/install the above libraries on your system and then build MapServer with the 
 *'--with-wmsclient --with-proj --with-ogr --with-gdal --with-php'* configure options. 
 Also make sure that your build uses the *USE_WMS_LYR* and *USE_OGR* flags.  For more
-details on MapServer compilation see the appropriate howto: `Unix`_ / `Windows`_
+details on MapServer compilation see the appropriate howto: :ref:`Unix <unix>` / :ref:`Windows <win32>`
 
 Windows users can use `MS4W`_, which is ready for Map Context use.
 
@@ -62,8 +64,8 @@
 -------------------
 
 A map context document can ONLY contain WMS layers (e.g. CONNECTIONTYPE WMS). 
-Please refer to the `MapServer WMS Client howto`_ for more information on declaring 
-WMS layers.
+Please refer to the :ref:`MapServer WMS Client HowTo <wms_client>` for more 
+information on declaring WMS layers.
 
 MapFile Metadata
 ****************
@@ -287,7 +289,7 @@
 ---------------------------
 
 1. The first thing to do is to save your mapfile using the saveMapContext function 
-   available from the PHP/Mapscript library (see the `Map Object functions`_). An 
+   available from the :ref:`PHP/Mapscript <php>` library (see the `Map Object functions`_). An 
    example script is shown below:
 
    ::
@@ -361,7 +363,7 @@
 MapServer CGI allows you to load a map context through the use of a CONTEXT parameter, 
 and you can point this parameter to a locally stored context file or a context file 
 accessible through a URL. For more information on MapServer CGI see the 
-`CGI Reference`_.
+:ref:`CGI Reference <cgi>`.
 
 Support for Local Map Context Files
 ***********************************
@@ -458,10 +460,7 @@
 .. _`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/
-.. _`mapfiles`: http://mapserver.gis.umn.edu/docs/reference/mapfile
 .. _`Open Geospatial Consortium (OGC)`: http://www.opengeospatial.org/
-.. _`Unix`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix/
-.. _`Windows`: http://mapserver.gis.umn.edu/docs/howto/win32_compiling/
 .. _`MS4W`: http://www.maptools.org/ms4w/
 .. _`Map Object functions`: http://mapserver.gis.umn.edu/docs/reference/phpmapscript-class/classes/mapobj/
 .. _`CGI Reference`: http://mapserver.gis.umn.edu/docs/reference/cgiedu/docs/reference/cgi
\ No newline at end of file

Modified: trunk/docs/ogc/mapscript.txt
===================================================================
--- trunk/docs/ogc/mapscript.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/mapscript.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _mapscript_ows:
+
 *****************************************************************************
  MapScript Wrappers for WxS Services
 *****************************************************************************

Modified: trunk/docs/ogc/sld.txt
===================================================================
--- trunk/docs/ogc/sld.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/sld.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _sld:
+
 *****************************************************************************
  OGC SLD
 *****************************************************************************

Modified: trunk/docs/ogc/sos_server.txt
===================================================================
--- trunk/docs/ogc/sos_server.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/sos_server.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,5 +1,7 @@
+.. _sos_server:
+
 *****************************************************************************
- OGC SOS
+ SOS Server
 *****************************************************************************
 
 :Author:        Jeff McKenna

Modified: trunk/docs/ogc/wcs_format.txt
===================================================================
--- trunk/docs/ogc/wcs_format.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wcs_format.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _wcs_format:
+
 *****************************************************************************
  MapServer WCS Use Cases
 *****************************************************************************

Modified: trunk/docs/ogc/wcs_server.txt
===================================================================
--- trunk/docs/ogc/wcs_server.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wcs_server.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _wcs_server:
+
 *****************************************************************************
  WCS Server
 *****************************************************************************

Modified: trunk/docs/ogc/wfs_client.txt
===================================================================
--- trunk/docs/ogc/wfs_client.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wfs_client.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _wfs_client:
+
 *****************************************************************************
  WFS Client
 *****************************************************************************

Modified: trunk/docs/ogc/wfs_server.txt
===================================================================
--- trunk/docs/ogc/wfs_server.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wfs_server.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _wfs_server:
+
 *****************************************************************************
  WFS Server
 *****************************************************************************

Modified: trunk/docs/ogc/wms_client.txt
===================================================================
--- trunk/docs/ogc/wms_client.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wms_client.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _wms_client:
+
 *****************************************************************************
  WMS Client
 *****************************************************************************
@@ -32,7 +34,7 @@
 WMS-Related Information
 -----------------------
 
-- `MapServer WMS Server howto`_
+- :ref:`MapServer WMS Server howto <wms_server>`
 - `WMS 1.1.1 specification`_
 - `MapServer OGC Web Services Workshop package`_ 
 
@@ -45,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 (`unix`_ / `windows`_)
+- 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 
@@ -128,12 +130,15 @@
 MapFile Configuration
 =====================
 
-**NOTE**: A PROJECTION must be set in the mapfile for the MAP unless you are sure that all your 
-WMS layers support only a single projection which is the same as the PROJECTION of the map. 
-The MAP PROJECTION can be set using "init=epsg:xxxx" codes or using regular PROJ4 parameters. 
-Failure to set a MAP PROJECTION may result in blank maps coming from remote WMS servers 
-(because of inconsistent BBOX+SRS combination being used in the WMS cnonection URL).
 
+.. note::
+
+    A PROJECTION must be set in the mapfile for the MAP unless you are sure that all your 
+    WMS layers support only a single projection which is the same as the PROJECTION of the map. 
+    The MAP PROJECTION can be set using "init=epsg:xxxx" codes or using regular PROJ4 parameters. 
+    Failure to set a MAP PROJECTION may result in blank maps coming from remote WMS servers 
+    (because of inconsistent BBOX+SRS combination being used in the WMS connection URL).
+
 Storing Temporary Files
 -----------------------
 
@@ -171,7 +176,7 @@
 Adding a WMS Layer
 ------------------
 
-WMS layers are accessed via the WMS connection type in the `mapfile`_. Here is an 
+WMS layers are accessed via the WMS connection type in the :ref:`mapfile`. Here is an 
 example of a layer using this connection type:
 
 ::
@@ -202,16 +207,23 @@
   without any of the WMS parameters. The server version, image format, 
   layer name, etc. will be provided via metadata, see below.
 
- .. Note that if the CONNECTION parameter value is not set the the value of the "wms_onlineresource" metadata will be used. If both CONNECTION and "wms_onlineresource" are set then the "wms_onlineresource" metadata takes precedence.
+.. note::
 
+    Note that if the CONNECTION parameter value is not set the the value of 
+    the "wms_onlineresource" metadata will be used. If both CONNECTION and 
+    "wms_onlineresource" are set then the "wms_onlineresource" metadata takes precedence.
+
 - **"wms_format" metadata** 
   - the image format to use in GetMap requests.
-  Note that if wms_formatlist is provided then wms_format is optional and MapServer will 
-  pick the first supported format in wms_formatlist for use in GetMap requests. 
-  If both wms_format and wms_formatlist are provided then wms_format takes precedence.
-  Also note that WMS Servers only advertize supported formats that are part of the GD/GDAL 
-  libraries. 
 
+.. note:: 
+
+    If wms_formatlist is provided then wms_format is optional and MapServer will 
+    pick the first supported format in wms_formatlist for use in GetMap requests. 
+    If both wms_format and wms_formatlist are provided then wms_format takes precedence.
+    Also note that WMS Servers only advertize supported formats that are part of the GD/GDAL 
+    libraries. 
+
 - **"wms_name" metadata** 
   - comma-separated list of layers to be fetched from the remote WMS server. This 
   value is used to set the LAYERS and QUERY_LAYERS WMS URL parameters.
@@ -400,7 +412,7 @@
     END
           
 
-  For more information on SLDs in MapServer see the `SLD howto document`_.
+  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 
@@ -412,16 +424,14 @@
 - **"wms_transparent" metadata**
   - specifies whether the map background is to be made transparent or not. TRANSPARENT can take on two values, "TRUE" or "FALSE".  If not specified, MapServer sets default to "TRUE"
 
-----------
+.. note::
 
-*Note that each of the above metadata can also be referred to as 'ows_\*' instead of 'wms_\*'. 
-MapServer tries the 'wms_\*' metadata first, and if not found it tries the corresponding 
-'ows_\*' name. Using this reduces the amount of duplication in mapfiles that support multiple 
-OGC interfaces since "ows_\*" metadata can be used almost everywhere for common metadata items 
-shared by multiple OGC interfaces.*
+    Note that each of the above metadata can also be referred to as 'ows_\*' instead of 'wms_\*'. 
+    MapServer tries the 'wms_\*' metadata first, and if not found it tries the corresponding 
+    'ows_\*' name. Using this reduces the amount of duplication in mapfiles that support multiple 
+    OGC interfaces since "ows_\*" metadata can be used almost everywhere for common metadata items 
+    shared by multiple OGC interfaces.*
 
-----------
-
 Old CONNECTION parameter format from version 3.5 and 3.6 (deprecated)
 *********************************************************************
 
@@ -467,16 +477,12 @@
 
 .. #### rST Link Section ####
 
-.. _`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 package`: http://ms-ogc-workshop.maptools.org/
-.. _`unix`: http://mapserver.gis.umn.edu/docs/howto/compiling_on_unix
-.. _`windows`: http://mapserver.gis.umn.edu/docs/howto/win32_compiling
 .. _`libcurl`: http://curl.haxx.se/libcurl/c/
 .. _`MS4W`: http://www.maptools.org/ms4w/
 .. _`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
-.. _`mapfile`: http://mapserver.gis.umn.edu/docs/reference/mapfile/layer/
 .. _`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 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wms_server.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,5 +1,7 @@
+.. _wms_server:
+
 *****************************************************************************
- WMS Client
+ WMS Server
 *****************************************************************************
 
 :Author: Jeff McKenna

Modified: trunk/docs/ogc/wms_time.txt
===================================================================
--- trunk/docs/ogc/wms_time.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/ogc/wms_time.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,5 +1,7 @@
+.. _wms_time:
+
 *****************************************************************************
- WMS Client
+ WMS Time
 *****************************************************************************
 
 :Author: Jeff McKenna

Modified: trunk/docs/output/agg.txt
===================================================================
--- trunk/docs/output/agg.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/agg.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _agg:
+
 *****************************************************************************
  AGG Rendering Specifics 
 *****************************************************************************
@@ -6,7 +8,7 @@
 :Contact: thomas.bonfort at gmail
 :Revision: $Revision$
 :Date: $Date$
-:Last Updated: 2007/08/21
+:Last Updated: 2008/11/24
 
 .. contents:: Table of Contents
     :depth: 2
@@ -14,8 +16,8 @@
 
 Introduction
 ============
-Mapserver 5.0 will be released with a new rendering backend. This howto details 
-the changes and new functionality that this adds to map creation. This howto supposes
+MapServer 5.0 released with a new rendering backend. This howto details 
+the changes and new functionality that this adds to map creation. This howto assumes
 you already now the basics of mapfile syntax. If not, you should probably be reading
 :ref:`the mapfile syntax <mapfile>`.
 
@@ -54,8 +56,10 @@
 
 png output, with number of colors reduced with quantization . ( 
 
-.. note:: this functionality is not supported with RGBA images, that 
-is outputformats with IMAGEMODE RGBA, or maps with TRANSPARENT ON.
+.. note:: 
+    
+    this functionality is not supported with RGBA images, that is 
+    :ref:`OUTPUTFORMAT`s with IMAGEMODE RGBA, or maps with TRANSPARENT ON.
 
 ::
 
@@ -70,6 +74,7 @@
 
 New Features
 =============
+
 * All rendering is now done antialiased by default. All ANTIALIAS keywords 
   are now ignored, as well as TRANSPARENCY ALPHA. Pixmaps and fonts are now 
   all drawn respecting the image's internal alpha channel (unless a 
@@ -136,5 +141,5 @@
 .. image:: ../images/solid-symbol-gap.png
 
 * layers of type CIRCLE support hatch type symbol filling
-* the ENCODING keyword for labels is now enforced. If unset, mapserver will 
+* the ENCODING keyword for labels is now enforced. If unset, MapServer will 
   treat your label text byte-by-byte (resulting in corrupt special characters).
\ No newline at end of file

Modified: trunk/docs/output/antialias.txt
===================================================================
--- trunk/docs/output/antialias.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/antialias.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _antialias:
+
 *****************************************************************************
  AntiAliasing with MapServer 
 *****************************************************************************
@@ -43,7 +45,8 @@
       END
     END
 
-3. Add ANTIALIAS keyword to the STYLE object within the CLASS object within the LAYER and set value to TRUE
+3. Add ANTIALIAS keyword to the STYLE object within the :ref:`CLASS` object within the :ref:`LAYER` 
+   and set value to TRUE
 
 ::
 
@@ -68,11 +71,13 @@
       END # end layer
     END # end map
 
-Tips: Don't use the SYMBOL or the SIZE keywords within the CLASS object, 
-instead use WIDTH to specify width of line or polygon outline.  Don't use
-WIDTH unless you have to.  If you must define a SYMBOL, use symbol of type 
-CARTOLINE or ELLIPSE--it supports antialiasing.
+.. note::
 
+    Don't use the SYMBOL or the SIZE keywords within the CLASS object, 
+    instead use WIDTH to specify width of line or polygon outline.  Don't use
+    WIDTH unless you have to.  If you must define a SYMBOL, use symbol of type 
+    CARTOLINE or ELLIPSE--it supports antialiasing.
+
 Here's an example of a real-world mapfile:
 
 ::

Modified: trunk/docs/output/dynamic_charting.txt
===================================================================
--- trunk/docs/output/dynamic_charting.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/dynamic_charting.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _dynamic_charting:
+
 *****************************************************************************
  Dynamic Charting
 *****************************************************************************
@@ -17,8 +19,8 @@
 datasource. 
 
 This document assumes that you are already familiar with MapServer application 
-development and especially setting up :ref:reference/mapfile mapfiles. Readers 
-can also check out the :ref:vector_data Vector Data Access Guide, which has lots of 
+development and especially setting up :ref:`mapfile` s. You 
+can also check out the :ref:`Vector Data Access Guide <vector>`, which has lots of 
 examples of how to access specific data sources.
 
 Setup
@@ -27,15 +29,21 @@
 Supported Renderers
 ...............................................................................
 
-Dynamic charts are supported solely with the GD and AGG renderers. 
+Dynamic charts are supported solely with the GD and :ref:`AGG <agg>` renderers. 
 
 Attempting to add a chart layer with any other renderer (e.g. PDF or SWF) will 
 result in an error. Rendering quality with the GD renderer is less than optimal, 
 especially with small graphs, due to the lack of subpixel rendering functions.
 
 Output from AGG and GD Renderers
+...............................................................................
 
+MapServer AGG Rendering
+
 .. image:: ../images/renderer-agg.png
+
+MapServer GD Rendering
+
 .. image:: ../images/gd-renderer.png
    
 

Modified: trunk/docs/output/html_legend.txt
===================================================================
--- trunk/docs/output/html_legend.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/html_legend.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _html_legend:
+
 *****************************************************************************
  HTML Legends with MapServer
 *****************************************************************************

Modified: trunk/docs/output/imagemaps.txt
===================================================================
--- trunk/docs/output/imagemaps.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/imagemaps.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _imagemaps:
+
 *****************************************************************************
  HTML Imagemaps
 *****************************************************************************

Modified: trunk/docs/output/pdf.txt
===================================================================
--- trunk/docs/output/pdf.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/pdf.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _pdf:
+
 *****************************************************************************
  PDF Output
 *****************************************************************************

Modified: trunk/docs/output/svg.txt
===================================================================
--- trunk/docs/output/svg.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/svg.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _svg:
+
 *****************************************************************************
  SVG
 *****************************************************************************
@@ -35,7 +37,7 @@
 
 - `SVG Tiny Profile`_
 
-- `MapFile Reference Doc`_
+- :ref:`MapFile Reference Doc <mapfile>`
 
 Feature Types and SVG Support Status
 ====================================
@@ -146,20 +148,20 @@
   flag USE_ZLIB.
 
   If FORMATOPTION "FULL_RESOLUTION=TRUE" is set MapServer will not eliminate 
-  duplicate points and colinear lines when outputting SVG. By default this option 
+  duplicate points and collinear lines when outputting SVG. By default this option 
   is set to FALSE. 
   
 Testing your SVG Output
 =======================
 
-- The easiest way to test your SVG mapfile is to use `MapServer CGI`_. For example, 
+- The easiest way to test your SVG mapfile is to use :ref:`MapServer CGI <cgi>`. For example, 
   you might enter the following URL in a browser:
 
   ::
   
       http://127.0.0.1/cgi-bin/mapserv.exe?map=my/path/to/my-svg.map&mode=map&layers=layer1 layer2
         
-- You can also use `PHP/Mapscript`_ to test your SVG mapfile. Your php file 
+- You can also use :ref:`PHP/Mapscript <php>` to test your SVG mapfile. Your php file 
   might look like the following:
 
   ::
@@ -257,7 +259,7 @@
 Requirements
 ************
 
-- A valid MapServer `mapfile`_.
+- A valid MapServer :ref:`mapfile`.
 - Valid IMAGEPATH and IMAGEURL parameters set in the WEB object of the mapfile.
 - A PROJECTION object defined beneath the MAP object, using an EPSG code. 
   For example:
@@ -284,7 +286,9 @@
 Setting the OUTPUTFORMAT
 ************************
 
-To be able to output a valid goSVG file, you must define an OUTPUTFORMAT object in the mapfile and set the IMAGETYPE to svg. Here is an example:
+To be able to output a valid goSVG file, you must define an 
+:ref:`OUTPUTFORMAT` object in the mapfile and set the IMAGETYPE to svg. 
+Here is an example:
 
 ::
 
@@ -318,7 +322,7 @@
           
 
 Specific FORMATOPTIONs Related to goSVG
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+.......................................
 
 GOSVG
   should be set to TRUE. The default is false.
@@ -398,30 +402,7 @@
     <text  x="214" y="125" font-family="fritqat" font-size="8pt"   fill="#000000" stroke="#ffffff" stroke-width="0.5"  >Iqaluit</text>
     </svg>      
       
-About This Document
-===================
 
-Copyright Information
----------------------
-
-Copyright (c) 2005, Jeff McKenna.
-                
-This documentation is covered by the same Open Source license as the MapServer 
-software itself.  See MapServer's `License and Credits`__ page for the complete 
-text.
-            
-__ http://ms.gis.umn.edu/License  
-
-Disclaimer
-----------
-
-No liability for the contents of this document can be accepted.
-Use the concepts, examples and other content at your own risk.
-As this is a new edition of this document, there may be errors
-and inaccuracies that may be damaging to your system.
-Although this is highly unlikely, the author(s) do not take any 
-responsibility for that:  proceed with caution.
-
 .. #### rST Link Section ####
 
 .. _`World Wide Web Consortium's (W3C) Scalable Vector Graphics (SVG) 1.1 Specification`: http://www.w3.org/TR/SVG/
@@ -429,7 +410,6 @@
 .. _`SVG Discussion Paper`: http://www.carto.net/papers/svg/index_e.shtml
 .. _`G-XML Project Page`: http://gisclh.dpc.or.jp/gxml/contents-e/index.htm
 .. _`SVG Tiny Profile`: http://www.w3.org/TR/2003/REC-SVGMobile-20030114/
-.. _`MapFile Reference Doc`: http://ms.gis.umn.edu/docs/reference/mapfile 
 .. _`polyline`: http://www.w3.org/TR/SVG/shapes.html#PolylineElement
 .. _`stroke-dasharray`: http://www.w3.org/TR/SVG/painting.html
 .. _`polygon`: http://www.w3.org/TR/SVG/shapes.html#PolygonElement
@@ -438,13 +418,10 @@
 .. _`font-family`: http://www.w3.org/TR/SVG/text.html#FontFamilyProperty
 .. _`font-style`: http://www.w3.org/TR/SVG/text.html#FontStyleProperty
 .. _`font-weight`: http://www.w3.org/TR/SVG/text.html#FontWeightProperty
-.. _`MapServer CGI`: http://ms.gis.umn.edu/docs/reference/cgi
-.. _`PHP/Mapscript`: http://ms.gis.umn.edu/docs/reference/phpmapscript-class
 .. _`list of SVG implementations`: http://www.w3.org/Graphics/SVG/SVG-Implementations
 .. _`Adobe Viewer plugin`: http://www.adobe.com/svg/viewer/install/main.html
 .. _`here`: http://www.svgopen.org/2004/papers/goSVGauthoringtool-1/
 .. _`G-XML`: http://gisclh.dpc.or.jp/gxml/contents-e/index.htm
 .. _`SVG 1.1`: http://www.w3.org/TR/SVG/
-.. _`mapfile`: http://ms.gis.umn.edu/docs/reference/mapfile 
 
 

Modified: trunk/docs/output/tile_mode.txt
===================================================================
--- trunk/docs/output/tile_mode.txt	2008-11-25 18:41:49 UTC (rev 8103)
+++ trunk/docs/output/tile_mode.txt	2008-11-25 19:40:38 UTC (rev 8104)
@@ -1,3 +1,5 @@
+.. _tile_mode:
+
 *****************************************************************************
  Tile Mode 
 *****************************************************************************
@@ -27,7 +29,7 @@
 =============
 
 Tile requests are handled by the 'mapserv' CGI program.  In order to 
-return tiles in the correct projection, Mapserver must be built with the 
+return tiles in the correct projection, MapServer must be built with the 
 --use-proj option turned on.  You can check if your version of 'mapserv' has 
 projection support by running it with the '-v' option and looking 
 for 'SUPPORTS=PROJ'.
@@ -48,20 +50,20 @@
    SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER 
    INPUT=JPEG INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE DEBUG=MSDEBUG
    
-Mapserver requires that each LAYER in your map file have a valid PROJECTION 
+MapServer requires that each LAYER in your map file have a valid PROJECTION 
 block to support reprojection.  Because the tile mode uses reprojection, 
 you will have to ensure each LAYER has a valid PROJECTION block.
 
 Configuration checklist:
 
- * Mapserver compiled with PROJ support
- * Map file with a PROJECTION defined for every LAYER
+ * MapServer compiled with PROJ support
+ * Map file with a :ref:`PROJECTION` defined for every :ref:`LAYER`
  
 
 Utilization
 ===========
 
-The Mapserver tile support adds three new directives to the CGI interface:
+The MapServer tile support adds three new directives to the CGI interface:
 
  * *mode=tile* tells the server to generate tiles based on the other tile mode
    parameters
@@ -120,7 +122,7 @@
   <html xmlns="http://www.w3.org/1999/xhtml">
     <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title>Google/Mapserver Tile Example</title>
+    <title>Google/MapServer Tile Example</title>
     <script src="http://maps.google.com/maps?file=api&v=2&key=[YOUR KEY HERE]"
             type="text/javascript"></script>
     <script type="text/javascript">
@@ -156,7 +158,7 @@
 substitution tokens that Google Maps will replace with the tile coordinates 
 and zoom level on the fly to retrieve tiles from your server.
 
-You can also use a Mapserver tile layer as an alternate base map::
+You can also use a MapServer tile layer as an alternate base map::
 
   <!DOCTYPE html 
     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
@@ -164,7 +166,7 @@
   <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
-    <title>Google/Mapserver Tile Example</title>
+    <title>Google/MapServer Tile Example</title>
     <script src="http://maps.google.com/maps?file=api&v=2&key=[YOUR KEY HERE]"
             type="text/javascript"></script>
     <script type="text/javascript">
@@ -185,7 +187,7 @@
         map.addControl(new GLargeMapControl());
         map.addControl(new GMapTypeControl());
         map.setCenter(new GLatLng(35.35, -80.55), 15); 
-        var myMapType = new GMapType([myLayer], new GMercatorProjection(18), 'Mapserver');
+        var myMapType = new GMapType([myLayer], new GMercatorProjection(18), 'MapServer');
         map.addMapType(myMapType); 
       }
     }



More information about the mapserver-commits mailing list