# HG changeset patch
# User luisf <luis.figueira@eecs.qmul.ac.uk>
# Date 1319466509 -3600
# Node ID 386fcfd7459f5ab94773a706b2a243c345ccd061
# Parent  d41bf754c0f25cabaf3567dffd87fcfab276d7ef# Parent  1308652d7c19e933c60c4bc9d8e75ea72cf90fad
Merge from branch "luisf"

diff -r d41bf754c0f2 -r 386fcfd7459f public/help/wiki_syntax_detailed.html
--- a/public/help/wiki_syntax_detailed.html	Thu Oct 20 16:36:48 2011 +0100
+++ b/public/help/wiki_syntax_detailed.html	Mon Oct 24 15:28:29 2011 +0100
@@ -68,7 +68,7 @@
 
         <p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="#" class="wiki-page new">Nonexistent page</a>.</p>
 
-        <p>Links to other resources:</p>
+        <p>Links to other resources:</p>
 
         <ul>
             <li>Documents:
@@ -76,7 +76,7 @@
                     <li><strong>document#17</strong> (link to document with id 17)</li>
                     <li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
                     <li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
-                    <li><strong>sandbox:document:"Some document"</strong> (link to a document with title "Some document" in other project "sandbox")</li>
+                    <li><strong>sandbox:document:"Some document"</strong> (link to a document with title "Some document" in other project "sandbox")</li>
                 </ul></li>
         </ul>
 
@@ -99,38 +99,38 @@
         </ul>
 
         <ul>
-             <li>Repository files:
+             <li>Repository files:
                 <ul>
-                    <li><strong>source:some/file</strong>           (link to the file located at /some/file in the project's repository)</li>
-                    <li><strong>source:some/file@52</strong>        (link to the file's revision 52)</li>
-                    <li><strong>source:some/file#L120</strong>      (link to line 120 of the file)</li>
-                    <li><strong>source:some/file@52#L120</strong>   (link to line 120 of the file's revision 52)</li>
-                    <li><strong>source:"some file@52#L120"</strong> (use double quotes when the URL contains spaces</li>
+                    <li><strong>source:some/file</strong>           (link to the file located at /some/file in the project's repository)</li>
+                    <li><strong>source:some/file@52</strong>        (link to the file's revision 52)</li>
+                    <li><strong>source:some/file#L120</strong>      (link to line 120 of the file)</li>
+                    <li><strong>source:some/file@52#L120</strong>   (link to line 120 of the file's revision 52)</li>
+                    <li><strong>source:"some file@52#L120"</strong> (use double quotes when the URL contains spaces</li>
                     <li><strong>export:some/file</strong>           (force the download of the file)</li>
                     <li><strong>sandbox:source:some/file</strong>   (link to the file located at /some/file in the repository of the project "sandbox")</li>
-                    <li><strong>sandbox:export:some/file</strong>   (force the download of the file)</li>
-                </ul></li>
+                    <li><strong>sandbox:export:some/file</strong>   (force the download of the file)</li>
+                </ul></li>
         </ul>
 
         <ul>
-            <li>Forum messages:
-                <ul>
-                    <li><strong>message#1218</strong> (link to message with id 1218)</li>
-                </ul></li>
-        </ul>
-
-        <ul>
-            <li>Projects:
-                <ul>
-                    <li><strong>project#3</strong> (link to project with id 3)</li>
-                    <li><strong>project:someproject</strong> (link to project named "someproject")</li>
-                </ul></li>
-        </ul>
-
-
-        <p>Escaping:</p>
-
-        <ul>
+            <li>Forum messages:
+                <ul>
+                    <li><strong>message#1218</strong> (link to message with id 1218)</li>
+                </ul></li>
+        </ul>
+
+        <ul>
+            <li>Projects:
+                <ul>
+                    <li><strong>project#3</strong> (link to project with id 3)</li>
+                    <li><strong>project:someproject</strong> (link to project named "someproject")</li>
+                </ul></li>
+        </ul>
+
+
+        <p>Escaping:</p>
+
+        <ul>
             <li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
         </ul>
 
@@ -198,6 +198,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>
@@ -242,7 +314,7 @@
 
     <h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
 
-    <p>Code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.</p>
+    <p>Code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, cpp, css, delphi, groovy, html, java, javascript, json, php, python, rhtml, ruby, scheme, sql, xml and yaml languages.</p>
 
     <p>You can highlight code in your wiki page using this syntax:</p>