[mapserver-commits] r10111 - in trunk/docs: de en

[svn at osgeo.org]

Author: hobu
Date: 2010-04-23 14:35:30 -0400 (Fri, 23 Apr 2010)
New Revision: 10111

Modified:
   trunk/docs/de/index.txt
   trunk/docs/en/index.txt
Log:
bring forward r10110 to add foss4g banner

Modified: trunk/docs/de/index.txt
===================================================================
--- trunk/docs/de/index.txt	2010-04-23 18:32:24 UTC (rev 10110)
+++ trunk/docs/de/index.txt	2010-04-23 18:35:30 UTC (rev 10111)
@@ -5,6 +5,13 @@
  Willkommen zum MapServer
 *****************************************************************************
 
+.. image:: http://2010.foss4g.org/images/logo_125x125.jpg
+   :height: 125px
+   :width: 125px
+   :alt: FOSS4G 2010 in Barcelona, Spain
+   :align: right
+   :target: http://2010.foss4g.org/
+   
 MapServer ist eine `Open Source`_-Software um raumbezogene Daten und
 interaktive Kartenanwendungen im Web zu präsentieren. Entwickelt wurde
 MapServer ursprünglich Mitte der 1990er Jahre an der Universität von Minnesota

Modified: trunk/docs/en/index.txt
===================================================================
--- trunk/docs/en/index.txt	2010-04-23 18:32:24 UTC (rev 10110)
+++ trunk/docs/en/index.txt	2010-04-23 18:35:30 UTC (rev 10111)
@@ -5,12 +5,20 @@
  Welcome to MapServer
 *****************************************************************************
 
+.. image:: http://2010.foss4g.org/images/logo_125x125.jpg
+   :height: 125px
+   :width: 125px
+   :alt: FOSS4G 2010 in Barcelona, Spain
+   :align: right
+   :target: http://2010.foss4g.org/
+
 MapServer is an `Open Source`_ platform for publishing spatial data and
 interactive mapping applications to the web. Originally developed in the
 mid-1990's at the University of Minnesota, MapServer is released under an
 :ref:`MIT-style license <license>`, and runs on all major platforms
 (:ref:`windows`, :ref:`linux`, :ref:`osx`).
 
+
 The MapServer :ref:`Project Steering Committee (PSC)<rfc23>`, sanctioned by
 `OSGeo`_, manages and administers the project which is maintained, improved,
 and supported by developers from around the world. MapServer is not a
@@ -18,6 +26,7 @@
 
 :ref:`More about MapServer <about>`
 
+  
 .. raw:: html
 
     <table style="height:450px;width:100%"><tr>


Property changes on: trunk/docs/en/index.txt
___________________________________________________________________
Deleted: svn:mergeinfo
   -