svn commit: r1036396 - in /websites/staging/jena/trunk/content: ./ documentation/tdb/commands.html documentation/tools/index.html

[bu...@apache.org]

Author: buildbot
Date: Fri Oct 19 11:30:34 2018
New Revision: 1036396

Log:
Staging update by buildbot for jena

Modified:
    websites/staging/jena/trunk/content/   (props changed)
    websites/staging/jena/trunk/content/documentation/tdb/commands.html
    websites/staging/jena/trunk/content/documentation/tools/index.html

Propchange: websites/staging/jena/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct 19 11:30:34 2018
@@ -1 +1 @@
-1844328
+1844329

Modified: websites/staging/jena/trunk/content/documentation/tdb/commands.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tdb/commands.html (original)
+++ websites/staging/jena/trunk/content/documentation/tdb/commands.html Fri Oct 19 11:30:34 2018
@@ -185,8 +185,8 @@ h2:hover > .headerlink, h3:hover > .head
 <h2 id="installation">Installation<a class="headerlink" href="#installation" title="Permanent link">&para;</a></h2>
 <p>From Apache Jena version <code>2.7.x</code> onwards, TDB is now installed as part of a single integrated Jena
 package. There is no longer a need to install a separate TDB package to run the TDB command line
-tools, or to use TDB in your Java programs. See the <a href="/download/index.cgi">downloads</a> page for details on getting the latest Jena
-release.</p>
+tools, or to use TDB in your Java programs. See the <a href="/download/index.cgi">downloads</a> page
+for details on getting the latest Jena release.</p>
 <h2 id="scripts">Scripts<a class="headerlink" href="#scripts" title="Permanent link">&para;</a></h2>
 <p>From the location The directory <code>bin/</code> contains shell scripts to run the commands
 from the command line. The scripts are bash scripts which should work
@@ -194,36 +194,9 @@ on Linux systems, Windows systems using
 Mac/OS systems. The directory <code>bat/</code> contains Windows batch files which
 provide the same functionality for Windows systems that are not using
 Cygwin.</p>
-<h3 id="script-set-up-bash-scripts">Script set up - bash scripts<a class="headerlink" href="#script-set-up-bash-scripts" title="Permanent link">&para;</a></h3>
-<p>Set the environment variable <code>JENAROOT</code> to the root of the Jena
-installation. E.g:</p>
-<div class="codehilite"><pre><span class="n">export</span> <span class="n">JENAROOT</span><span class="p">=</span><span class="o">/</span><span class="n">home</span><span class="o">/</span><span class="n">somebody</span><span class="o">/</span><span class="n">dev</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">jena</span>
-</pre></div>
-
-
-<p>or</p>
-<div class="codehilite"><pre><span class="n">export</span> <span class="n">JENAROOT</span><span class="p">=</span><span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">apache</span><span class="o">-</span><span class="n">jena</span>
-</pre></div>
-
-
-<p>Then set the <code>PATH</code> to include the <code>bin</code> directory:</p>
-<div class="codehilite"><pre><span class="n">PATH</span><span class="p">=</span>$<span class="n">JENAROOT</span><span class="o">/</span><span class="n">bin</span><span class="p">:</span>$<span class="n">PATH</span>
-</pre></div>
-
-
-<p>This can be done in <code>.bashrc</code>, or its equivalent on Mac OS/X, to ensure that the environment
-variables are always available.</p>
-<h3 id="script-set-up-windows-batch-files">Script set up - Windows batch files<a class="headerlink" href="#script-set-up-windows-batch-files" title="Permanent link">&para;</a></h3>
-<p>Setting environment variables in Windows is slightly involved. You can set them
-each time you start a command prompt:</p>
-<div class="codehilite"><pre><span class="n">SET</span> <span class="n">JENAROOT</span><span class="p">=</span><span class="o">\</span><span class="n">Users</span><span class="o">\</span><span class="n">somebody</span><span class="o">\</span><span class="n">dev</span><span class="o">\</span><span class="n">apache</span><span class="o">-</span><span class="n">jena</span>
-<span class="n">SET</span> <span class="n">PATH</span><span class="p">=</span><span class="c">%PATH%;%JENAROOT%\bin</span>
-</pre></div>
-
-
-<p>or you can follow <a href="http://searchsystemschannel.techtarget.com/feature/Setting-Windows-7-environment-variables">this guide</a>
-or one like it to set the environment variables so that they are available every
-time you launch the command prompt.</p>
+<h3 id="script-set-up">Script set up<a class="headerlink" href="#script-set-up" title="Permanent link">&para;</a></h3>
+<p>The TDB tools are included in the jena toolset. See the 
+<a href="../tools/">command line tools page</a>.</p>
 <h2 id="command-line-script-arguments">Command line script arguments<a class="headerlink" href="#command-line-script-arguments" title="Permanent link">&para;</a></h2>
 <p>Each command then has command-specific arguments described below.</p>
 <p>All commands support <code>--help</code> to give details of named and

Modified: websites/staging/jena/trunk/content/documentation/tools/index.html
==============================================================================
--- websites/staging/jena/trunk/content/documentation/tools/index.html (original)
+++ websites/staging/jena/trunk/content/documentation/tools/index.html Fri Oct 19 11:30:34 2018
@@ -192,7 +192,7 @@ a variety of tasks in developing Jena-ba
 <p>This command will simply print the versions of Jena and ARQ used in your distribution, all the tools support the <code>--version</code> option.  To find out how to use a specific tool add the <code>--help</code> flag instead.</p>
 <p>Note that many examples of using Jena tools typically use the Linux style invocation because most of the Jena developers work on Linux/Mac platforms.  When running on windows simply add <code>.bat</code> as an extension to the name of the command line tool to run it, on some versions of Windows this may not be required.</p>
 <h3 id="common-issues-with-running-the-tools">Common Issues with Running the Tools<a class="headerlink" href="#common-issues-with-running-the-tools" title="Permanent link">&para;</a></h3>
-<p>If you receive errors stating that a class is not found then it is most likely that <code>JENAROOT</code> is not set correctly.  As a quick sanity check you can try the following to see if it is set appropriately:</p>
+<p>If you receive errors stating that a class is not found then it is most likely that <code>JENA_HOME</code> is not set correctly.  As a quick sanity check you can try the following to see if it is set appropriately:</p>
 <p><strong>On Linux / Mac</strong></p>
 <ul>
 <li><code>cd $JENA_HOME</code></li>
@@ -201,8 +201,8 @@ a variety of tasks in developing Jena-ba
 <ul>
 <li><code>cd %JENA_HOME%</code></li>
 </ul>
-<p>If this command fails then <code>JENAROOT</code> is not correctly set, please ensure you have set it correctly and try again.</p>
-<p>Windows users may experience problems if trying to run the tools when their <code>JENAROOT</code> path contains spaces in it, there are two workarounds for this:</p>
+<p>If this command fails then <code>JENA_HOME</code> is not correctly set, please ensure you have set it correctly and try again.</p>
+<p>Windows users may experience problems if trying to run the tools when their <code>JENA_HOME</code> path contains spaces in it, there are two workarounds for this:</p>
 <ol>
 <li>Move your Jena install to a path without spaces</li>
 <li>Grab the latest scripts from <a href="https://github.com/apache/jena/tree/master/apache-jena/bat/">master</a> where they have been fixed to safely handle this.  Future releases will include this fix and resolve this issue</li>