This is an automated email from the ASF dual-hosted git repository.
kwin 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 ec3c2b7 SLING-7768 distinguish between System Properties and
Environment Variables
ec3c2b7 is described below
commit ec3c2b78e7427f088ce42fbc376ddc60d03c27f8
Author: Konrad Windszus <[email protected]>
AuthorDate: Wed Nov 11 19:55:39 2020 +0100
SLING-7768 distinguish between System Properties and Environment
Variables
---
.../the-sling-engine/mappings-for-resource-resolution.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/src/main/jbake/content/documentation/the-sling-engine/mappings-for-resource-resolution.md
b/src/main/jbake/content/documentation/the-sling-engine/mappings-for-resource-resolution.md
index d84dd34..684eeed 100644
---
a/src/main/jbake/content/documentation/the-sling-engine/mappings-for-resource-resolution.md
+++
b/src/main/jbake/content/documentation/the-sling-engine/mappings-for-resource-resolution.md
@@ -187,9 +187,9 @@ The placeholders have this format:
**$['type':'name';default='default value']**.
The type can be:
- * **env**: take from the System Properties
- * **prop**: taken from the Bundle Context Properties
- * otherwise: taken from the String Interpolation Configuration
+ * **env**: taken from the [Environment
Variables](https://docs.oracle.com/javase/8/docs/api/java/lang/System.html#getenv-java.lang.String-)
+ * **prop**: taken from the [Bundle Context
Properties](https://docs.osgi.org/javadoc/r6/core/org/osgi/framework/BundleContext.html#getProperty(java.lang.String))
(first evaluates OSGi Framework Properties, then System Properties)
+ * **config**: taken from the String Interpolation Configuration
With this it is possible to create a single set of `/etc/map` definitions and
then adjust the actual values of an instance by an OSGi configuration.
