Revision: 18005
          http://sourceforge.net/p/gate/code/18005
Author:   ian_roberts
Date:     2014-05-15 17:13:58 +0000 (Thu, 15 May 2014)
Log Message:
-----------
Merged doc changes from branch, bumped doc version

Modified Paths:
--------------
    gcp/trunk/doc/gcp-guide.pdf
    gcp/trunk/doc/gcp-guide.tex
    gcp/trunk/doc/install-and-run.tex
    gcp/trunk/doc/introduction.tex

Property Changed:
----------------
    gcp/trunk/

Index: gcp/trunk
===================================================================
--- gcp/trunk   2014-05-15 17:11:16 UTC (rev 18004)
+++ gcp/trunk   2014-05-15 17:13:58 UTC (rev 18005)

Property changes on: gcp/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1,2 ##
 /gcp/branches/2.2:15411
+/gcp/branches/2.4:18004
\ No newline at end of property
Modified: gcp/trunk/doc/gcp-guide.pdf
===================================================================
(Binary files differ)

Modified: gcp/trunk/doc/gcp-guide.tex
===================================================================
--- gcp/trunk/doc/gcp-guide.tex 2014-05-15 17:11:16 UTC (rev 18004)
+++ gcp/trunk/doc/gcp-guide.tex 2014-05-15 17:13:58 UTC (rev 18005)
@@ -4,7 +4,7 @@
 \begin{document}
 \title{{\Huge {\textsc{The GATECloud Paralleliser (GCP)}}}\\
 Large-scale multi-threaded processing with GATE Embedded \\
-{\small version 2.4-SNAPSHOT}
+{\small version 2.5-SNAPSHOT}
 }
 \author{Ian Roberts, Valentin Tablan\\GATE Team}
 

Modified: gcp/trunk/doc/install-and-run.tex
===================================================================
--- gcp/trunk/doc/install-and-run.tex   2014-05-15 17:11:16 UTC (rev 18004)
+++ gcp/trunk/doc/install-and-run.tex   2014-05-15 17:13:58 UTC (rev 18005)
@@ -12,11 +12,11 @@
 http://svn.code.sf.net/p/gate/code/gcp/tags/<version>
 \end{verbatim}
 
-To build GCP you will need a Java 6 JDK (update 14 or later).  Sun/Oracle,
-OpenJDK and (on Mac OS X) the Apple JDK have been tested and are known to work.
-GCJ is known {\em not} to work.  You will also need Apache Ant version 1.7.0 or
-later.  Run ``ant distro'' to build a ZIP file containing the binary
-distribution, and unzip that file somewhere to create your GCP installation.
+To build GCP you will need a Java 7 JDK.  Sun/Oracle and OpenJDK have been
+tested and are known to work.  GCJ is known {\em not} to work.  You will also
+need Apache Ant version 1.7.0 or later.  Run ``ant distro'' to build a ZIP file
+containing the binary distribution, and unzip that file somewhere to create
+your GCP installation.
 
 \section{Running GCP}
 

Modified: gcp/trunk/doc/introduction.tex
===================================================================
--- gcp/trunk/doc/introduction.tex      2014-05-15 17:11:16 UTC (rev 18004)
+++ gcp/trunk/doc/introduction.tex      2014-05-15 17:13:58 UTC (rev 18005)
@@ -137,7 +137,7 @@
 \subsection{2.4 (May 2014)}
 
 \bit
-\item Now depends on GATE Embedded 8.0
+\item Now depends on GATE Embedded 8.0 (and thus requires Java 7 to run)
 \item Added input handler for WARC format archives, to complement the existing
   ARC handler (section~\ref{sec:batch-def:arc}).
 \item ARC and WARC handlers can optionally load individual records from

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
"Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE
Instantly run your Selenium tests across 300+ browser/OS combos.
Get unparalleled scalability from the best Selenium testing platform available
Simple to use. Nothing to install. Get started now for free."
http://p.sf.net/sfu/SauceLabs
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs

Reply via email to