SLING-9522 - Updated tags to use featuremodel; Removed Feature Model Launcher how-to (not ready); Added reference to how-to on main page ; Removed duplicate content on how-to landing page; corrected typos.
diff --git a/src/main/jbake/content/documentation/development/feature-model.md b/src/main/jbake/content/documentation/development/feature-model.md
index b0492b9..822fdf1 100644
--- a/src/main/jbake/content/documentation/development/feature-model.md
+++ b/src/main/jbake/content/documentation/development/feature-model.md
@@ -13,6 +13,8 @@
See [https://github.com/apache/sling-org-apache-sling-feature](https://github.com/apache/sling-org-apache-sling-feature) for more information
about the Feature Model.
+See the [Feature Model How-To Guide](/documentation/feature-model/feature-model-overview.html) for practical examples.
+
### The Feature Model
As said above the Feature Model is an *OSGi** version of the Sling Provisioning Model.
diff --git a/src/main/jbake/content/documentation/feature-model/feature-model-overview.md b/src/main/jbake/content/documentation/feature-model/feature-model-overview.md
index 1161abf..3d4b748 100644
--- a/src/main/jbake/content/documentation/feature-model/feature-model-overview.md
+++ b/src/main/jbake/content/documentation/feature-model/feature-model-overview.md
@@ -1,32 +1,13 @@
-title=Feature Model
+title=Feature Model How-To Guide
type=page
status=published
-tags=feature model,osgi,project,guide,howtos
+tags=featuremodel,osgi,project,guide,howtos
~~~~~~
-## A How-To Guide to Feature Models
-
-The Sling Feature Model provides a new approach for assembling applications and is intended to replace the Sling Provisioning Model.
-Both approaches accomplish the same goal of defining and assembling OSGi-based applications, however, the Feature Model
-is more robust and is not coupled to Sling. It addresses application packaging concerns by allowing all aspects of an application
-(e.g., bundles, configuration, framework properties, capabilities, requirements and custom artifacts) to be defined declaratively.
-
-### Key Concepts
-
-* Features - Central entity of the Feature Model used to logically group metadata, configuration, bundles and
- extensions to represent a system module or subsystem.
-* Feature Extension - An extension point for adding new capabilities to the Feature Model.
-* Feature Archives - Packages one or more features and dependencies to simplify the distribution of an application.
-* Feature Reference Files - A text descriptor file with a list of features.
-* Feature Aggregation - A method for packaging multiple features into a single feature.
-
### About this How-To
-<div style="background: #cde0ea; padding: 14px; border-left: 10px solid #f9bb00;">
-
This how-to is designed to be a progressive tutorial in which each how-to builds on the previous. It's recommended
that you start on the first and work your way through them consecutively.
-</div>
## Exploring Feature Models by Example
@@ -36,7 +17,8 @@
* [How to Create a Sling Composite Node Store](/documentation/feature-model/howtos/create-sling-composite.html)
* [How to Convert a Provisioning Model to a Feature Model](/documentation/feature-model/howtos/create-sling-fm.html)
-## Advanced Reading
+
+## Related Reading
Want to know more? Take a look at the README files for the projects in the Feature Model ecosystem.
diff --git a/src/main/jbake/content/documentation/feature-model/howtos/create-sling-composite.md b/src/main/jbake/content/documentation/feature-model/howtos/create-sling-composite.md
index e323332..51056d4 100644
--- a/src/main/jbake/content/documentation/feature-model/howtos/create-sling-composite.md
+++ b/src/main/jbake/content/documentation/feature-model/howtos/create-sling-composite.md
@@ -1,7 +1,7 @@
title=How to Create a Composite NodeStore
type=page
status=published
-tags=feature model,sling,kickstarter
+tags=featuremodel,sling,kickstarter
~~~~~~
### About this How-To
@@ -86,7 +86,7 @@
<div style="background: #fff3cd; padding: 14px; border-left: 10px solid #ffeeba;">
-**TODO:** Update instructions to use the binary release.
+**Note:** These instructions will be updated to use the binary release once an official Sling Feature Model JSON file is released.
</div>
@@ -162,7 +162,7 @@
< HTTP/1.1 500 Server Error
...
-You should now receive an _HTTP 500 error_ response. So, even as the admin user, you can't write to the `/apps` section of the repository.
+You should now receive an _HTTP 500 error_ response. So, even as the admin user you can't write to the `/apps` section of the repository.
## Mission Accomplished
diff --git a/src/main/jbake/content/documentation/feature-model/howtos/create-sling-fm.md b/src/main/jbake/content/documentation/feature-model/howtos/create-sling-fm.md
index 523c557..b5f9a3b 100644
--- a/src/main/jbake/content/documentation/feature-model/howtos/create-sling-fm.md
+++ b/src/main/jbake/content/documentation/feature-model/howtos/create-sling-fm.md
@@ -1,7 +1,7 @@
title=How to Convert a Provisioning Model to a Feature Model
type=page
status=published
-tags=feature model,sling,kickstarter
+tags=featuremodel,sling,kickstarter
~~~~~~
### About this How-To
diff --git a/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md b/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md
index 29851ff..e4b1602 100644
--- a/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md
+++ b/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md
@@ -1,7 +1,7 @@
title=How to Start Sling with the Kickstarter
type=page
status=published
-tags=feature model,sling,kickstarter
+tags=featuremodel,sling,kickstarter
~~~~~~
### About this How-To
diff --git a/src/main/jbake/content/documentation/feature-model/howtos/sling-with-custom-project.md b/src/main/jbake/content/documentation/feature-model/howtos/sling-with-custom-project.md
index b1c4c6d..e74e101 100644
--- a/src/main/jbake/content/documentation/feature-model/howtos/sling-with-custom-project.md
+++ b/src/main/jbake/content/documentation/feature-model/howtos/sling-with-custom-project.md
@@ -1,7 +1,7 @@
title=How to Create a Custom Feature Model Project
type=page
status=published
-tags=feature model,sling, kickstarter
+tags=featuremodel,sling, kickstarter
~~~~~~
### About this How-To
diff --git a/src/main/jbake/content/documentation/feature-model/howtos/start-sling-feature-launcher.md b/src/main/jbake/content/documentation/feature-model/howtos/start-sling-feature-launcher.md
deleted file mode 100644
index c833c84..0000000
--- a/src/main/jbake/content/documentation/feature-model/howtos/start-sling-feature-launcher.md
+++ /dev/null
@@ -1,155 +0,0 @@
-title=Start Sling Feature Model with Feature Launcher
-type=page
-status=published
-tags=feature model,sling,feature launcher
-~~~~~~
-
-### How-To Overview
-
-<div style="background: lightblue;">
-
-* What will you learn:
- * We are starting up Apache Sling with the Feature Launcher directly
-
-* Time: 15 minutes
-* Skill Level: Beginner
-* Environment: Windows/Unix
-</div>
-
-* Back To: [Feature Model Home](/documentation/feature-model/feature-model-overview.html)
-
-### Prerequisites
-
-In order to follow through this HowTo you need the following on your computer:
-
-* Java 8
-* Command Line with Bash
-
-### What is the Feature Launcher
-
-The [Feature Launcher](https://github.com/apache/sling-org-apache-sling-feature-launcher) is
-taking a Feature Model, resolves all the dependencies and launches the Feature Model ontop
-of an OSGi container.
-Some of the Feature Models are handled by extensions which have to be provided to the Feature
-Launcher at startup time.
-
-### Explanation on what will happen
-
-### Step 1: Obtain the Feature Launcher
-
-First we create the project folder:
-
- $ cd <project root folder>
- $ mkdir sling-feature-launcher
- $ cd sling-feature-launcher
- $ curl https://repository.apache.org/content/groups/public/org/apache/sling/org.apache.sling.feature.launcher/1.1.4/org.apache.sling.feature.launcher-1.1.4.jar \
- org.apache.sling.feature.launcher-1.1.4.jar
-
-
-### Step 2: Optional: Obtain Extensions
-
-Extension are optional pieces that can added to the Feature Launcher to handle additional media like here
-the Content Extension.
-
-Going to the [Sling Folder](https://repository.apache.org/content/groups/public/org/apache/sling/)
-you can select the desired extension.
-In this Howto we are going to use the Content Extension:
-
- $ cd <project root folder>
- $ cd sling-feature-launcher
- $ curl https://repository.apache.org/content/groups/public/org/apache/sling/org.apache.sling.feature.extension.content/1.0.6//org.apache.sling.feature.extension.content-1.0.6.jar \
- org.apache.sling.feature.extension.content-1.0.6.jar
-
-
-### Step 3: Obtain the Sling Feature Model
-
-The Sling Feature Model can be taken from the [Sling Kickstart](https://github.com/apache/sling-org-apache-sling-kickstart#build)
-project. Just got the folder /src/main/resources in the GitHub project page and then download the
-[feature-sling12.json](https://github.com/apache/sling-org-apache-sling-kickstart/blob/master/src/main/resources/feature-sling12.json)
-file.
-
-### Step 5: Create Custom Log Settings
-
-This step will create a Configuration Feature Model so that we can adjust the Log settings of Sling's
-main log (error.log).
-**Note**: this can be applied to any configuration inside the Sling12 Feature Model file.
-
-Create a Configuration Feature Model file:
-1. Create a file called **feature-config-sling12.json** (name does not matter)
-2. Add the content from below
-3. Save it
-
-Feature Model Config file:
-
- {
- "id":"org.apache.sling:config.local:slingosgifeature:sling12-config:0.0.1-SNAPSHOT",
- "configurations": {
- "org.apache.sling.commons.log.LogManager": {
- "org.apache.sling.commons.log.level":"debug",
- "org.apache.sling.commons.log.file":"logs/test2.log"
- }
- }
- }
-
-**Note**: this will only have the properties that we want to change. To remove a property from the
-Sling Feature Model then add the entire configuration (copy it from the Sling Feature Model file)
-and then use the option **USE_FIRST** instead of **MERGE_FIRST** in the **-CC** option.
-
-### Step 4: Launch Sling
-
-Execute
-
- java \
- -Dorg.osgi.service.http.port=8170 \
- -Dorg.apache.felix.http.host=localhost \
- -cp org.apache.sling.feature.extension.content-1.0.6.jar
- -jar org.apache.sling.feature.launcher-1.1.4.jar \
- -f feature-config-sling12.json \
- -f feature-sling12.json \
- -CC "org.apache.sling.commons.log.LogManager=MERGE_FIRST" \
- -c artifacts
-
-
-This will bring up Sling on port 8170 just fine with the adjusted Sling logging.
-
-
-
-Adjusted Logging:
-
-
-
-## Mission Accomplished
-
-* Next Up: [Custom Feature Project with Sling](/documentation/feature-model/howtos/sling-with-custom-project.html)
-* Back To: [Feature Model Home](/documentation/feature-model/feature-model-overview.html)
-
-## Addendum
-
-### Configuration Class Overrides
-
-The [Feature Launcher](https://github.com/apache/sling-org-apache-sling-feature-launcher) requires
-the user to define Configuration Class Overrides if provided Feature Models' Configuration contain
-conflicting configurations.
-The caller must provide it with the **-CC** option with a key-value pair separted by an
-equal sign. These are examples:
-
-* Merge Log Manager and take the first configuration:
- * org.apache.sling.commons.log.LogManager=MERGE_FIRST
-* Merge any configuration under 'org.apache.sling.commons.log' and take the last
- * org.apache.sling.commons.log.*=MERGE_LATEST
-* Take the first configuration of any file
- * *=USE_FIRST
-
-These are the available actions:
-
-* PROPERTY_CLASH: if conflicting then fail
-* USE_FIRST: use first provided configuration
-* USE_LATEST: use the last configuration
-* MERGE_FIRST: merge first provided configuration (whatever is not provided is taken from the later)
-* MERGE_LATEST: merge last provided configuration (whatever is not provided is taken from the former)
-
-These are the available configuration pattern:
-
-* fully qualified path: applies on to the configuration with that path
-* prefix ending in a *: applies to all configurations with the given prefix
-* *: all configurations
