[mapserver-commits] r8161 - in trunk/docs: cgi development/rfc
input/vector mapfile/symbology mapscript/php ogc utilities
svn at osgeo.org
svn at osgeo.org
Mon Dec 1 10:44:18 EST 2008
Author: hobu
Date: 2008-12-01 10:44:18 -0500 (Mon, 01 Dec 2008)
New Revision: 8161
Removed:
trunk/docs/cgi/about.txt
trunk/docs/input/vector/articleinfo.txt
trunk/docs/mapscript/php/javamapscript.txt
Modified:
trunk/docs/cgi/index.txt
trunk/docs/development/rfc/index.txt
trunk/docs/development/rfc/ms-rfc-13.txt
trunk/docs/development/rfc/ms-rfc-32.txt
trunk/docs/development/rfc/ms-rfc-39.txt
trunk/docs/development/rfc/ms-rfc-40.txt
trunk/docs/development/rfc/ms-rfc-9.txt
trunk/docs/input/vector/VirtualSpatialData.txt
trunk/docs/input/vector/arcsde.txt
trunk/docs/mapfile/symbology/construction.txt
trunk/docs/mapscript/php/index.txt
trunk/docs/ogc/filter_encoding.txt
trunk/docs/ogc/sld.txt
trunk/docs/ogc/wms_client.txt
trunk/docs/utilities/shptreevis.txt
trunk/docs/utilities/sortshp.txt
trunk/docs/utilities/tile4ms.txt
Log:
start cleaning up warnings
Deleted: trunk/docs/cgi/about.txt
===================================================================
--- trunk/docs/cgi/about.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/cgi/about.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -1,13 +0,0 @@
-<div><h3 class="title"><a name="rhistory"></a>Revision History</h3></div></div><p>
- The document revision history starts with UMN MapServer 4.2 although the
- document is older. The numbering is in parallel with the revision control
- system. Missing numbers indicate minor maintenance revision updates.
-
-</p><p>
- <div class="revhistory"><table border="0" width="100%" summary="Revision history"><tr><th align="left" valign="top" colspan="3"><b>Revision History</b></th></tr><tr><td align="left">Revision Number: 1.11</td><td align="left">Date: 2004-10-19</td><td align="left">Author: Jeff McKenna</td></tr><tr><td align="left" colspan="3">Added map context support section
- </td></tr><tr><td align="left">Revision Number: 1.10</td><td align="left">Date: 2004-10-14</td><td align="left">Author: Daniel Morissette</td></tr><tr><td align="left" colspan="3">Added LAYERS=all as a new option to the LAYERS
- parameter.
- </td></tr><tr><td align="left">Revision Number: 1.9</td><td align="left">Date: 2004-06-04</td><td align="left">Author: Frank Koormann</td></tr><tr><td align="left" colspan="3">Update to MapServer version 4.2:
- Document info section added
- and TEMPLATE parameter info removed.</td></tr></table></div>
- </p></div>
\ No newline at end of file
Modified: trunk/docs/cgi/index.txt
===================================================================
--- trunk/docs/cgi/index.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/cgi/index.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -4,6 +4,13 @@
CGI
*****************************************************************************
+:Date: 2008/09/09
+:Author: Daniel Morissette
+:Contact: dmorissette at mapgears.com
+:Author: Jeff McKenna
+:Contact: jmckenna at gatewaygeomatics.com
+:Author: Frank Koormann
+
.. toctree::
:maxdepth: 2
Modified: trunk/docs/development/rfc/index.txt
===================================================================
--- trunk/docs/development/rfc/index.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/index.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -28,9 +28,8 @@
ms-rfc-17
ms-rfc-18
ms-rfc-19
- ms-rfc-20
ms-rfc-21
- ms-rfc-22
+ ms-rfc-22a
ms-rfc-23
ms-rfc-24
ms-rfc-25
Modified: trunk/docs/development/rfc/ms-rfc-13.txt
===================================================================
--- trunk/docs/development/rfc/ms-rfc-13.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/ms-rfc-13.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -46,7 +46,7 @@
From the user perspective there will be an SOS interface will offer the three
core operations (GetCapabilities, GetObservation and DescribeSensor). A full
-description of what could be available is presented in `Annexe A`_.
+description of what could be available is presented in `Annexe A : Sensor Observation System (SOS) support in MapServer`_.
Changes in MapServer
--------------------
Modified: trunk/docs/development/rfc/ms-rfc-32.txt
===================================================================
--- trunk/docs/development/rfc/ms-rfc-32.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/ms-rfc-32.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -38,6 +38,7 @@
.. note::
See :ref:`agg` for more information.
+
Technical Solution
~~~~~~~~~~~~~~~~~~
Modified: trunk/docs/development/rfc/ms-rfc-39.txt
===================================================================
--- trunk/docs/development/rfc/ms-rfc-39.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/ms-rfc-39.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -115,10 +115,10 @@
4. WMS related functionalities:
- Advertise STYLES through the GetCapabilities: styles would be based on the
-different group names of the classes defined in the layer. If all classes do
-not have the GROUP set, the current behavior (returning the STYLE element with
-the 'default' name) will be kept. If one or more classes have the GROUP set,
-It is proposed to output something like this for each "group":
+ different group names of the classes defined in the layer. If all classes do
+ not have the GROUP set, the current behavior (returning the STYLE element with
+ the 'default' name) will be kept. If one or more classes have the GROUP set,
+ It is proposed to output something like this for each "group":
::
@@ -150,7 +150,7 @@
specified classes only.
5. Legend drawing would need to use the setting of the classgroup if it is
- available
+ available
Other Considerations
Modified: trunk/docs/development/rfc/ms-rfc-40.txt
===================================================================
--- trunk/docs/development/rfc/ms-rfc-40.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/ms-rfc-40.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -17,9 +17,10 @@
MapServer 5.0 supports "hard" text wrapping, where the wrap character is
unconditionally treated as a newline. This RFC proposes the addition of:
- - conditional wrapping, i.e. newlines are only added when the current
- line length has met a user adjustable criteria
- - line alignment, i.e. text aligned per user request, namely right, center and left
+
+- conditional wrapping, i.e. newlines are only added when the current
+ line length has met a user adjustable criteria
+- line alignment, i.e. text aligned per user request, namely right, center and left
These two additions are independent from one another, i.e. can be activated
together or not.
@@ -29,16 +30,17 @@
A new keyword, MAXLENGTH is added to the label object, and interacts with the
label WRAP parameter as follows:
- - the wrap character specifies what character can be replaced by a newline
- (no change w.r.t. the current meaning). Probably the most useful wrap
- character will become ' ' (i.e. the space character)
- - the MAXLENGTH value specifies the maximum number of characters that can
- compose a line before a newline is inserted. A value of 0 specifies the
- current "hard" wrapping. A positive value triggers wrapping at the WRAP
- character for lines longer than MAXLENGTH. A negative value triggers
- wrapping that is allowed to break words, i.e. not necessarily at
- the WRAP character.
+- the wrap character specifies what character can be replaced by a newline
+ (no change w.r.t. the current meaning). Probably the most useful wrap
+ character will become ' ' (i.e. the space character)
+- the MAXLENGTH value specifies the maximum number of characters that can
+ compose a line before a newline is inserted. A value of 0 specifies the
+ current "hard" wrapping. A positive value triggers wrapping at the WRAP
+ character for lines longer than MAXLENGTH. A negative value triggers
+ wrapping that is allowed to break words, i.e. not necessarily at
+ the WRAP character.
+
The WRAP / MAXLENGTH combinations are summarized here:
+----------------+-----------------+-----------------------------+-------------------+
Modified: trunk/docs/development/rfc/ms-rfc-9.txt
===================================================================
--- trunk/docs/development/rfc/ms-rfc-9.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/development/rfc/ms-rfc-9.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -27,7 +27,7 @@
tag processor.
Backwards compatibility issues
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
N/A, new functionality. Existing methods for exposing an attribute (e.g.
[attribute name] would continue to function, although we might mark that as
Modified: trunk/docs/input/vector/VirtualSpatialData.txt
===================================================================
--- trunk/docs/input/vector/VirtualSpatialData.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/input/vector/VirtualSpatialData.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -65,8 +65,8 @@
> ogrinfo ODBC:@DSN table
Example: Accessing a comma separated text file through ODBC using ogrinfo
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
The following is a snippet of the flat text file coal_dep.txt containing lat/long points:
::
Modified: trunk/docs/input/vector/arcsde.txt
===================================================================
--- trunk/docs/input/vector/arcsde.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/input/vector/arcsde.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -112,7 +112,7 @@
TEMPLATE
...............................................................................
-* **/where/the/template/file/is/located* - A template directive must be
+* **/where/the/template/file/is/located** - A template directive must be
specified (can point to a dummy file) in order for MapServer to be able to
query attributes from SDE. If you are only going to be drawing layers,
this directive is unnecessary and will slow down the query operations of
@@ -154,4 +154,4 @@
An important part of the join is defining how the join is to be made.
Use a FILTER to do so.
-.. ESRI: http://www.esri.com
+.. _ESRI: http://www.esri.com
Deleted: trunk/docs/input/vector/articleinfo.txt
===================================================================
--- trunk/docs/input/vector/articleinfo.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/input/vector/articleinfo.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -1,9 +0,0 @@
-:Date: 2008/09/09
-:Author: Tyler Mitchell
-:Contact: tmitchell at osgeo.org
-:Author: Jeff McKenna
-:Contact: jmckenna at gatewaygeomatics.com
-
-This work is licensed under the Creative Commons Attribution-ShareAlike License.
-To view a copy of this license, visit:
-http://creativecommons.org/licenses/by-sa/2.0/ca/ or send a letter to Creative Commons, 559 Nathan Abbott Way, Stanford, California 94305, USA.
\ No newline at end of file
Modified: trunk/docs/mapfile/symbology/construction.txt
===================================================================
--- trunk/docs/mapfile/symbology/construction.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/mapfile/symbology/construction.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -292,7 +292,7 @@
| | END |
| | END |
+----------------------------------+---------------------------------+
-| .. image:: ../../images/railway.png |
+| .. image:: ../../images/railway.png |
+----------------------------------+---------------------------------+
The STYLE parameter can be used for elements of the SYMBOL file with the
@@ -341,7 +341,7 @@
| | | END | |
| | | END | |
+--------------------------------+-------------------------------+--------------------------------+-------------------------------+
-| .. image:: ../../images/symbol-offset-1.png | .. image:: ../../images/symbol-offset-1.png |
+| .. image:: ../../images/symbol-offset-1.png | .. image:: ../../images/symbol-offset-1.png |
| :align: right | :align: right |
+----------------------------------------------------------------+----------------------------------------------------------------+
@@ -391,7 +391,7 @@
| | END |
| | END |
+--------------------------------+-------------------------------+
-| .. image:: ../../images/crosshatch.png |
+| .. image:: ../../images/crosshatch.png |
| :align: right |
+----------------------------------------------------------------+
@@ -415,7 +415,7 @@
a high need of scaling is rather limited.
PIXMAP symbols are always rendered respective to the map border and will not
-follow the inclination of a line or polygon ourtline. Only truetype font symbols
+follow the inclination of a line or polygon outline. Only truetype font symbols
can follow an inclined line geometry, although with some defects (see below).
To create more complex area symbols, e.g. with defined distances between single
@@ -473,11 +473,11 @@
| STYLE | TRANSPARENT 8 |
| SYMBOL "in_the_star" | END |
| COLOR 0 0 0 | |
-| OUTLINECOLOR 0 0 0 |.. image:: ../../images/star-symbol.png |
+| OUTLINECOLOR 0 0 0 |.. image:: ../../images/star-symbol.png |
| END | :align: left |
| END | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/horizontal-area-symbol.png |
+| .. image:: ../../images/horizontal-area-symbol.png |
| :align: right |
+----------------------------------------------------------------------------------+
@@ -495,10 +495,10 @@
| OUTLINECOLOR 0 0 0 | TRANSPARENT 13 |
| END | END |
| END | |
-| |.. image:: ../../images/dot-symbol.png |
+| |.. image:: ../../images/dot-symbol.png |
| | :align: left |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/diagonal-area-symbol.png |
+| .. image:: ../../images/diagonal-area-symbol.png |
| :align: right |
+----------------------------------------------------------------------------------+
@@ -516,11 +516,11 @@
| STYLE | TRANSPARENT 2 |
| SYMBOL "in_hatch" | END |
| COLOR 0 0 0 | |
-| OUTLINECOLOR 0 0 0 |.. image:: ../../images/hatch.png |
+| OUTLINECOLOR 0 0 0 |.. image:: ../../images/hatch.png |
| END | :align: left |
| END | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/hatch-symbol.png |
+| .. image:: ../../images/hatch-symbol.png |
| :align: right |
+----------------------------------------------------------------------------------+
@@ -645,10 +645,10 @@
| | END |
| | |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/truetype-character-clockwise.png |
+| .. image:: ../../images/truetype-character-clockwise.png |
| :align: left |
| :alt: clockwise |
-| .. image:: ../../images/truetype-character-cc.png |
+| .. image:: ../../images/truetype-character-cc.png |
| :align: right |
| :alt: counterclockwise |
| |
@@ -724,7 +724,7 @@
| | END |
| | END |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/cross-fill-example.png |
+| .. image:: ../../images/cross-fill-example.png |
| :align: right |
+----------------------------------------------------------------------------------+
@@ -752,7 +752,7 @@
| | FILLED TRUE |
| | END |
+--------------------------------+-------------------------------------------------+
-| .. image:: ../../images/irregular-line-pattern.png |
+| .. image:: ../../images/irregular-line-pattern.png |
| :align: right |
+----------------------------------------------------------------------------------+
Modified: trunk/docs/mapscript/php/index.txt
===================================================================
--- trunk/docs/mapscript/php/index.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/mapscript/php/index.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -33,14 +33,14 @@
3.5 support for PHP3 has been dropped and as of the last update of this
document, PHP 4.1.2 or more recent was required.
-The module has been tested and used on Linux, Solaris, *BSD, and WinNT.
+The module has been tested and used on Linux, Solaris, \*BSD, and WinNT.
There are documentation and examples for PHP MapScript available via
the MapServer documentation webpage at:
- http://mapserver.gis.umn.edu/doc.html
+http://mapserver.gis.umn.edu/doc.html
See also the MapServer Wiki for links to more informations on this module:
- http://mapserver.gis.umn.edu/cgi-bin/wiki.pl?PHPMapScript
+http://mapserver.gis.umn.edu/cgi-bin/wiki.pl?PHPMapScript
Very important notes
---------------------
@@ -498,15 +498,16 @@
file and replace all the tags found in it. Only tags that have an
equivalent element in the map object are replaced (ex [scaledenom]).
The are two exceptions to the previous statement :
- - [img], [scalebar], [ref], [legend] would be replaced with the
- appropriate url if the parameter generateimages is set to
- MS_TRUE. (Note : the images corresponding to the different objects
- are generated if the object is set to MS_ON in the map file)
- - the user can use the params parameter to specify tags and
- their values. For example if the user have a specific tag call
- [my_tag] and would like it to be replaced by "value_of_my_tag"
- he would do
+ - [img], [scalebar], [ref], [legend] would be replaced with the
+ appropriate url if the parameter generateimages is set to
+ MS_TRUE. (Note : the images corresponding to the different objects
+ are generated if the object is set to MS_ON in the map file)
+ - the user can use the params parameter to specify tags and
+ their values. For example if the user have a specific tag call
+ [my_tag] and would like it to be replaced by "value_of_my_tag"
+ he would do
+
.. code-block:: php
$tmparray["my_tag"] = "value_of_my_tag";
@@ -1226,7 +1227,7 @@
$oStyle->removebinding(MS_LABEL_BINDING_COLOR);
webObj Class
------------
+------------
Constructor
...............................................................................
@@ -1268,7 +1269,7 @@
referenceMapObj Class
---------------------
+----------------------
Constructor
...............................................................................
@@ -1950,6 +1951,7 @@
Added in MapServer 5.0.
.. code-block:: php
+
$oStyle->setbinding(MS_STYLE_BINDING_COLOR, "FIELD_NAME_COLOR");
This would bind the color parameter with the data (ie will extract
@@ -2092,7 +2094,7 @@
=============== ====================================================================
Type Name
=============== ====================================================================
-int code /* See error code constants above */
+int code //See error code constants above
string routine
string message
=============== ====================================================================
Deleted: trunk/docs/mapscript/php/javamapscript.txt
===================================================================
--- trunk/docs/mapscript/php/javamapscript.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/mapscript/php/javamapscript.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -1,81 +0,0 @@
-public void creationCouche(mapObj map, String nomCouche, boolean affiche,
- String data, MS_LAYER_TYPE type, String couleur, String labelitem, boolean labelcolor1,
- boolean labelcolor2, boolean labelcolor3 ,String filtre,String iconeLegendName) {
-
- // on crée la couche
- layerObj laObj = new layerObj(map);
-
- laObj.setConnection("user=postgres password=postgres dbname=institution_mf_db host=10.2.2.223");
- laObj.setConnectiontype(MS_CONNECTION_TYPE.MS_POSTGIS);
-
- laObj.setData(data);
- laObj.setStatus(0);
-
- if (!"".equals(filtre) && filtre != null) {
- laObj.setFilter(filtre);
- }
-
- laObj.setType(type);
-
- // on attribue son nom
- laObj.setName(nomCouche);
-
- if (affiche)
- laObj.setStatus(1);
- else
- laObj.setStatus(0);
-
- // on définit un template pour l'interroger plus tard
- laObj.setTemplate("test.html");
-
- // on crée une classe dans cette couche
- classObj cObj = new classObj(laObj);
- cObj.setName(nomCouche);
-
- // dans lequel on crée un style
- styleObj sObj = new styleObj(cObj);
- sObj.setMinwidth(2);
-
- colorObj color = new colorObj(0, 0, 0, 0);
- String[] splitCouleur=couleur.split(",");
- color.setRGB(Integer.parseInt(splitCouleur[0]),Integer.parseInt(splitCouleur[1]),Integer.parseInt(splitCouleur[2]));
- sObj.setColor(color);
- if(!"".equals(iconeLegendName)){
- imageObj iconImage=cObj.createLegendIcon(map,laObj,50,10);
- iconImage.save(iconeLegendName, map);
- }
- if(type==MS_LAYER_TYPE.MS_LAYER_POINT)
- {
- symbolObj symbole = new symbolObj("symbole","C:\\protosig\\map\\maison3.GIF");
- symbole.setPosition(0);
- symbole.setSizey(5.0);
- sObj.setSymbol(0);
- sObj.setSymbolByName(map, "maison3.GIF");
- }
- laObj.setSymbolscale(250000);
-
- // si on a un label, on l'affiche
- if (!labelitem.equals("")) {
- laObj.setLabelitem(labelitem);
- //Ajout du Label
- labelObj label = cObj.getLabel();
- // Précision sur l'affichage de la données de type attributaire
- // la couleur, la taille de la donnée ...
- label.setPosition(MS_POSITIONS_ENUM.MS_CL.swigValue());
-
- colorObj couleurObj = new colorObj(0, 0, 0, 0);
- couleurObj.setRGB(0,0,0);
- label.setColor(couleurObj);
- couleurObj.setRGB(255,255,255);
- label.setOutlinecolor(couleurObj);
- label.setShadowcolor(couleurObj);
- label.setBackgroundcolor(couleurObj);
- label.setBackgroundshadowcolor(couleurObj);
- label.setSize(0);
- }
-
- color.delete();
- sObj.delete();
- cObj.delete();
- laObj.delete();
- }
Modified: trunk/docs/ogc/filter_encoding.txt
===================================================================
--- trunk/docs/ogc/filter_encoding.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/ogc/filter_encoding.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -58,23 +58,23 @@
| Spatial Capabilities | |
+----------------------+-------------------------------------+
| | Equals |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Disjoint |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Touches |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Within |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Overlaps |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Crosses |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Intersects |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Contains |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | DWithin |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | BBOX |
+----------------------+-------------------------------------+
| Scalar Capabilities | |
@@ -84,25 +84,25 @@
| Logical Operators | |
+----------------------+-------------------------------------+
| | And |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Or |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | Not |
+----------------------+-------------------------------------+
| Comparison Operators | |
+----------------------+-------------------------------------+
| | PropertyIsNotEqualTo (<>) |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsLessThan (<) |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsGreaterThan (>) |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsLessThanOrEqualTo (<=) |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsGreaterThanOrEqualTo (>=) |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsLike |
-| +-------------------------------------+
++----------------------+-------------------------------------+
| | PropertyIsBetween (range) |
+----------------------+-------------------------------------+
Modified: trunk/docs/ogc/sld.txt
===================================================================
--- trunk/docs/ogc/sld.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/ogc/sld.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -546,7 +546,7 @@
Mapserver 5.2 introduces the possibility to assign a group to a series of classes
defined on a layer object using two new non-mandatory keywords
- CLASSGROUP (at the layer level) and GROUP at the class level:
+CLASSGROUP (at the layer level) and GROUP at the class level:
::
Modified: trunk/docs/ogc/wms_client.txt
===================================================================
--- trunk/docs/ogc/wms_client.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/ogc/wms_client.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -426,11 +426,11 @@
.. 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)
*********************************************************************
Modified: trunk/docs/utilities/shptreevis.txt
===================================================================
--- trunk/docs/utilities/shptreevis.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/utilities/shptreevis.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -27,7 +27,7 @@
**Figure: shptreevis result displayed in QGIS**
-.. image:: /docs/reference/utilityreference/shptreevis-example/
+.. image:: ../images/shptreevis-example.png
:height: 509
:width: 700
Modified: trunk/docs/utilities/sortshp.txt
===================================================================
--- trunk/docs/utilities/sortshp.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/utilities/sortshp.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -31,8 +31,8 @@
**Figure1: Attributes Before sortshp**
-.. image:: /docs/reference/utilityreference/sortshp-before/
+.. image:: ../images/sortshp-before.png
**Figure2: Attributes After sortshp**
-.. image:: /docs/reference/utilityreference/sortyshp-after/
\ No newline at end of file
+.. image:: ../images/sortshp-after.png
\ No newline at end of file
Modified: trunk/docs/utilities/tile4ms.txt
===================================================================
--- trunk/docs/utilities/tile4ms.txt 2008-12-01 14:58:00 UTC (rev 8160)
+++ trunk/docs/utilities/tile4ms.txt 2008-12-01 15:44:18 UTC (rev 8161)
@@ -96,12 +96,12 @@
**Figure 1: Index file created by tile4ms utility**
- .. image:: /docs/reference/utilityreference/tile4ms-view/
+ .. image:: ../images/tile4ms-view.png
**Figure 2: Attributes of index file created by tile4ms utility**
- .. image:: /docs/reference/utilityreference/tile4ms-attributes/
+ .. image:: ../images/tile4ms-attributes.png
4. The final step is to use this in your mapfile.
- LAYER object’s TILEINDEX - must point to the location of the index file
More information about the mapserver-commits
mailing list