[mapserver-commits] r11188 - in trunk/docs: . en

[svn at osgeo.org]

Author: jmckenna
Date: 2011-03-17 07:16:28 -0700 (Thu, 17 Mar 2011)
New Revision: 11188

Modified:
   trunk/docs/conf.py
   trunk/docs/en/documentation.txt
Log:
point to migration guide

Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	2011-03-17 14:00:02 UTC (rev 11187)
+++ trunk/docs/conf.py	2011-03-17 14:16:28 UTC (rev 11188)
@@ -49,7 +49,7 @@
 # The short X.Y version.
 version = '5'
 # The full version, including alpha/beta/rc tags.
-release = '5.6.6'
+release = '6.0-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

Modified: trunk/docs/en/documentation.txt
===================================================================
--- trunk/docs/en/documentation.txt	2011-03-17 14:00:02 UTC (rev 11187)
+++ trunk/docs/en/documentation.txt	2011-03-17 14:16:28 UTC (rev 11188)
@@ -8,6 +8,9 @@
     The entire documentation is also available as a single
     `PDF document <./MapServer.pdf>`__ |image|  and `ePub document <./MapServer.epub>`__
 
+    If you plan on upgrading to the MapServer 6.0 release, be sure to review the
+    :ref:`MapServer Migration Guide <migration>`.
+    
 .. include:: ./include/docnav.inc
 
 .. |image| image:: ./../_static/pdf.png
@@ -15,8 +18,7 @@
    :width: 15
    :alt: PDF icon
    :target: /MapServer.pdf
-
-
+    
 .. toctree::
    :maxdepth: 2
    
@@ -39,9 +41,5 @@
    errors
    faq
    copyright
-
-
-
-