diff public/help/wiki_syntax_detailed.html @ 1116:bb32da3bea34 redmine-2.2-integration

Merge from live

--- a/public/help/wiki_syntax_detailed.html	Mon Jan 07 12:01:42 2013 +0000
+++ b/public/help/wiki_syntax_detailed.html	Mon Jan 07 14:41:20 2013 +0000
@@ -210,6 +210,78 @@
         <p>Redmine assigns an anchor to each of those headings thus you can link to them with "#Heading", "#Subheading" and so forth.</p>
 
 
+
+
+<h3><a name="9" class="wiki-page"></a>Bullets and Numbering</h3>
+
+<pre>
+* First Level Bullet
+** Second Level Bullet
+** Another Second Level Bullet
+*** Third Level Bullet
+** Back to 2nd Level Bullet
+* Back to 1st Level Bullet
+</pre>
+
+<ul>
+    <li>First Level Bullet</li>
+    <ul>
+      <li>Second Level Bullet</li>
+      <li>Another Second Level Bullet</li>
+        <ul>
+          <li>Third Level Bullet</li>
+        </ul>
+        <li>Back to 2nd Level Bullet</li>
+    </ul>
+    
+    <li>Back to 1st Level Bullet</li>
+</ul>
+
+<pre>
+# First Level Numbering
+## Second Level Numbering
+## Another Second Level Numbering
+### Third Level Numbering
+## Back to 2nd Level Numbering
+# Back to 1st Level Numbering
+</pre>
+
+<ol>
+    <li>First Level Numbering</li>
+    <ol>
+      <li>Second Level Numbering</li>
+      <li>Another Second Level Numbering</li>
+        <ol>
+          <li>Third Level Numbering</li>
+        </ol>
+        <li>Back to 2nd Level Numbering</li>
+    </ol>
+    <li>Back to 1st Level Numbering</li>
+</ol>
+
+<pre>
+# First Level Numbering
+#* Bullet inside numbering environment
+#* Another Bullet inside numbering environment
+# Back to 1st Level Numbering
+</pre>
+
+<ol>
+    <li>First Level Numbering</li>
+    <ul>
+      <li>Bullet inside numbering environment</li>
+      <li>Another Bullet inside numbering environment</li>
+    </ul>
+    
+    <li>Back to 1st Level Numbering</li>
+</ol>
+
+
+
+
+
+
+
         <h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
 
 <pre>