Repository: sling-site Updated Branches: refs/heads/asf-site a71c1740a -> 68be167ed
Push Carsten's new variables to verify that it all works fine Project: http://git-wip-us.apache.org/repos/asf/sling-site/repo Commit: http://git-wip-us.apache.org/repos/asf/sling-site/commit/68be167e Tree: http://git-wip-us.apache.org/repos/asf/sling-site/tree/68be167e Diff: http://git-wip-us.apache.org/repos/asf/sling-site/diff/68be167e Branch: refs/heads/asf-site Commit: 68be167ed74a8d7e315b2f2a858016e4ec7b1c7f Parents: a71c174 Author: Bertrand Delacretaz <[email protected]> Authored: Wed Oct 4 11:17:22 2017 +0200 Committer: Bertrand Delacretaz <[email protected]> Committed: Wed Oct 4 11:17:22 2017 +0200 ---------------------------------------------------------------------- documentation/getting-started.html | 6 +++--- index.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sling-site/blob/68be167e/documentation/getting-started.html ---------------------------------------------------------------------- diff --git a/documentation/getting-started.html b/documentation/getting-started.html index 05138ab..fd9e8ce 100644 --- a/documentation/getting-started.html +++ b/documentation/getting-started.html @@ -84,8 +84,8 @@ </code></pre> <p>This will start the latest Apache Sling distribution and mount the Sling directory to <em>/tmp/sling</em> on your machine. Make sure that your docker configuration allows this or change to a different directory.</p> <h2><a href="#sling-download" name="sling-download">Sling Download</a></h2> -<p>The other option is to download the latest released Apache Sling standalone application from our <a href="/downloads.cgi">Downloads</a> section. Once you have downloaded the application make sure that you have Java 8 or later installed and run Sling with (replace the N with the latest version number before executing the command):</p> -<pre><code>java -jar org.apache.sling.launchpad-N.jar +<p>The other option is to download the latest released Apache Sling standalone application from our <a href="/downloads.cgi">Downloads</a> section. Once you have downloaded the application make sure that you have Java 8 or later installed and run Sling with:</p> +<pre><code>java -jar org.apache.sling.launchpad-9.jar </code></pre> <p>Starting the Sling application creates the Sling directory name <em>sling</em> in the same directory from where you started the above command.</p> <h1><a href="#explore-sling" name="explore-sling">Explore Sling</a></h1> @@ -105,7 +105,7 @@ <li><a href="/documentation/the-sling-engine/authentication.html">Authentication</a></li> <li><a href="/documentation/bundles/apache-sling-eventing-and-job-handling.html">Eventing and Jobs</a></li> </ul></section></div></div> -<div class="revisionInfo">Last modified by <span class="author">Carsten Ziegeler</span> on <a href="https://github.com/apache/sling-site/commit/6e27ef2">Mon Oct 2 09:03:55 2017 +0200</a> : <span class="comment">Update docker command and add simple info about log directory +<div class="revisionInfo">Last modified by <span class="author">Carsten Ziegeler</span> on <a href="https://github.com/apache/sling-site/commit/675d732">Wed Oct 4 09:50:05 2017 +0200</a> : <span class="comment">Add variables for min java version, min maven version and release version </span></div> <div class="footer"> <div class="trademarkFooter"> http://git-wip-us.apache.org/repos/asf/sling-site/blob/68be167e/index.html ---------------------------------------------------------------------- diff --git a/index.html b/index.html index eb4413f..b8b37e9 100644 --- a/index.html +++ b/index.html @@ -127,7 +127,7 @@ }); }); </script></section></div></div> -<div class="revisionInfo">Last modified by <span class="author">Carsten Ziegeler</span> on <a href="https://github.com/apache/sling-site/commit/b096b4a">Fri Sep 29 16:17:59 2017 +0200</a> : <span class="comment">Update getting started by adding a section about docker and downloading Sling +<div class="revisionInfo">Last modified by <span class="author">Bertrand Delacretaz</span> on <a href="https://github.com/apache/sling-site/commit/dbae75c">Tue Oct 3 13:01:59 2017 +0200</a> : <span class="comment">Add basic expandVariables support - no changes unless that option is set in the page front matter, to avoid conflicts with existing content </span></div> <div class="footer"> <div class="trademarkFooter">
