This is an automated email from the ASF dual-hosted git repository.
simonetripodi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git
The following commit(s) were added to refs/heads/master by this push:
new a408bd3 [cp2fm] updating README
new 6ef573c Merge branch 'master' of github.com:apache/sling-whiteboard
a408bd3 is described below
commit a408bd375e7a7dd4f7d7fee82625cfe9590f015f
Author: Simo Tripodi <[email protected]>
AuthorDate: Thu Mar 21 14:13:29 2019 +0100
[cp2fm] updating README
---
content-package-2-feature-model/README.md | 4 +++-
content-package-2-feature-model/src/main/assembly/README.md | 1 -
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/content-package-2-feature-model/README.md
b/content-package-2-feature-model/README.md
index 09c8394..7b7419e 100644
--- a/content-package-2-feature-model/README.md
+++ b/content-package-2-feature-model/README.md
@@ -232,13 +232,15 @@ _Apache Maven GAVs_ are extracted from nested bundles
metadata and are renamed a
### Supported configurations
-All generally adopted OSGi configuration formats are supported:
+All OSGi configuration formats are supported:
* _Property_ files, which extensions are `.properties` or `.cfg`, see the
related
[documentation](https://sling.apache.org/documentation/bundles/configuration-installer-factory.html#property-files-cfg);
* Configuration Files, which extension is `.config`, see the related
[documentation](https://sling.apache.org/documentation/bundles/configuration-installer-factory.html#configuration-files-config);
* JSON format, which extension is `.cfg.json`, see the related
[documentation](https://blog.osgi.org/2018/06/osgi-r7-highlights-configuration-admin.html)
* `sling:OsgiConfig` content nodes, typically `.xml` files.
+During the conversion process, all these formats will be parsed and then added
in the `configuration` section of the _Sling Feature Model_ file.
+
### Run Modes
As shown above, run modes in the path lead the tool to create a dedicated
_Apache Sling Feature_ model file containing all interested OSGi
configurations/bundles.
diff --git a/content-package-2-feature-model/src/main/assembly/README.md
b/content-package-2-feature-model/src/main/assembly/README.md
index 80ef318..4f743d5 100644
--- a/content-package-2-feature-model/src/main/assembly/README.md
+++ b/content-package-2-feature-model/src/main/assembly/README.md
@@ -147,4 +147,3 @@ then execute the command
```
$ ./bin/cp2sf @arfile
````
-
