Bug 147463 - [CheatSheet] Content markup schema problems

2 files changed, 12 insertions, 5 deletions

diff --git a/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd b/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd
index ab36cc3c7..9716ca5a9 100644
--- a/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd
+++ b/org.eclipse.ui.cheatsheets/schema/compositeContentFile.exsd
@@ -40,6 +40,8 @@
       <annotation>
          <documentation>
             A task group represents a collection of related tasks. If the kind is &quot;choice&quot; only one of the child tasks need to be completed. If the kind is &quot;set&quot; or &quot;sequence&quot; all children must be completed.
+
+Note that the child elements &amp;lt;task&amp;gt;, &amp;lt;taskGroup&amp;gt;, &amp;lt;intro&amp;gt;, &amp;lt;onCompletion&amp;gt; and &amp;lt;dependency&amp;gt; may occur in any order. The order of the &amp;lt;task&amp;gt; and &amp;lt;taskGroup&amp;gt; elements determines the order in which they will be displayed and in the case of a sequence the order in which they must be performed.
          </documentation>
       </annotation>
       <complexType>
@@ -100,6 +102,8 @@
       <annotation>
          <documentation>
             A leaf task within a composite cheat sheet. A task does not have children, but it does have a task editor which shows in the lower/right hand pane of the cheat sheet view. The task kind determines which task editor will be opened, a task kind of &quot;cheatsheet&quot; represents a simple cheatsheet. Other task kinds may be contributed.
+
+Note that the child elements &amp;lt;intro&amp;gt;, &amp;lt;onCompletion&amp;gt;, &amp;lt;param&amp;gt; and &amp;lt;dependency&amp;gt; may occur in any order.
          </documentation>
       </annotation>
       <complexType>
@@ -160,7 +164,6 @@
 &lt;p&gt;path: The URL of a cheat sheet content file. This may be an absolute URL, or relative to the content file for the composite cheat sheet. If both id and path are specified the path will be used to locate the content file and the id parameter will be ignored.&lt;/p&gt; 
 
 &lt;p&gt;showIntro: A boolean parameter with default value of true. If &quot;false&quot; the cheat sheet when started will initially show the first step rather than the introduction.&lt;/p&gt;
-
                </documentation>
             </annotation>
          </attribute>
@@ -250,7 +253,7 @@
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         Copyright (c) 2006 IBM Corporation and others.&lt;br&gt;
+         Copyright (c) 2006, 2007 IBM Corporation and others.&lt;br&gt;
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
diff --git a/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html b/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html
index 3c76082de..3f2520542 100644
--- a/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html
+++ b/org.eclipse.ui.cheatsheets/schema/compositeContentFile.html
@@ -32,7 +32,9 @@ The root element of a composite cheatsheet</p>
 <p class=code id=dtdAttlist>kind&nbsp;(set|sequence|choice) "set"<p class=code id=dtdAttlist>name&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>skip&nbsp;(true | false) "false"&gt;</p>
 <p></p>
 <p class=ConfigMarkup id=elementDesc>
-A task group represents a collection of related tasks. If the kind is "choice" only one of the child tasks need to be completed. If the kind is "set" or "sequence" all children must be completed.</p>
+A task group represents a collection of related tasks. If the kind is "choice" only one of the child tasks need to be completed. If the kind is "set" or "sequence" all children must be completed.
+
+Note that the child elements &lt;task&gt;, &lt;taskGroup&gt;, &lt;intro&gt;, &lt;onCompletion&gt; and &lt;dependency&gt; may occur in any order. The order of the &lt;task&gt; and &lt;taskGroup&gt; elements determines the order in which they will be displayed and in the case of a sequence the order in which they must be performed.</p>
 <br>
 <ul class=ConfigMarkup id=attlistDesc>
 <li><b>kind</b> - The kind of this task group which can be "set", "sequence" or "choice". If the kind is set or sequence this task group is complete when all of its child tasks/task groups have been completed. In addition the subtasks of a sequence must be completed in order. A choice is complete when any of its subtasks has been completed.</li>
@@ -45,7 +47,9 @@ A task group represents a collection of related tasks. If the kind is "choice" o
 <p class=code id=dtdAttlist>kind&nbsp;CDATA "set"<p class=code id=dtdAttlist>name&nbsp;CDATA #REQUIRED<p class=code id=dtdAttlist>id&nbsp;&nbsp;&nbsp;CDATA #IMPLIED<p class=code id=dtdAttlist>skip&nbsp;(true | false) "false"&gt;</p>
 <p></p>
 <p class=ConfigMarkup id=elementDesc>
-A leaf task within a composite cheat sheet. A task does not have children, but it does have a task editor which shows in the lower/right hand pane of the cheat sheet view. The task kind determines which task editor will be opened, a task kind of "cheatsheet" represents a simple cheatsheet. Other task kinds may be contributed.</p>
+A leaf task within a composite cheat sheet. A task does not have children, but it does have a task editor which shows in the lower/right hand pane of the cheat sheet view. The task kind determines which task editor will be opened, a task kind of "cheatsheet" represents a simple cheatsheet. Other task kinds may be contributed.
+
+Note that the child elements &lt;intro&gt;, &lt;onCompletion&gt;, &lt;param&gt; and &lt;dependency&gt; may occur in any order.</p>
 <br>
 <ul class=ConfigMarkup id=attlistDesc>
 <li><b>kind</b> - The task kind. A task kind of "cheatsheet" represents a simple cheatsheet, other task kinds can be contributed using the extension point org.eclipse.ui.cheatsheets.cheatSheetContent.</li>
@@ -94,7 +98,7 @@ Creates a dependency between two tasks or subtasks.</p>
 </ul>
 <br><br>
 <p class=note id=copyright>
-Copyright (c) 2006 IBM Corporation and others.<br>
+Copyright (c) 2006, 2007 IBM Corporation and others.<br>
 All rights reserved. This program and the accompanying materials are made 
 available under the terms of the Eclipse Public License v1.0 which accompanies 
 this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>