[sling-site] branch master updated: SLING-7167 Adjust READMEs

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
     new b5bbc33  SLING-7167 Adjust READMEs
b5bbc33 is described below

commit b5bbc33b47a0a5651ca60fe5e53b172e661b9d38
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Mon Dec 18 12:48:21 2017 +0100

    SLING-7167 Adjust READMEs
---
 .../jbake/content/documentation/getting-started.md |  8 +++-
 src/main/jbake/content/documentation/karaf.md      | 44 ++++++++++++++++++++++
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/src/main/jbake/content/documentation/getting-started.md b/src/main/jbake/content/documentation/getting-started.md
index f00d2b1..10c6ed1 100644
--- a/src/main/jbake/content/documentation/getting-started.md
+++ b/src/main/jbake/content/documentation/getting-started.md
@@ -28,7 +28,7 @@ This will start the latest Apache Sling distribution and mount the Sling directo
 
 ## Sling Download
 
-The other option is to download the latest released Apache Sling standalone application from our
+Another option is to download the latest released Apache Sling standalone application from our
  [Downloads](/downloads.cgi) section. Once you have downloaded the application make sure that you have
  Java ${sling_minJavaVersion} or later installed and run Sling with:
  
@@ -37,7 +37,11 @@ The other option is to download the latest released Apache Sling standalone appl
 
 Starting the Sling application creates the Sling directory name *sling* in the same directory
  from where you started the above command.
- 
+
+## Sling Karaf
+
+You can run Sling on [Karaf](https://karaf.apache.org) as well by either starting a [Sling Karaf Distribution](karaf.html#sling-karaf-distribution) or installing [Sling's Karaf Features](karaf.html#sling-karaf-features) into a running Karaf Container.
+
 # Explore Sling
 
 Once Sling is started, you can access Sling at [http://localhost:8080](http://localhost:8080).
diff --git a/src/main/jbake/content/documentation/karaf.md b/src/main/jbake/content/documentation/karaf.md
new file mode 100644
index 0000000..cb0f73b
--- /dev/null
+++ b/src/main/jbake/content/documentation/karaf.md
@@ -0,0 +1,44 @@
+title=Running Apache Sling on Apache Karaf
+type=page
+status=published
+tags=karaf
+~~~~~~
+
+**NOTE:** Tested and built with Apache Karaf 4.2.0.M1
+
+
+## Sling Karaf Configs
+
+OSGi configurations for provisioning with Apache Karaf
+
+
+## Sling Karaf Features
+
+A features repository for easy deployment of [Apache Sling](https://sling.apache.org) on [Apache Karaf](https://karaf.apache.org) (see [Provisioning](https://karaf.apache.org/manual/latest/#_provisioning) for details)
+
+
+## Sling Karaf Distribution
+
+A [distribution](https://karaf.apache.org/manual/latest/#_custom_distributions) of [Apache Sling](https://sling.apache.org) based on [Apache Karaf](https://karaf.apache.org) (Sling's features and artifacts in a single archive)
+
+
+## Getting Started
+
+You have to set `serviceRequirements=disable` in Karaf's `etc/org.apache.karaf.features.cfg` (not necessary when using _Sling's Karaf Distribution_).
+
+1) [Start Apache Karaf](https://karaf.apache.org/manual/latest/#_quick_start) or _Sling's Karaf Distribution_.
+
+2) Add the Apache Sling features repository (not necessary when using _Sling's Karaf Distribution_):
+
+    karaf@root()> feature:repo-add mvn:org.apache.sling/org.apache.sling.karaf-features/0.1.1-SNAPSHOT/xml/features
+
+3) Install a `sling-launchpad-*` (`oak-tar` | `oak-mongo`) feature:
+
+    karaf@root()> feature:install sling-launchpad-oak-tar
+
+4) Install Launchpad content and Explorer:
+
+    karaf@root()> feature:install sling-launchpad-content
+    karaf@root()> feature:install sling-extension-explorer
+
+5) Browse to [http://localhost:8181/](http://localhost:8181/⁠).

-- 
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].