From da302cd9b26c4eb60cc78aa313d42381a2eb04ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Wed, 20 Jun 2012 01:27:30 +0200
Subject: [PATCH] sync with moinmoin SyntaxReference

---
 syntaxreference.txt | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/syntaxreference.txt b/syntaxreference.txt
index 9cae98a..3e3ccf1 100644
--- a/syntaxreference.txt
+++ b/syntaxreference.txt
@@ -1,3 +1,14 @@
+#acl MoinPagesEditorGroup:read,write,delete,revert All:read
+## Please edit (or translate) system/help pages on the moinmaster wiki ONLY.
+## For more information, please see MoinMaster:MoinPagesEditorGroup.
+#pragma section-numbers off
+#language en
+
+{{{
+#pragma section-numbers off
+#acl All:admin,read,write,delete,revert
+#language en
+}}}
 
 This page tries to use each supported markup element at least once.
 
@@ -23,18 +34,11 @@ Normal text, ''emphasized'', '''strong''', __underline__, ,,subscript,,, ^supers
 Normal text, ''emphasized'', '''strong''', __underline__, ,,subscript,,, ^superscript^, `typewriter` and {{{typewriter}}}.
 
 == Syntax Highlighting ==
-{{{#!python
+ {{{#!python
 # python code
 print code.colorize("abc", 1 + 1)
-# third line
-# fourth line
 }}}
 
-{{{#!cplusplus
-foo = new something(1, "soo\nice")
-}}}
-
-
 = Hyperlinks =
 == Internal ==
 {{{
@@ -84,7 +88,6 @@ foo = new something(1, "soo\nice")
  * [wiki:MeatBall/InterWiki InterWiki page on MeatBall]
  * [file://servername/full/path/to/file/filename%20with%20spaces.txt Click here to read filename with spaces.txt]
  * me@privacy.net
-
 == Escaping WikiNames ==
 {{{
 Wiki''''''Name
@@ -131,22 +134,19 @@ Wiki``Name
  1. item 2
    a. item 1
    a. item 2
-
-= Code display =
+= Descriptions + Definitions =
 {{{
+ Term:: Description
+ Label:: Definition
+}}}
+ Term:: Description
+ Label:: Definition
+= Code display =
+ {{{
 line 1
     indented 4 characters
 }}}
 
-{{{
-plain
-multiline block
-with some ''text'' in it
-fourth line
-
-sixth line!
-}}}
-
 = Rules =
 {{{
 --- (not a rule)
@@ -169,7 +169,6 @@ sixth line!
 ----------
 -------------------------------------------- (not thicker than 10)
 
-
 = Macros =
 {{{
 [[Anchor(anchorname)]]