This is an automated email from the ASF dual-hosted git repository.
bdelacretaz 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 b0983fa SLING-9522 - tweak feature model how-to guides
b0983fa is described below
commit b0983faf7604b33c6e55fe9db9e6095b06adfcaa
Author: Bertrand Delacretaz <[email protected]>
AuthorDate: Thu Jun 18 13:43:35 2020 +0200
SLING-9522 - tweak feature model how-to guides
---
.../documentation/development/feature-model.md | 17 +++++++----
.../feature-model/feature-model-overview.md | 33 ----------------------
.../feature-model/howtos/create-sling-composite.md | 4 +--
.../feature-model/howtos/create-sling-fm.md | 2 +-
.../feature-model/howtos/kickstart.md | 6 ++--
.../howtos/sling-with-custom-project.md | 5 ++--
6 files changed, 20 insertions(+), 47 deletions(-)
diff --git a/src/main/jbake/content/documentation/development/feature-model.md
b/src/main/jbake/content/documentation/development/feature-model.md
index 822fdf1..7a186f3 100644
--- a/src/main/jbake/content/documentation/development/feature-model.md
+++ b/src/main/jbake/content/documentation/development/feature-model.md
@@ -10,14 +10,20 @@ Compared to the Provisioning Model, the Feature Model is
richer and more general
standard. It has been created in Sling as that's its primary audience for now,
but might move elsewhere as it
evolves.
-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.
+This page provides a high-level overview of the Feature Model.
-See the [Feature Model How-To
Guide](/documentation/feature-model/feature-model-overview.html) for practical
examples.
+See the [main sling-org-apache-sling-feature
repository](https://github.com/apache/sling-org-apache-sling-feature) for more
+technical information about the Feature Model.
+A [number of other
modules](https://github.com/search?q=topic%3Asling+topic%3Aosgi-feature-model+topic%3Aosgi+org%3Aapache&type=Repositories)
+provide additional functionality related to the Feature Model.
+
+The [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html) provides a
progressive tutorial
+and concrete examples.
### The Feature Model
-As said above the Feature Model is an *OSGi** version of the Sling
Provisioning Model.
+As said above the Feature Model is an *OSGi* version of the Sling Provisioning
Model, which at its core
+is independent from Sling.
OSGi bundles can be installed on an OSGi container but there is a much more to
it to install it onto
an application or create an application. The Feature Model provides these
additional parts necessary
@@ -43,7 +49,8 @@ which then can be aggregated into a bigger module or
application (like Sling).
### Feature Model Ecosystem
-The Feature Model Ecosystem is comprised of these parts:
+The [Feature Model
Ecosystem](https://github.com/search?q=topic%3Asling+topic%3Aosgi-feature-model+topic%3Aosgi+org%3Aapache&type=Repositories)
+is mostly comprised of the following parts:
* Feature Model (JSon file)
* Feature Model Maven Plugin (sling-slingfeature-maven-plugin)
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
deleted file mode 100644
index 3d4b748..0000000
---
a/src/main/jbake/content/documentation/feature-model/feature-model-overview.md
+++ /dev/null
@@ -1,33 +0,0 @@
-title=Feature Model How-To Guide
-type=page
-status=published
-tags=featuremodel,osgi,project,guide,howtos
-~~~~~~
-
-### About this How-To
-
-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.
-
-
-## Exploring Feature Models by Example
-
-* [How To Start Sling with the
Kickstarter](/documentation/feature-model/howtos/kickstart.html)
-* [How to Create a Custom Feature Model
Project](/documentation/feature-model/howtos/sling-with-custom-project.html)
-* [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)
-
-
-## Related Reading
-
-Want to know more? Take a look at the README files for the projects in the
Feature Model ecosystem.
-
-* [Feature
Model](https://github.com/apache/sling-org-apache-sling-feature/blob/master/readme.md)
-* [Feature
Docs](https://github.com/apache/sling-org-apache-sling-feature/blob/master/docs/features.md)
-* [Feature
Extensions](https://github.com/apache/sling-org-apache-sling-feature/blob/master/docs/extensions.md)
-* [Feature
Archive](https://github.com/apache/sling-org-apache-sling-feature/blob/master/docs/feature-archives.md)
-* [Feature
References](https://github.com/apache/sling-org-apache-sling-feature/blob/master/docs/feature-ref-files.md)
-* [Feature
Aggregation](https://github.com/apache/sling-org-apache-sling-feature/blob/master/docs/aggregation.md)
-* [SlingFeature Maven
Plugin](https://github.com/apache/sling-slingfeature-maven-plugin)
-* [Feature
Launcher](https://github.com/apache/sling-org-apache-sling-feature-launcher)
-*
[Kickstarter](https://github.com/apache/sling-org-apache-sling-kickstart/blob/master/Readme.md)
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 51056d4..4378388 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,4 +1,4 @@
-title=How to Create a Composite NodeStore
+title=How to Create a Composite NodeStore with the Feature Model
type=page
status=published
tags=featuremodel,sling,kickstarter
@@ -22,7 +22,7 @@ tags=featuremodel,sling,kickstarter
</div>
* Back To: [How to Create a Custom Feature Model
Project](/documentation/feature-model/howtos/sling-with-custom-project.html)
-* Back Home: [Feature
Model](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
### Prerequisites
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 b5f9a3b..c95d9fa 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
@@ -22,7 +22,7 @@ tags=featuremodel,sling,kickstarter
</div>
* Back To: [How to Create a Composite
NodeStore](/documentation/feature-model/howtos/create-sling-composite.html)
-* Back Home: [Feature
Model](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
### Prerequisites
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 e4b1602..b2a3a41 100644
--- a/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md
+++ b/src/main/jbake/content/documentation/feature-model/howtos/kickstart.md
@@ -20,7 +20,7 @@ tags=featuremodel,sling,kickstarter
</div>
-Back To: [Feature Model
Home](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
### Prerequisites
@@ -148,7 +148,7 @@ and keep reading.
<div style="background: #cde0ea; padding: 14px; border-left: 10px solid
#f9bb00; margin-bottom: 1em;">
* Next Up: [How to Create a Custom Feature Model
Project](/documentation/feature-model/howtos/sling-with-custom-project.html)
-* Back To: [Feature Model
Home](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
</div>
@@ -215,6 +215,6 @@ your favorite editor.
<div style="background: #cde0ea; padding: 14px; border-left: 10px solid
#f9bb00; margin-bottom: 1em;">
* Next Up: [How to Create a Custom Feature Model
Project](/documentation/feature-model/howtos/sling-with-custom-project.html)
-* Back To: [Feature Model
Home](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
</div>
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 e74e101..99602bd 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
@@ -23,8 +23,7 @@ tags=featuremodel,sling, kickstarter
</div>
* Back To: [How to Start Sling with the
Kickstarter](/documentation/feature-model/howtos/kickstart.html)
-* Back Home: [Feature
Model](/documentation/feature-model/feature-model-overview.html)
-
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
### Prerequisites
@@ -210,6 +209,6 @@ it with the Feature Model.
<div style="background: #cde0ea; padding: 14px; border-left: 10px solid
#f9bb00; margin-bottom: 1em;">
* Next Up: [How to Create a Sling Composite Node
Store](/documentation/feature-model/howtos/create-sling-composite.html)
-* Back To: [Feature Model
Home](/documentation/feature-model/feature-model-overview.html)
+* Back to the: [Feature Model How-To
Guide](/documentation/feature-model/feature-model-howto.html)
</div>
