This is an automated email from the ASF dual-hosted git repository.

bdelacretaz pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/asf-site by this push:
     new 84cef52  Small addition to contentloader docs
84cef52 is described below

commit 84cef529d309cabefe9d85f433b16d14e75f2c17
Author: Bertrand Delacretaz <[email protected]>
AuthorDate: Tue Dec 19 14:24:04 2017 +0100

    Small addition to contentloader docs
---
 documentation/bundles/content-loading-jcr-contentloader.html | 3 ++-
 documentation/development/slingstart.html                    | 9 ++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/documentation/bundles/content-loading-jcr-contentloader.html 
b/documentation/bundles/content-loading-jcr-contentloader.html
index fed60af..31c0003 100644
--- a/documentation/bundles/content-loading-jcr-contentloader.html
+++ b/documentation/bundles/content-loading-jcr-contentloader.html
@@ -390,6 +390,7 @@ Support for re-registration of node types is relatively 
limited. In Jackrabbit,
 <p>The initial content found in the <a 
href="https://github.com/apache/sling-org-apache-sling-launchpad-content/tree/master/src/main/resources/content/sling-test";>sling-test
 folder of the launchpad initial content</a> is verified by the <a 
href="https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests/blob/master/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java";>InitialContentTest</a>
 when running the <em>launchpad testing</em> i [...]
 <p>Those tests can be used as verified examples of initial content loading. 
Contributions are welcome to improve the coverage of those tests.</p>
 <h2><a href="#acls-and-principals" name="acls-and-principals">ACLs and 
Principals</a></h2>
+<p><strong>Note:</strong> Creating system users is not supported by 
contentloader, you should use repoinit instead. Repoinit also allows to set 
ACLs. See <a 
href="repository-initialization.html">SlingRepositoryInitializer</a> for more 
information.</p>
 <p>By adding a <code>security:acl</code> object to a content node definition 
in JSON you can define an ACL for this node. For each array entry in this 
example an ACE is added. Example:</p>
 <pre><code>{
     &quot;security:acl&quot;: [
@@ -415,7 +416,7 @@ Support for re-registration of node types is relatively 
limited. In Jackrabbit,
 }
 </code></pre></section></div></div>            
             <div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Robert 
Munteanu</span> on <span class="comment">Wed Nov 22 22:30:38 2017 
+0200</span></div>                <p>
+<div class="revisionInfo">Last modified by <span class="author">Andres 
Bott</span> on <span class="comment">Sun Dec 10 14:48:06 2017 
+0100</span></div>                <p>
                     Apache Sling, Sling, Apache, the Apache feather logo, and 
the Apache Sling project logo are trademarks of The Apache Software Foundation. 
All other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
                 </p><p>
                     Copyright © 2011-2017 The Apache Software Foundation.
diff --git a/documentation/development/slingstart.html 
b/documentation/development/slingstart.html
index d4004fa..afc003b 100644
--- a/documentation/development/slingstart.html
+++ b/documentation/development/slingstart.html
@@ -261,8 +261,11 @@ stringsimple ::= &lt;quoted string representation of the 
value&gt; (see below)
   <li>Remove the "special artifact"</li>
   <li>Remove the "another one"</li>
 </ul>
-<p>The changing model would mention the above as one artifact and in addition 
have:  [artifacts startLevel=5]  commons/library/1.1.0</p>
-<pre><code>[artifacts runModes=:remove]
+<p>The changing model would mention the above as one artifact and in addition 
have:</p>
+<pre><code>[artifacts startLevel=5]
+    commons/library/1.1.0
+
+[artifacts runModes=:remove]
     my/special/artifact/0.0.0
 
 [artifacts runModes=:remove,test]
@@ -416,7 +419,7 @@ stringsimple ::= &lt;quoted string representation of the 
value&gt; (see below)
 &lt;/plugin&gt;
 </code></pre></section></div></div>            
             <div class="footer">
-<div class="revisionInfo">Last modified by <span class="author">Bertrand 
Delacretaz</span> on <span class="comment">Fri Sep 29 15:57:01 2017 
+0200</span></div>                <p>
+<div class="revisionInfo">Last modified by <span class="author">Konrad 
Windszus</span> on <span class="comment">Tue Dec 19 13:40:20 2017 
+0100</span></div>                <p>
                     Apache Sling, Sling, Apache, the Apache feather logo, and 
the Apache Sling project logo are trademarks of The Apache Software Foundation. 
All other marks mentioned may be trademarks or registered trademarks of their 
respective owners.
                 </p><p>
                     Copyright © 2011-2017 The Apache Software Foundation.

-- 
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].

Reply via email to