sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1395070 - in /sis/trunk: ./ src/site/apt/branches.apt src/site/apt/develop.apt src/site/apt/index.apt
Date Sat, 06 Oct 2012 14:18:54 GMT
Author: desruisseaux
Date: Sat Oct  6 14:18:54 2012
New Revision: 1395070

URL: http://svn.apache.org/viewvc?rev=1395070&view=rev
Log:
Merge from the JDK6 branch.

Added:
    sis/trunk/src/site/apt/branches.apt
      - copied unchanged from r1395069, sis/branches/JDK6/src/site/apt/branches.apt
Modified:
    sis/trunk/   (props changed)
    sis/trunk/src/site/apt/develop.apt
    sis/trunk/src/site/apt/index.apt

Propchange: sis/trunk/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1394920-1395068
  Merged /sis/branches/JDK6:r1394921-1395069

Modified: sis/trunk/src/site/apt/develop.apt
URL: http://svn.apache.org/viewvc/sis/trunk/src/site/apt/develop.apt?rev=1395070&r1=1395069&r2=1395070&view=diff
==============================================================================
--- sis/trunk/src/site/apt/develop.apt (original)
+++ sis/trunk/src/site/apt/develop.apt Sat Oct  6 14:18:54 2012
@@ -5,6 +5,11 @@
 
 Opening Apache SIS in an IDE
 
+  Different SIS branches are available depending on the target platforms (JDK6 versus JDK7,
+  or GeoAPI versions). The alternatives are listed in the {{{./branches.html}branches page}}.
+  This section documents how to checkout the trunk for development, but the same instructions
+  should work for any branch.
+
   While the primarily SIS build system is Maven, the project provides some IDE configuration
files
   for developers convenience. Before opening the project in an IDE, the source code needs
to be
   downloaded from the {{{./source-repository.html}source repository}} and the project built
at

Modified: sis/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/trunk/src/site/apt/index.apt?rev=1395070&r1=1395069&r2=1395070&view=diff
==============================================================================
--- sis/trunk/src/site/apt/index.apt (original)
+++ sis/trunk/src/site/apt/index.apt Sat Oct  6 14:18:54 2012
@@ -15,20 +15,27 @@ The Apache SIS™ library
 
   SIS requires a Java 6 Runtime Environment.
   The latest release is <<<0.2-incubating>>>.
-  The current development branch is <<<0.3-geoapi3.0-SNAPSHOT>>>.
+  The version under development is <<<0.3-geoapi3.0-SNAPSHOT>>>.
 
 
 * Documentation
 
+** User documentation
+
     * {{{./download.html}Downloading binaries}}
 
     * {{{http://builds.apache.org/job/sis-trunk/site/apidocs/index.html}Aggregated Javadoc}}
 
+    * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
+
+
+** SIS developer documentation
+
     * {{{./develop.html}Developing Apache SIS}}
 
-    * {{{./code-patterns.html}Recommended code patterns}}
+    * {{{./branches.html}Branches (JDK6, JDK7, GeoAPI)}}
 
-    * Developer Guide (English - translation to be provided later) ({{{./book/fr.xhtml}Français}})
+    * {{{./code-patterns.html}Recommended code patterns}}
 
 
   Apache SIS, Apache, the Apache feather logo, and the Apache SIS project logo are trademarks
of



Mime
View raw message