[mapserver-commits] r8270 - in trunk/docs: . _templates cgi community development include input installation mapfile mapscript ogc optimization output utilities

svn at osgeo.org svn at osgeo.org
Mon Dec 22 14:28:04 EST 2008


Author: hobu
Date: 2008-12-22 14:28:04 -0500 (Mon, 22 Dec 2008)
New Revision: 8270

Added:
   trunk/docs/include/
   trunk/docs/include/docnav.inc
Modified:
   trunk/docs/_templates/layout.html
   trunk/docs/cgi/index.txt
   trunk/docs/community/index.txt
   trunk/docs/conf.py
   trunk/docs/contents.txt
   trunk/docs/development/index.txt
   trunk/docs/documentation.txt
   trunk/docs/input/index.txt
   trunk/docs/installation/index.txt
   trunk/docs/introduction.txt
   trunk/docs/mapfile/index.txt
   trunk/docs/mapscript/index.txt
   trunk/docs/ogc/index.txt
   trunk/docs/optimization/index.txt
   trunk/docs/output/index.txt
   trunk/docs/utilities/index.txt
Log:
includes for docs navigation

Modified: trunk/docs/_templates/layout.html
===================================================================
--- trunk/docs/_templates/layout.html	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/_templates/layout.html	2008-12-22 19:28:04 UTC (rev 8270)
@@ -5,9 +5,9 @@
 {% block relbar1 %}
 
 <div style="padding: 10px 10px 15px 15px; background-color: white; text-align: right; float: right; vertical-align: bottom;">
+<a href="{{ pathto('documentation') }}">Docs</a> (<a href="/MapServer.pdf">pdf</a>) |
 <a href="http://svn.osgeo.org/mapserver">Source</a> |
 <a href="http://trac.osgeo.org/mapserver">Bugs</a> |
-<a href="{{ pathto('documentation') }}">Docs</a> (<a href="/MapServer.pdf">pdf</a>) |
 <a href="{{ pathto('download') }}">Download </a>
 </div>
 

Modified: trunk/docs/cgi/index.txt
===================================================================
--- trunk/docs/cgi/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/cgi/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -20,6 +20,8 @@
    controls
    runsub
    wrapper
+
+.. include:: ../include/docnav.inc
+
    
-   
 

Modified: trunk/docs/community/index.txt
===================================================================
--- trunk/docs/community/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/community/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -10,3 +10,6 @@
    lists
    irc
 
+.. include:: ../include/docnav.inc
+
+

Modified: trunk/docs/conf.py
===================================================================
--- trunk/docs/conf.py	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/conf.py	2008-12-22 19:28:04 UTC (rev 8270)
@@ -35,7 +35,7 @@
 #source_encoding = 'utf-8'
 
 # The master toctree document.
-master_doc = 'contents'
+master_doc = 'documentation'
 
 # General information about the project.
 project = u'MapServer'
@@ -95,10 +95,10 @@
 
 # The name for this set of Sphinx documents.  If None, it defaults to
 # "<project> v<release> documentation".
-#html_title = None
+html_title = "MapServer " + release + " documentation"
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+html_short_title = "Documentation"
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
@@ -165,7 +165,7 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('contents', 'MapServer.tex', ur'MapServer Documentation',
+  ('documentation', 'MapServer.tex', ur'MapServer Documentation',
    ur'The MapServer Team', 'manual', False),
 ]
 

Modified: trunk/docs/contents.txt
===================================================================
--- trunk/docs/contents.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/contents.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -1,17 +1,14 @@
 .. _contents:
 
 ***************************************************
- Documentation Contents
+ MapServer Documentation
 ***************************************************
 
-.. note::
-    This page is a placeholder for the documentation generation software.  You 
-    may want the :ref:`documentation` page instead.
-    
+.. include:: ./include/docnav.inc
+
 .. toctree::
-   :maxdepth: 1
+   :maxdepth: 2
 
-   documentation
    introduction
    installation/index
    mapfile/index

Modified: trunk/docs/development/index.txt
===================================================================
--- trunk/docs/development/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/development/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -15,3 +15,5 @@
    rfc/index
    editing/index
    doc_style_guide
+
+.. include:: ../include/docnav.inc

Modified: trunk/docs/documentation.txt
===================================================================
--- trunk/docs/documentation.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/documentation.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -4,15 +4,31 @@
  MapServer |release| Documentation
 ***************************************************
 
-.. csv-table:: 
+.. include:: ./include/docnav.inc
 
-    :ref:`introduction`,:ref:`installation`,:ref:`mapfile`
-    :ref:`mapscript`,:ref:`input`,:ref:`output`
-    :ref:`ogc`,:ref:`optimization`,:ref:`utilities`
-    :ref:`development`,:ref:`gloss`, :ref:`genindex`
 
+.. toctree::
+   :maxdepth: 2
 
+   introduction
+   installation/index
+   mapfile/index
+   mapscript/index
+   input/index
+   output/index
+   ogc/index
+   optimization/index
+   utilities/index
+   cgi/index
+   community/index
+   development/index
+   glossary
+   download
+   copyright
 
+.. include:: ./include/docnav.inc
+
+
 .. figure:: ./images/reccompass.jpg
     :target: http://www.dnr.state.mn.us/maps/compass.html
     :alt: Minnesota Recreation Compass

Added: trunk/docs/include/docnav.inc
===================================================================
--- trunk/docs/include/docnav.inc	                        (rev 0)
+++ trunk/docs/include/docnav.inc	2008-12-22 19:28:04 UTC (rev 8270)
@@ -0,0 +1,10 @@
+
+
+..   csv-table:: Documentation Navigation
+
+    :ref:`introduction`,:ref:`installation`,:ref:`mapfile`
+    :ref:`mapscript`,:ref:`input`,:ref:`output`
+    :ref:`ogc`,:ref:`optimization`,:ref:`utilities`
+    :ref:`development`,:ref:`gloss`, :ref:`genindex`
+
+

Modified: trunk/docs/input/index.txt
===================================================================
--- trunk/docs/input/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/input/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -10,3 +10,5 @@
 
    vector/index
    raster_data
+
+.. include:: ../include/docnav.inc

Modified: trunk/docs/installation/index.txt
===================================================================
--- trunk/docs/installation/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/installation/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -15,3 +15,4 @@
    iis
    oracle
 
+.. include:: ../include/docnav.inc

Modified: trunk/docs/introduction.txt
===================================================================
--- trunk/docs/introduction.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/introduction.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -90,7 +90,7 @@
   supported, this is discussed further below in `Adding data to your site`_.
   
   .. seealso::
-    :ref:`Vector Input Reference <vector>`
+    :ref:`Vector Input Reference <vector>` :ref:`Raster Input Reference <raster>`
  
 * **HTML Pages** - the interface between the user and MapServer .  
   They normally sit in Web root.  In it's simplest form, MapServer can be called 

Modified: trunk/docs/mapfile/index.txt
===================================================================
--- trunk/docs/mapfile/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/mapfile/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -89,4 +89,6 @@
   On Linux, this is GLibC, and you can read "man 7 regex" ... This man page is 
   also available on most UNIX's. Since these RegEx's are POSIX compliant, they 
   should be the same on Windows as well, so windows users can try searching 
-  the web for "man 7 regex" since man pages are available all over the web. 
\ No newline at end of file
+  the web for "man 7 regex" since man pages are available all over the web. 
+
+.. include:: ../include/docnav.inc

Modified: trunk/docs/mapscript/index.txt
===================================================================
--- trunk/docs/mapscript/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/mapscript/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -23,3 +23,4 @@
    
    
 
+.. include:: ../include/docnav.inc

Modified: trunk/docs/ogc/index.txt
===================================================================
--- trunk/docs/ogc/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/ogc/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -21,5 +21,6 @@
    sos_server
    mapscript
    
+.. include:: ../include/docnav.inc
    
 

Modified: trunk/docs/optimization/index.txt
===================================================================
--- trunk/docs/optimization/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/optimization/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -13,4 +13,5 @@
    fastcgi
    tileindex
    
+.. include:: ../include/docnav.inc
 

Modified: trunk/docs/output/index.txt
===================================================================
--- trunk/docs/output/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/output/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -18,3 +18,4 @@
    svg
    tile_mode
 
+.. include:: ../include/docnav.inc

Modified: trunk/docs/utilities/index.txt
===================================================================
--- trunk/docs/utilities/index.txt	2008-12-22 15:24:17 UTC (rev 8269)
+++ trunk/docs/utilities/index.txt	2008-12-22 19:28:04 UTC (rev 8270)
@@ -20,3 +20,4 @@
    tile4ms
    manage
    
+.. include:: ../include/docnav.inc



More information about the mapserver-commits mailing list