You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2012/09/28 05:47:34 UTC

svn commit: r1391290 - in /sis/trunk/src: main/docbook/fr.xml main/javadoc/overview.html site/apt/index.apt site/site.xml

Author: desruisseaux
Date: Fri Sep 28 03:47:34 2012
New Revision: 1391290

URL: http://svn.apache.org/viewvc?rev=1391290&view=rev
Log:
Applied some of the recommendations of http://www.apache.org/foundation/marks/pmcs.html (trademark, link to Apache home page and license).

Modified:
    sis/trunk/src/main/docbook/fr.xml
    sis/trunk/src/main/javadoc/overview.html
    sis/trunk/src/site/apt/index.apt
    sis/trunk/src/site/site.xml

Modified: sis/trunk/src/main/docbook/fr.xml
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/docbook/fr.xml?rev=1391290&r1=1391289&r2=1391290&view=diff
==============================================================================
--- sis/trunk/src/main/docbook/fr.xml (original)
+++ sis/trunk/src/main/docbook/fr.xml Fri Sep 28 03:47:34 2012
@@ -8,7 +8,7 @@
       xmlns:xlink = "http://www.w3.org/1999/xlink">
 
   <info>
-    <title>Introduction à Apache SIS</title>
+    <title>Introduction à Apache SIS™</title>
     <orgname class="informal">Apache SIS</orgname>
     <author><personname>
       <firstname>Martin</firstname>

Modified: sis/trunk/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/trunk/src/main/javadoc/overview.html?rev=1391290&r1=1391289&r2=1391290&view=diff
==============================================================================
--- sis/trunk/src/main/javadoc/overview.html (original)
+++ sis/trunk/src/main/javadoc/overview.html Fri Sep 28 03:47:34 2012
@@ -5,7 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
   </head>
   <body>
-    Overview of <a href="{@website}">Apache Spatial Information System (SIS)</a>.
+    Overview of <a href="{@website}">Apache SIS™ (Spatial Information System)</a>.
 
     <h3>Requirements</h3>
     <p>SIS requires Java 6 Standard Edition.</p>

Modified: sis/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/trunk/src/site/apt/index.apt?rev=1391290&r1=1391289&r2=1391290&view=diff
==============================================================================
--- sis/trunk/src/site/apt/index.apt (original)
+++ sis/trunk/src/site/apt/index.apt Fri Sep 28 03:47:34 2012
@@ -3,11 +3,13 @@
                              ------------------------------
 
 
-The Apache SIS library
+The Apache SIS™ library
 
   Apache SIS is a toolkit for describing location information, including points, bounding boxes,
   polygons, and for computing distances on that information.
 
+  SIS is a project of the {{{http://www.apache.org}Apache Software Foundation}}.
+
 
 * Using SIS
 
@@ -25,3 +27,7 @@ The Apache SIS library
     * {{{./code-patterns.html}Recommended code patterns}}
 
     * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
+
+
+  Apache SIS, Apache, the Apache feather logo, and the Apache SIS project logo are trademarks of
+  The Apache Software Foundation.

Modified: sis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/trunk/src/site/site.xml?rev=1391290&r1=1391289&r2=1391290&view=diff
==============================================================================
--- sis/trunk/src/site/site.xml (original)
+++ sis/trunk/src/site/site.xml Fri Sep 28 03:47:34 2012
@@ -17,6 +17,7 @@
       <item name="GeoAPI" href="http://www.geoapi.org"/>
       <item name="Javadoc" href="http://builds.apache.org/job/sis-trunk/site/apidocs/index.html"/>
       <!-- Absolute URL in order to point to the aggregated Javadoc instead than module Javadoc. -->
+      <item name="Apache" href="http://www.apache.org"/>
     </links>
 
     <!-- ==================================================== -->
@@ -25,6 +26,7 @@
     <menu name="Quick links" inherit="none">
       <item name="Aggregated Javadoc" href="apidocs/index.html"/>
       <item name="Mailing list"       href="mail-lists.html"/>
+      <item name="License"            href="http://www.apache.org/licenses/"/>
     </menu>
 
     <menu ref="modules" inherit="bottom"/> <!-- Replaced by menu for submodules. -->