[mapserver-commits] r11990 - branches/branch-6-0/docs/en/mapfile
branches/branch-6-0/docs/en/tutorial trunk/docs/en/mapfile
trunk/docs/en/tutorial
svn at osgeo.org
svn at osgeo.org
Thu Aug 4 06:04:31 EDT 2011
Author: havatv
Date: 2011-08-04 03:04:31 -0700 (Thu, 04 Aug 2011)
New Revision: 11990
Modified:
branches/branch-6-0/docs/en/mapfile/join.txt
branches/branch-6-0/docs/en/mapfile/labelencoding.txt
branches/branch-6-0/docs/en/tutorial/section1.txt
trunk/docs/en/mapfile/join.txt
trunk/docs/en/mapfile/labelencoding.txt
trunk/docs/en/tutorial/section1.txt
Log:
Fixed some overfull lines in the PDF documentation (#3947) - section1, join, labelencoding
Modified: branches/branch-6-0/docs/en/mapfile/join.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/join.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ branches/branch-6-0/docs/en/mapfile/join.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -192,8 +192,10 @@
::
- >ogrinfo -ro PG:"host=127.0.0.1 port=5432 user=postgres password=postgre dbname=join" lookup -summary
- INFO: Open of `PG:host=127.0.0.1 port=5432 user=postgres password=postgres dbname=join'
+ >ogrinfo -ro PG:"host=127.0.0.1 port=5432 user=postgres password=postgre
+ dbname=join" lookup -summary
+ INFO: Open of `PG:host=127.0.0.1 port=5432 user=postgres password=postgres
+ dbname=join'
using driver `PostgreSQL' successful.
Layer name: lookup
@@ -355,4 +357,4 @@
.. note::
When testing with MapServer 5.6.5 and MySQL 5.1.49 on Windows this MySQL join caused a
- mapserv.exe crash.
\ No newline at end of file
+ mapserv.exe crash.
Modified: branches/branch-6-0/docs/en/mapfile/labelencoding.txt
===================================================================
--- branches/branch-6-0/docs/en/mapfile/labelencoding.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ branches/branch-6-0/docs/en/mapfile/labelencoding.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -52,11 +52,14 @@
> mapserv -v
- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP OUTPUT=PDF OUTPUT=SWF OUTPUT=SVG
- SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER
- SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER
- SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=RGBA_PNG SUPPORTS=TILECACHE INPUT=JPEG
- INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE
+ MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG
+ OUTPUT=WBMP OUTPUT=PDF OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ
+ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI
+ SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER
+ SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER
+ SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=RGBA_PNG
+ SUPPORTS=TILECACHE INPUT=JPEG INPUT=POSTGIS INPUT=OGR INPUT=GDAL
+ INPUT=SHAPEFILE
Step 2: Verify That Your Files' Encoding is Supported by ICONV
--------------------------------------------------------------
@@ -185,4 +188,4 @@
=====
During initial implementation, this functionality was tested using the different Japanese encoding systems:
-Shift-JIS, EUC-JP, UTF-8, as well as Thai's TIS-620 encoding system.
\ No newline at end of file
+Shift-JIS, EUC-JP, UTF-8, as well as Thai's TIS-620 encoding system.
Modified: branches/branch-6-0/docs/en/tutorial/section1.txt
===================================================================
--- branches/branch-6-0/docs/en/tutorial/section1.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ branches/branch-6-0/docs/en/tutorial/section1.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -3,31 +3,48 @@
Section 1: Static Maps and the MapFile
======================================
-- Take a shapefile. Any shapefile. We can use MapServer to display that shapefile on a web browser. Look...
+- Take a shapefile. Any shapefile. We can use MapServer to display
+ that shapefile on a web browser. Look...
+
- :ref:`Example 1.1 - A map with a single layer <example1-1>`
-- We can display the same shapefile repeatedly. We can display the polygon attributes on one LAYER and and the line attributes on another...
+- We can display the same shapefile repeatedly. We can display the
+ polygon attributes on one LAYER and and the line attributes on
+ another...
+
- :ref:`Example 1.2 - A map with two layers <example1-2>`
-- And we can select which parts of the shapefile to display. We do this using the CLASS object...
+- And we can select which parts of the shapefile to display. We do
+ this using the CLASS object...
+
- :ref:`Example 1.3 - Using classes to make a "useful" map <example1-3>`
- We can also label our maps...
+
- :ref:`Example 1.4 - Labeling layers and label layers <example1-4>`
-- Or add raster data such as satellite images, aerial photographs, or shaded reliefs...
+- Or add raster data such as satellite images, aerial photographs, or
+ shaded reliefs...
+
- :ref:`Example 1.5 - Adding a raster layer <example1-5>`
-- We can reproject our data from just about any projection to just about any... Yeah, check it out!
+- We can reproject our data from just about any projection to just
+ about any... Yeah, check it out!
+
- :ref:`Example 1.6 - Projection/Reprojection <example1-6`
-- And we can use layers from other map servers on the internet (as long as they are WMS servers)...
+- And we can use layers from other map servers on the internet (as
+ long as they are WMS servers)...
+
- :ref:`Example 1.7 - Adding a WMS layer <example1-7>`
- MapServer can output to various formats such as PDF and GeoTIFF.
+
- :ref:`Example 1.8 - A different output format <example1-8>`
-- MapServer not only generates static maps, it can also create interactive maps...
+- MapServer not only generates static maps, it can also create
+ interactive maps...
+
- `Example 1.9 - The difference between map and browse mode <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
----
Modified: trunk/docs/en/mapfile/join.txt
===================================================================
--- trunk/docs/en/mapfile/join.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ trunk/docs/en/mapfile/join.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -192,8 +192,10 @@
::
- >ogrinfo -ro PG:"host=127.0.0.1 port=5432 user=postgres password=postgre dbname=join" lookup -summary
- INFO: Open of `PG:host=127.0.0.1 port=5432 user=postgres password=postgres dbname=join'
+ >ogrinfo -ro PG:"host=127.0.0.1 port=5432 user=postgres password=postgre
+ dbname=join" lookup -summary
+ INFO: Open of `PG:host=127.0.0.1 port=5432 user=postgres password=postgres
+ dbname=join'
using driver `PostgreSQL' successful.
Layer name: lookup
@@ -355,4 +357,4 @@
.. note::
When testing with MapServer 5.6.5 and MySQL 5.1.49 on Windows this MySQL join caused a
- mapserv.exe crash.
\ No newline at end of file
+ mapserv.exe crash.
Modified: trunk/docs/en/mapfile/labelencoding.txt
===================================================================
--- trunk/docs/en/mapfile/labelencoding.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ trunk/docs/en/mapfile/labelencoding.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -52,11 +52,14 @@
> mapserv -v
- MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG OUTPUT=WBMP OUTPUT=PDF OUTPUT=SWF OUTPUT=SVG
- SUPPORTS=PROJ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI SUPPORTS=WMS_SERVER
- SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER
- SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=RGBA_PNG SUPPORTS=TILECACHE INPUT=JPEG
- INPUT=POSTGIS INPUT=OGR INPUT=GDAL INPUT=SHAPEFILE
+ MapServer version 5.6.5 OUTPUT=GIF OUTPUT=PNG OUTPUT=JPEG
+ OUTPUT=WBMP OUTPUT=PDF OUTPUT=SWF OUTPUT=SVG SUPPORTS=PROJ
+ SUPPORTS=AGG SUPPORTS=FREETYPE SUPPORTS=ICONV SUPPORTS=FRIBIDI
+ SUPPORTS=WMS_SERVER SUPPORTS=WMS_CLIENT SUPPORTS=WFS_SERVER
+ SUPPORTS=WFS_CLIENT SUPPORTS=WCS_SERVER SUPPORTS=SOS_SERVER
+ SUPPORTS=FASTCGI SUPPORTS=THREADS SUPPORTS=GEOS SUPPORTS=RGBA_PNG
+ SUPPORTS=TILECACHE INPUT=JPEG INPUT=POSTGIS INPUT=OGR INPUT=GDAL
+ INPUT=SHAPEFILE
Step 2: Verify That Your Files' Encoding is Supported by ICONV
--------------------------------------------------------------
@@ -185,4 +188,4 @@
=====
During initial implementation, this functionality was tested using the different Japanese encoding systems:
-Shift-JIS, EUC-JP, UTF-8, as well as Thai's TIS-620 encoding system.
\ No newline at end of file
+Shift-JIS, EUC-JP, UTF-8, as well as Thai's TIS-620 encoding system.
Modified: trunk/docs/en/tutorial/section1.txt
===================================================================
--- trunk/docs/en/tutorial/section1.txt 2011-08-04 09:26:56 UTC (rev 11989)
+++ trunk/docs/en/tutorial/section1.txt 2011-08-04 10:04:31 UTC (rev 11990)
@@ -3,31 +3,48 @@
Section 1: Static Maps and the MapFile
======================================
-- Take a shapefile. Any shapefile. We can use MapServer to display that shapefile on a web browser. Look...
+- Take a shapefile. Any shapefile. We can use MapServer to display
+ that shapefile on a web browser. Look...
+
- :ref:`Example 1.1 - A map with a single layer <example1-1>`
-- We can display the same shapefile repeatedly. We can display the polygon attributes on one LAYER and and the line attributes on another...
+- We can display the same shapefile repeatedly. We can display the
+ polygon attributes on one LAYER and and the line attributes on
+ another...
+
- :ref:`Example 1.2 - A map with two layers <example1-2>`
-- And we can select which parts of the shapefile to display. We do this using the CLASS object...
+- And we can select which parts of the shapefile to display. We do
+ this using the CLASS object...
+
- :ref:`Example 1.3 - Using classes to make a "useful" map <example1-3>`
- We can also label our maps...
+
- :ref:`Example 1.4 - Labeling layers and label layers <example1-4>`
-- Or add raster data such as satellite images, aerial photographs, or shaded reliefs...
+- Or add raster data such as satellite images, aerial photographs, or
+ shaded reliefs...
+
- :ref:`Example 1.5 - Adding a raster layer <example1-5>`
-- We can reproject our data from just about any projection to just about any... Yeah, check it out!
+- We can reproject our data from just about any projection to just
+ about any... Yeah, check it out!
+
- :ref:`Example 1.6 - Projection/Reprojection <example1-6`
-- And we can use layers from other map servers on the internet (as long as they are WMS servers)...
+- And we can use layers from other map servers on the internet (as
+ long as they are WMS servers)...
+
- :ref:`Example 1.7 - Adding a WMS layer <example1-7>`
- MapServer can output to various formats such as PDF and GeoTIFF.
+
- :ref:`Example 1.8 - A different output format <example1-8>`
-- MapServer not only generates static maps, it can also create interactive maps...
+- MapServer not only generates static maps, it can also create
+ interactive maps...
+
- `Example 1.9 - The difference between map and browse mode <http://demo.mapserver.org/cgi-bin/mapserv?map=/osgeo/mapserver/tutorial/htdocs/example1-9.map&layer=states&layer=modis>`_
----
More information about the mapserver-commits
mailing list