[sling-site] 01/03: Add Feature Model page

[bd...@apache.org]

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

commit f09e2c26fba7454397ac881ef7c7c0d8d48e11c4
Author: Bertrand Delacretaz <bd...@apache.org>
AuthorDate: Wed May 9 15:15:57 2018 +0200

    Add Feature Model page
---
 .../content/documentation/development/feature-model.md     | 14 ++++++++++++++
 .../jbake/content/documentation/development/slingstart.md  |  6 ++++++
 2 files changed, 20 insertions(+)

diff --git a/src/main/jbake/content/documentation/development/feature-model.md b/src/main/jbake/content/documentation/development/feature-model.md
new file mode 100644
index 0000000..6f99012
--- /dev/null
+++ b/src/main/jbake/content/documentation/development/feature-model.md
@@ -0,0 +1,14 @@
+title=The OSGi Feature Model
+type=page
+status=published
+tags=slingstart,maven,launchers,featuremodel
+~~~~~~
+
+The OSGi Feature Model, created in 2018, is meant to replace the Sling Provisioning Model as the primary way of defining and assembling Sling applications.
+
+Compared to the Provisioning Model, the Feature Model is richer and more general, and might evolve into an OSGi
+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.
\ No newline at end of file
diff --git a/src/main/jbake/content/documentation/development/slingstart.md b/src/main/jbake/content/documentation/development/slingstart.md
index d80d28f..dca3858 100644
--- a/src/main/jbake/content/documentation/development/slingstart.md
+++ b/src/main/jbake/content/documentation/development/slingstart.md
@@ -6,6 +6,12 @@ tags=slingstart,maven,launchers
 
 [TOC]
 
+<div class="note">
+    The <a href="/documentation/development/feature-model.html">OSGi Feature Model</a> is
+    meant to eventually replace the Sling Provisioning Model. If you are starting a new Sling project, please ask on
+    the Sling developers list about the status of the Feature Model to figure out which is best suited to your needs.
+</div>
+
 The Apache Sling provisioning model is a model to describe OSGi based application. It can also be used to define a partial application aka feature (or subsystem in OSGi terms).
 
 The model is describing an instance, it is not directly related to any particular tooling or packaging/provisioning vehicle.

-- 
To stop receiving notification emails like this one, please contact
bdelacretaz@apache.org.