Author: schor
Date: Tue Oct 30 20:34:00 2018
New Revision: 1845275
URL: http://svn.apache.org/viewvc?rev=1845275&view=rev
Log:
[UIMA-5895] add some info about git
Modified:
uima/site/trunk/uima-website/docs/svn.html
uima/site/trunk/uima-website/xdocs/svn.xml
Modified: uima/site/trunk/uima-website/docs/svn.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/svn.html?rev=1845275&r1=1845274&r2=1845275&view=diff
==============================================================================
--- uima/site/trunk/uima-website/docs/svn.html (original)
+++ uima/site/trunk/uima-website/docs/svn.html Tue Oct 30 20:34:00 2018
@@ -279,14 +279,15 @@
<tr><td>
<blockquote class="sectionBody">
<p>Apache UIMA uses
-<a class="external" rel="nofollow" target="_blank"
href="https://subversion.tigris.org";>
-Subversion</a> to manage its source code.
-If you're new to Subversion, you can check out the
-<a href="https://svnbook.red-bean.com/"; target="_blank">online book</a> about
Subversion.
+<a class="external" rel="nofollow" target="_blank"
href="https://subversion.apache.org";>
+Subversion</a> and
+<a class="external" rel="nofollow" target="_blank"
href="https://github.com/apache";>
+Git</a>
+to manage its source code. Most of the projects are in SVN; the uimaFIT
project is in Git.
</p>
<p>See <a
href="one-time-setup.html#svn-setup">SVN setup</a> for details on how to setup
SVN.</p>
<p>
- The code for UIMA is stored in several sections:</p>
+ The code for UIMA in SVN is stored in several sections:</p>
<ol>
<li>https://svn.apache.org/repos/asf/uima/uimaj - the Java code for base
UIMA</li>
<li>https://svn.apache.org/repos/asf/uima/uima-as - the Asynchronous
Scaleout add-on for base UIMA</li>
@@ -299,6 +300,8 @@ If you're new to Subversion, you can che
Each of these have subdirectories: trunk - for the latest, tags - for
preserved copies of releases,
and (sometimes) branches - for special development efforts.
</p>
+ <p>The UIMA projects at github
are in the apache subdirectory, and start with "uima-".
+</p>
<p>
To receive notice of commits to the repository subscribe to
<a href="mailto:commits@uima.apache.org";>
@@ -319,7 +322,7 @@ commits-subscr...@uima.apache.org</a>.
<tr><td>
<blockquote class="subsectionBody">
<p>
-If you just want to browse the source code, you can use the
+If you just want to browse the source code in SVN, you can use the
<a class="external" rel="nofollow" href="https://svn.apache.org/viewvc/uima";>
viewvc web interface</a> to Subversion. This is current at all times.
</p>
Modified: uima/site/trunk/uima-website/xdocs/svn.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/svn.xml?rev=1845275&r1=1845274&r2=1845275&view=diff
==============================================================================
--- uima/site/trunk/uima-website/xdocs/svn.xml (original)
+++ uima/site/trunk/uima-website/xdocs/svn.xml Tue Oct 30 20:34:00 2018
@@ -73,16 +73,17 @@ under the License.
<section name="Source Code Repository" id="source.code.repository">
<p>Apache UIMA uses
-<a class="external" rel="nofollow" target="_blank"
href="https://subversion.tigris.org";>
-Subversion</a> to manage its source code.
-If you're new to Subversion, you can check out the
-<a href="https://svnbook.red-bean.com/"; target="_blank">online book</a> about
Subversion.
+<a class="external" rel="nofollow" target="_blank"
href="https://subversion.apache.org";>
+Subversion</a> and
+<a class="external" rel="nofollow" target="_blank"
href="https://github.com/apache";>
+Git</a>
+to manage its source code. Most of the projects are in SVN; the uimaFIT
project is in Git.
</p>
<p>See <a href="one-time-setup.html#svn-setup">SVN setup</a> for details on
how to setup SVN.</p>
<p>
- The code for UIMA is stored in several sections:</p>
+ The code for UIMA in SVN is stored in several sections:</p>
<ol>
<li>https://svn.apache.org/repos/asf/uima/uimaj - the Java code for base
UIMA</li>
<li>https://svn.apache.org/repos/asf/uima/uima-as - the Asynchronous
Scaleout add-on for base UIMA</li>
@@ -96,6 +97,9 @@ If you're new to Subversion, you can che
and (sometimes) branches - for special development efforts.
</p>
+<p>The UIMA projects at github are in the apache subdirectory, and start with
"uima-".
+</p>
+
<p>
To receive notice of commits to the repository subscribe to
<a href="mailto:commits@uima.apache.org";>
@@ -106,7 +110,7 @@ commits-subscr...@uima.apache.org</a>.
<subsection name="Web Access to Subversion"
id="source.code.repository.web.access">
<p>
-If you just want to browse the source code, you can use the
+If you just want to browse the source code in SVN, you can use the
<a class="external" rel="nofollow"
href="https://svn.apache.org/viewvc/uima";>
viewvc web interface</a> to Subversion. This is current at all times.
