[mapserver-commits] r13305 - branches/branch-6-0/docs/en
branches/branch-6-0/docs/en/development/tests
branches/branch-6-0/docs/en/installation
branches/branch-6-0/docs/en/mapfile
branches/branch-6-0/docs/en/mapscript/php
branches/branch-6-0/docs/en/ogc
branches/branch-6-0/docs/en/output trunk/docs/en
trunk/docs/en/development/tests trunk/docs/en/installation
trunk/docs/en/mapfile trunk/docs/en/mapscript/php
trunk/docs/en/ogc trunk/docs/en/output
svn at osgeo.org
svn at osgeo.org
Sun Mar 25 18:12:36 EDT 2012
Author: havatv
Date: 2012-03-25 15:12:36 -0700 (Sun, 25 Mar 2012)
New Revision: 13305
Modified:
branches/branch-6-0/docs/en/development/tests/mapscript.txt
branches/branch-6-0/docs/en/faq.txt
branches/branch-6-0/docs/en/installation/php.txt
branches/branch-6-0/docs/en/introduction.txt
branches/branch-6-0/docs/en/mapfile/map.txt
branches/branch-6-0/docs/en/mapscript/php/by_example.txt
branches/branch-6-0/docs/en/mapscript/php/class-intro.txt
branches/branch-6-0/docs/en/mapscript/php/index.txt
branches/branch-6-0/docs/en/ogc/mapcontext.txt
branches/branch-6-0/docs/en/output/pdf.txt
branches/branch-6-0/docs/en/output/svg.txt
trunk/docs/en/development/tests/mapscript.txt
trunk/docs/en/faq.txt
trunk/docs/en/installation/php.txt
trunk/docs/en/introduction.txt
trunk/docs/en/mapfile/map.txt
trunk/docs/en/mapscript/php/by_example.txt
trunk/docs/en/mapscript/php/class-intro.txt
trunk/docs/en/mapscript/php/index.txt
trunk/docs/en/ogc/mapcontext.txt
trunk/docs/en/output/pdf.txt
trunk/docs/en/output/svg.txt
Log:
Changed the php reference label - influencing a number of files refering to php mapscript (#3950).
Modified: branches/branch-6-0/docs/en/development/tests/mapscript.txt
===================================================================
--- branches/branch-6-0/docs/en/development/tests/mapscript.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/development/tests/mapscript.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -77,10 +77,11 @@
Status
------------------------------------------------------------------------------
-This unit testing framework only covers functionality that is exposed to the
-Python mapscript module. It can help to check on pieces of the core MapServer
-code, but is no guarantor of the :ref:`mapserv` program or of the :ref:`PHP
-MapScript <php>` module. As of this writing, there are 159 tests in the suite.
-These are tests of features added since mid-2003. Much of MapServer's older
-stuff remains untested and it is doubtful that we'll make the time to go back
-and fill in.
+This unit testing framework only covers functionality that is exposed
+to the Python mapscript module. It can help to check on pieces of the
+core MapServer code, but is no guarantor of the :ref:`mapserv` program
+or of the :ref:`PHP MapScript <php_mapscript>` module. As of this
+writing, there are 159 tests in the suite. These are tests of
+features added since mid-2003. Much of MapServer's older stuff remains
+untested and it is doubtful that we'll make the time to go back and
+fill in.
Modified: branches/branch-6-0/docs/en/faq.txt
===================================================================
--- branches/branch-6-0/docs/en/faq.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/faq.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -170,9 +170,10 @@
-------------------------------------------------------------------------------
MapScript is the scripting interface to MapServer, usually generated by
-:term:`SWIG` (except in the case of :ref:`php`). MapScript allows you to
-program with MapServer's objects directly instead of interacting with
-MapServer through its :ref:`cgi` and :ref:`mapfile`.
+:term:`SWIG` (except in the case of :ref:`php_mapscript`).
+MapScript allows you to program with MapServer's objects directly
+instead of interacting with MapServer through its :ref:`cgi` and
+:ref:`mapfile`.
Does MapServer support reverse geocoding?
Modified: branches/branch-6-0/docs/en/installation/php.txt
===================================================================
--- branches/branch-6-0/docs/en/installation/php.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/installation/php.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -59,7 +59,7 @@
---------------------------------------------------------------------
- For a list of all classes, properties, and methods available in the module
- see the :ref:`php` reference document.
+ see the :ref:`php_mapscript` reference document.
- More information on the PHP/MapScript module can be found on the
`PHP/MapScript page`_ on MapTools.org.
@@ -322,9 +322,9 @@
:Q: **Is there any documentation available?**
-:A: The main reference document is the :ref:`PHP MapScript reference <php>`,
- which describes all of the current classes, properties and methods
- associated with the PHP/MapScript module.
+:A: The main reference document is the :ref:`PHP MapScript reference
+ <php_mapscript>`, which describes all of the current classes,
+ properties and methods associated with the PHP/MapScript module.
To get a more complete description of each class and the meaning of
their member variables, see the :ref:`MapScript reference <mapscript>`
Modified: branches/branch-6-0/docs/en/introduction.txt
===================================================================
--- branches/branch-6-0/docs/en/introduction.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/introduction.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -56,12 +56,13 @@
.. note::
- :term:`MapScript` provides a scripting interface for MapServer for the
- construction of Web and stand-alone applications. MapScript can be used
- independently of CGI MapServer, and it is a loadable module that adds
- MapServer capability to your favorite scripting language. MapScript
- currently exists in :ref:`PHP <php>`, Perl, :ref:`Python <python>`, Ruby,
- Tcl, Java, and .NET flavors.
+ :term:`MapScript` provides a scripting interface for MapServer for
+ the construction of Web and stand-alone applications. MapScript
+ can be used independently of CGI MapServer, and it is a loadable
+ module that adds MapServer capability to your favorite scripting
+ language. MapScript currently exists in :ref:`PHP
+ <php_mapscript>`, Perl, :ref:`Python <python>`, Ruby, Tcl, Java,
+ and .NET flavors.
This guide will not explicitly discuss MapScript, check out the
:ref:`MapScript Reference <mapscript>` for more information.
@@ -676,7 +677,7 @@
If you add geographic data layers with different geographical
reference systems, you will need to modify your Map File to add a
:ref:`PROJECTION` block to the :ref:`map` (defines the output
-projection / geograpical reference system) and each of the
+projection / geographical reference system) and each of the
:ref:`layer`\s (defines the geographical reference system of the layer
dataset).
Modified: branches/branch-6-0/docs/en/mapfile/map.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/map.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/mapfile/map.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -24,8 +24,8 @@
same projection).
- Requires :ref:`MapScript <mapscript>` (:ref:`SWIG <swig>`,
- :ref:`PHP MapScript <php>`). Does not work with :ref:`CGI <cgi>`
- mode.
+ :ref:`PHP MapScript <php_mapscript>`). Does not work with
+ :ref:`CGI <cgi>` mode.
- If using the :ref:`LABEL` object's ANGLE or the :ref:`LAYER`
object's `LABELANGLEITEM` parameters as well, these parameters
Modified: branches/branch-6-0/docs/en/mapscript/php/by_example.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/by_example.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/mapscript/php/by_example.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -19,7 +19,7 @@
============
The purpose of this document is to be a step by step explanation of the
-:ref:`php` with practical examples for each of
+:ref:`php_mapscript` with practical examples for each of
them. It is assumed a basic knowledge of :ref:`map` and MapServer, and
familiarity with the `PHP (scripting)`_ and `HTML (markup)`_ languages .
This document was originally created for MapServer v4.0, but the examples still
Modified: branches/branch-6-0/docs/en/mapscript/php/class-intro.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/class-intro.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/mapscript/php/class-intro.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -40,7 +40,7 @@
- The `MapServer Wiki`_ might have more information on this module
- For installation questions regarding the PHP/MapScript module, see
:ref:`php_install`.
-- Also, see the :ref:`mapscript`, :ref:`php` and the :ref:`mapfile`
+- Also, see the :ref:`mapscript`, :ref:`php_mapscript` and the :ref:`mapfile`
- Refer to the `main PHP site`_ for their official documentation
.. _`PHP/MapScript page`: http://www.maptools.org/php_mapscript/
Modified: branches/branch-6-0/docs/en/mapscript/php/index.txt
===================================================================
--- branches/branch-6-0/docs/en/mapscript/php/index.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/mapscript/php/index.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -1,4 +1,4 @@
-.. _php:
+.. _php_mapscript:
*****************************************************************************
PHP MapScript
Modified: branches/branch-6-0/docs/en/ogc/mapcontext.txt
===================================================================
--- branches/branch-6-0/docs/en/ogc/mapcontext.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/ogc/mapcontext.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -308,9 +308,9 @@
Testing Map Context Support
---------------------------
-1. The first thing to do is to save your mapfile using the saveMapContext function
- available from the :ref:`PHP/MapScript <php>` library. An
- example script is shown below:
+1. The first thing to do is to save your mapfile using the
+ saveMapContext function available from the :ref:`PHP/MapScript
+ <php_mapscript>` library. An example script is shown below:
.. code-block:: php
Modified: branches/branch-6-0/docs/en/output/pdf.txt
===================================================================
--- branches/branch-6-0/docs/en/output/pdf.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/output/pdf.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -200,7 +200,8 @@
of the script yourself (depending on your app) and repeat the process for each map
element that you want to include.
-Refer to the :ref:`PHP/MapScript Reference <php>` wherever necessary.
+Refer to the :ref:`PHP/MapScript Reference <php_mapscript>` wherever
+necessary.
How does it work?
-----------------
Modified: branches/branch-6-0/docs/en/output/svg.txt
===================================================================
--- branches/branch-6-0/docs/en/output/svg.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ branches/branch-6-0/docs/en/output/svg.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -166,7 +166,7 @@
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 :ref:`PHP/MapScript <php>` to test your SVG mapfile. Your php file
+- You can also use :ref:`PHP/MapScript <php_mapscript>` to test your SVG mapfile. Your php file
might look like the following:
::
Modified: trunk/docs/en/development/tests/mapscript.txt
===================================================================
--- trunk/docs/en/development/tests/mapscript.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/development/tests/mapscript.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -77,10 +77,11 @@
Status
------------------------------------------------------------------------------
-This unit testing framework only covers functionality that is exposed to the
-Python mapscript module. It can help to check on pieces of the core MapServer
-code, but is no guarantor of the :ref:`mapserv` program or of the :ref:`PHP
-MapScript <php>` module. As of this writing, there are 159 tests in the suite.
-These are tests of features added since mid-2003. Much of MapServer's older
-stuff remains untested and it is doubtful that we'll make the time to go back
-and fill in.
+This unit testing framework only covers functionality that is exposed
+to the Python mapscript module. It can help to check on pieces of the
+core MapServer code, but is no guarantor of the :ref:`mapserv` program
+or of the :ref:`PHP MapScript <php_mapscript>` module. As of this
+writing, there are 159 tests in the suite. These are tests of
+features added since mid-2003. Much of MapServer's older stuff remains
+untested and it is doubtful that we'll make the time to go back and
+fill in.
Modified: trunk/docs/en/faq.txt
===================================================================
--- trunk/docs/en/faq.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/faq.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -170,9 +170,10 @@
-------------------------------------------------------------------------------
MapScript is the scripting interface to MapServer, usually generated by
-:term:`SWIG` (except in the case of :ref:`php`). MapScript allows you to
-program with MapServer's objects directly instead of interacting with
-MapServer through its :ref:`cgi` and :ref:`mapfile`.
+:term:`SWIG` (except in the case of :ref:`php_mapscript`).
+MapScript allows you to program with MapServer's objects directly
+instead of interacting with MapServer through its :ref:`cgi` and
+:ref:`mapfile`.
Does MapServer support reverse geocoding?
Modified: trunk/docs/en/installation/php.txt
===================================================================
--- trunk/docs/en/installation/php.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/installation/php.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -59,7 +59,7 @@
---------------------------------------------------------------------
- For a list of all classes, properties, and methods available in the module
- see the :ref:`php` reference document.
+ see the :ref:`php_mapscript` reference document.
- More information on the PHP/MapScript module can be found on the
`PHP/MapScript page`_ on MapTools.org.
@@ -322,9 +322,9 @@
:Q: **Is there any documentation available?**
-:A: The main reference document is the :ref:`PHP MapScript reference <php>`,
- which describes all of the current classes, properties and methods
- associated with the PHP/MapScript module.
+:A: The main reference document is the :ref:`PHP MapScript reference
+ <php_mapscript>`, which describes all of the current classes,
+ properties and methods associated with the PHP/MapScript module.
To get a more complete description of each class and the meaning of
their member variables, see the :ref:`MapScript reference <mapscript>`
Modified: trunk/docs/en/introduction.txt
===================================================================
--- trunk/docs/en/introduction.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/introduction.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -56,12 +56,13 @@
.. note::
- :term:`MapScript` provides a scripting interface for MapServer for the
- construction of Web and stand-alone applications. MapScript can be used
- independently of CGI MapServer, and it is a loadable module that adds
- MapServer capability to your favorite scripting language. MapScript
- currently exists in :ref:`PHP <php>`, Perl, :ref:`Python <python>`, Ruby,
- Tcl, Java, and .NET flavors.
+ :term:`MapScript` provides a scripting interface for MapServer for
+ the construction of Web and stand-alone applications. MapScript
+ can be used independently of CGI MapServer, and it is a loadable
+ module that adds MapServer capability to your favorite scripting
+ language. MapScript currently exists in :ref:`PHP
+ <php_mapscript>`, Perl, :ref:`Python <python>`, Ruby, Tcl, Java,
+ and .NET flavors.
This guide will not explicitly discuss MapScript, check out the
:ref:`MapScript Reference <mapscript>` for more information.
Modified: trunk/docs/en/mapfile/map.txt
===================================================================
--- trunk/docs/en/mapfile/map.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/mapfile/map.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -24,8 +24,8 @@
same projection).
- Requires :ref:`MapScript <mapscript>` (:ref:`SWIG <swig>`,
- :ref:`PHP MapScript <php>`). Does not work with :ref:`CGI <cgi>`
- mode.
+ :ref:`PHP MapScript <php_mapscript>`). Does not work with
+ :ref:`CGI <cgi>` mode.
- If using the :ref:`LABEL` object's ANGLE or the :ref:`LAYER`
object's `LABELANGLEITEM` parameters as well, these parameters
Modified: trunk/docs/en/mapscript/php/by_example.txt
===================================================================
--- trunk/docs/en/mapscript/php/by_example.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/mapscript/php/by_example.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -19,7 +19,7 @@
============
The purpose of this document is to be a step by step explanation of the
-:ref:`php` with practical examples for each of
+:ref:`php_mapscript` with practical examples for each of
them. It is assumed a basic knowledge of :ref:`map` and MapServer, and
familiarity with the `PHP (scripting)`_ and `HTML (markup)`_ languages .
This document was originally created for MapServer v4.0, but the examples still
Modified: trunk/docs/en/mapscript/php/class-intro.txt
===================================================================
--- trunk/docs/en/mapscript/php/class-intro.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/mapscript/php/class-intro.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -40,7 +40,7 @@
- The `MapServer Wiki`_ might have more information on this module
- For installation questions regarding the PHP/MapScript module, see
:ref:`php_install`.
-- Also, see the :ref:`mapscript`, :ref:`php` and the :ref:`mapfile`
+- Also, see the :ref:`mapscript`, :ref:`php_mapscript` and the :ref:`mapfile`
- Refer to the `main PHP site`_ for their official documentation
.. _`PHP/MapScript page`: http://www.maptools.org/php_mapscript/
Modified: trunk/docs/en/mapscript/php/index.txt
===================================================================
--- trunk/docs/en/mapscript/php/index.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/mapscript/php/index.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -1,4 +1,4 @@
-.. _php:
+.. _php_mapscript:
*****************************************************************************
PHP MapScript
Modified: trunk/docs/en/ogc/mapcontext.txt
===================================================================
--- trunk/docs/en/ogc/mapcontext.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/ogc/mapcontext.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -308,9 +308,9 @@
Testing Map Context Support
---------------------------
-1. The first thing to do is to save your mapfile using the saveMapContext function
- available from the :ref:`PHP/MapScript <php>` library. An
- example script is shown below:
+1. The first thing to do is to save your mapfile using the
+ saveMapContext function available from the :ref:`PHP/MapScript
+ <php_mapscript>` library. An example script is shown below:
.. code-block:: php
Modified: trunk/docs/en/output/pdf.txt
===================================================================
--- trunk/docs/en/output/pdf.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/output/pdf.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -200,7 +200,8 @@
of the script yourself (depending on your app) and repeat the process for each map
element that you want to include.
-Refer to the :ref:`PHP/MapScript Reference <php>` wherever necessary.
+Refer to the :ref:`PHP/MapScript Reference <php_mapscript>` wherever
+necessary.
How does it work?
-----------------
Modified: trunk/docs/en/output/svg.txt
===================================================================
--- trunk/docs/en/output/svg.txt 2012-03-25 09:53:32 UTC (rev 13304)
+++ trunk/docs/en/output/svg.txt 2012-03-25 22:12:36 UTC (rev 13305)
@@ -166,7 +166,7 @@
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 :ref:`PHP/MapScript <php>` to test your SVG mapfile. Your php file
+- You can also use :ref:`PHP/MapScript <php_mapscript>` to test your SVG mapfile. Your php file
might look like the following:
::
More information about the mapserver-commits
mailing list