Author: desruisseaux
Date: Thu May 19 19:52:49 2016
New Revision: 1744631
URL: http://svn.apache.org/viewvc?rev=1744631&view=rev
Log:
Fix to EPSG documentation.
Modified:
sis/site/trunk/content/command-line.mdtext
sis/site/trunk/content/epsg.mdtext
Modified: sis/site/trunk/content/command-line.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/command-line.mdtext?rev=1744631&r1=1744630&r2=1744631&view=diff
==============================================================================
--- sis/site/trunk/content/command-line.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/command-line.mdtext [UTF-8] Thu May 19 19:52:49 2016
@@ -52,10 +52,11 @@ Optional dependencies {#dependencies}
Every JAR files present in the `lib` sub-directory will be included on the
classpath during `sis` command execution.
By default, the `lib` directory contains only the `sis.jar` file.
- However users can add other JAR files in that directory for the following
optional dependencies:
+However users can add other JAR files in that directory for the following
optional dependencies:
* **Derby driver β**
needed only if Apache SIS can not locate a JavaDB driver in the JDK
installation directory.
+ This is normally not needed on Oracle JDK6, JDK7 or JDK8 distribution.
* **UCAR NetCDF library β**
by default, SIS uses its own embedded NetCDF reader which supports only
the classical NetCDF format, as standardized by OGC.
@@ -129,7 +130,8 @@ For example the following command prints
The first time that a command requires the EPSG dataset, Apache SIS will
propose to download and install a local copy.
This automatic download happen only when using the command-line tools
described in this page.
-Developers who wish to use the EPSG dataset in their applications can use the
Maven artifact documented in (TODO).
+Developers who wish to use the EPSG dataset in their applications can use the
Maven artifact
+documented in [download](downloads.html#epsg) page.
<details>
<summary>The above command should produce the following output (click to
expand):</summary>
Modified: sis/site/trunk/content/epsg.mdtext
URL:
http://svn.apache.org/viewvc/sis/site/trunk/content/epsg.mdtext?rev=1744631&r1=1744630&r2=1744631&view=diff
==============================================================================
--- sis/site/trunk/content/epsg.mdtext [UTF-8] (original)
+++ sis/site/trunk/content/epsg.mdtext [UTF-8] Thu May 19 19:52:49 2016
@@ -43,6 +43,8 @@ are incompatible with Apache license. Th
In order to use the EPSG geodetic dataset with Apache SIS, there is two
possibilities:
+[TOC]
+
@@ -60,7 +62,7 @@ to download EPSG geodetic dataset from M
copy of the EPSG geodetic dataset will be created and stored in the
`apache-sis-0.7/data` sub-directory.
If the command-line tool does not offer to download the EPSG geodetic dataset,
-try adding a `derby-<version>.jar` file ([download lib-distribution][Derby])
in the `apache-sis-0.7/lib` sub-directory.
+try adding a `derby-<version>.jar` file (download lib-distribution from [Derby
project][Derby]) in the `apache-sis-0.7/lib` sub-directory.
This is normally not needed with Oracle JDK6, JDK7 or JDK8 because Apache SIS
tries to use the JavaDB embedded
in those distributions, but may be necessary with other distributions or in
security-constrained environments.
@@ -78,9 +80,9 @@ Add a Maven dependency {#maven}
==============================================================
Maven projects can get the EPSG geodetic dataset automatically, _without any
prompt for terms of use agreement_,
-if they add a dependency to the `org.apache.sis.non-free:sis-epsg:0.7`
artifact in their project.
-We assume that developers who add this dependency explicitely in their
projects agree with the terms of use.
-The `<dependency>` fragment to use in the `pom.xml` file is given in the
[download](download.html#epsg) page.
+if they add a dependency to the `org.apache.sis.non-free:βsis-epsg:β0.7`
artifact in their project.
+We assume that developers who add this dependency explicitely in their project
agree with EPSG terms of use.
+The `<dependency>` fragment to use in `pom.xml` files is given in the
[download](downloads.html#epsg) page.
In addition, users need to apply *one* of the following choices:
@@ -88,7 +90,7 @@ In addition, users need to apply *one* o
* Set the `derby.system.home` Java property to the path of an initially
empty directory,
or a directory that contain other Derby databases.
-The directory references by `SIS_DATA` or `derby.system.home` must exist.
+The directory referenced by `SIS_DATA` or `derby.system.home` must exist.
Sub-directories in that directory will be created as needed.
