Merge remote branch 'upstream/master' into prv/po

9 files changed, 33 insertions, 13 deletions

diff --git a/doc/sandbox/Fantasia.mdwn b/doc/sandbox/Fantasia.mdwn
new file mode 100644
index 000000000..8845ec967
--- /dev/null
+++ b/doc/sandbox/Fantasia.mdwn
@@ -0,0 +1,10 @@
+>> Block
+>>> Two Block
+
+[[blog]] blog
+
+* one
+* two
+
+# one
+# two
diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn
new file mode 100644
index 000000000..6f11d357c
--- /dev/null
+++ b/doc/sandbox/Mooooo.mdwn
@@ -0,0 +1 @@
+Hrm.
diff --git a/doc/sandbox/Nur_so..mdwn b/doc/sandbox/Nur_so..mdwn
new file mode 100644
index 000000000..32c9f2397
--- /dev/null
+++ b/doc/sandbox/Nur_so..mdwn
@@ -0,0 +1 @@
+Das ist ein Test.
diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn
deleted file mode 100644
index 7ae61669b..000000000
--- a/doc/sandbox/Post.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Ikiwiki is a **wiki compiler**. It converts wiki pages into HTML pages
-suitable for publishing on a website. Ikiwiki stores pages and history in a
-[[revision_control_system|rcs]] such as [[Subversion|rcs/svn]] or [[rcs/Git]].
-There are many other [[features]], including support for
-[[blogging|blog]], as well as a large array of [[plugins]].
diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn
new file mode 100644
index 000000000..aa5fa5b20
--- /dev/null
+++ b/doc/sandbox/Testing_blog_entry.mdwn
@@ -0,0 +1,7 @@
+# Be cool, this is a test!
+
+Hello guys, this is *just a test* entry.
+
+* Did I say
+* that I love
+* bulleted lists?
diff --git a/doc/sandbox/bullet_list_and_code_test.mdwn b/doc/sandbox/bullet_list_and_code_test.mdwn
new file mode 100644
index 000000000..a17729c90
--- /dev/null
+++ b/doc/sandbox/bullet_list_and_code_test.mdwn
@@ -0,0 +1,12 @@
+paragraph.
+
+    code
+
+ * bullet list
+ * bullet list
+
+    more code
+
+ * bullet list continued
+
+    tailing code
diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn
new file mode 100644
index 000000000..a955185ef
--- /dev/null
+++ b/doc/sandbox/hey.mdwn
@@ -0,0 +1 @@
+* Hello
diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html
deleted file mode 100644
index d69937ea8..000000000
--- a/doc/sandbox/prova_blog.html
+++ /dev/null
@@ -1,8 +0,0 @@
-Questa è una prova.
-Vediamo se funziona
-
-<pre>
-#!/bin/bash
-
-echo "ciao"
-</pre>
diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn
new file mode 100644
index 000000000..2b1cd2f94
--- /dev/null
+++ b/doc/sandbox/revert_me.mdwn
@@ -0,0 +1 @@
+this looks good