Merge branch 'master' of git://git.ikiwiki.info

32 files changed, 16 insertions, 110 deletions

diff --git a/doc/sandbox/Blagging_is_cool.mdwn b/doc/sandbox/Blagging_is_cool.mdwn
deleted file mode 100644
index 16aafa304..000000000
--- a/doc/sandbox/Blagging_is_cool.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a testing Blag-Entry.
-/me loves blagging.
-
- * Entry one
- * entry two
-
diff --git a/doc/sandbox/Bleep.mdwn b/doc/sandbox/Bleep.mdwn
deleted file mode 100644
index 316f7291c..000000000
--- a/doc/sandbox/Bleep.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Just a test page ...
-
-... to see what happens.
diff --git a/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki b/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki
deleted file mode 100644
index 54914bb0b..000000000
--- a/doc/sandbox/I_hate_making_new_blog_entries_-_sometimes.wiki
+++ /dev/null
@@ -1,25 +0,0 @@
-!!!Heading Three
-
-Itemized
-* list 
-* of
-* things
-
-or not
-1. mom
-1. hi
-1. there
-
-
-
-!!!Heading Three
-
-Itemized
-* list 
-* of
-* things
-
-or not
-1. mom
-1. hi
-1. there
diff --git a/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html b/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html
deleted file mode 100644
index fc1757d6e..000000000
--- a/doc/sandbox/Omgwtf_a_blof_post__33____33____33____33____33__1__33__1__33__11111__33____33____33__1__33__1__33____33__1five.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<math xmlns="http://www.w3.org/1998/Math/MathML">
-  <mrow>
-    <msup>
-      <mfenced open="(" close=")">
-        <mrow>
-          <mi>a</mi>
-          <mo>+</mo>
-
-          <mi>b</mi>
-        </mrow>
-      </mfenced>
-      <mn>2</mn>
-    </msup>
-    <mo>-</mo>
-    <msub>
-
-      <mfenced open="{" close="}">
-        <mrow>
-          <mi>x</mi>
-          <mo>+</mo>
-          <mi>y</mi>
-        </mrow>
-      </mfenced>
-
-      <mi>i</mi>
-    </msub>
-  </mrow>
-</math>
-<br>
-test <b>test</b><abbr title="test">T.</abbr> <h1>test</h1>
-<a href="https://bugzilla.mozilla.org">øđ</a>
diff --git a/doc/sandbox/Post.mdwn b/doc/sandbox/Post.mdwn
new file mode 100644
index 000000000..7ae61669b
--- /dev/null
+++ b/doc/sandbox/Post.mdwn
@@ -0,0 +1,5 @@
+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/Test:_with_a_colon_in_its_name.mdwn b/doc/sandbox/Test:_with_a_colon_in_its_name.mdwn
deleted file mode 100644
index b91d7cb03..000000000
--- a/doc/sandbox/Test:_with_a_colon_in_its_name.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-what happens?
diff --git a/doc/sandbox/Teximg.mdwn b/doc/sandbox/Teximg.mdwn
deleted file mode 100644
index 8483c1489..000000000
--- a/doc/sandbox/Teximg.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-[[!teximg code="E = - \frac{Z^2 \cdot  \mu \cdot e^4}{32\pi^2 \epsilon_0^2 \hbar^2 n^2}" ]]
-
diff --git a/doc/sandbox/Try_some_math_formulas.mdwn b/doc/sandbox/Try_some_math_formulas.mdwn
deleted file mode 100644
index 6c0fe6de5..000000000
--- a/doc/sandbox/Try_some_math_formulas.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-# Title with $\TeX$
-
-* How about some math?
-* $\frac{1}{2} = \frac{3}{6}$
-
-and teximg? [[!teximg  code="\frac{1}{2}"]]
diff --git a/doc/sandbox/bar.mdwn b/doc/sandbox/bar.mdwn
deleted file mode 100644
index 3163ac12e..000000000
--- a/doc/sandbox/bar.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-foo?
diff --git a/doc/sandbox/blech.mdwn b/doc/sandbox/blech.mdwn
deleted file mode 100644
index 1ec2727fd..000000000
--- a/doc/sandbox/blech.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-This just a test, but I am impressed.
diff --git a/doc/sandbox/castle/discussion/jon_tests_too.mdwn b/doc/sandbox/castle/discussion/jon_tests_too.mdwn
deleted file mode 100644
index bc051b008..000000000
--- a/doc/sandbox/castle/discussion/jon_tests_too.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-I recall testing this too, but I'm not sure where the test went. Let's try again. -- [[users/Jon]]
-
-Context: [[todo/discussion_page_as_blog/discussion/castle]]
diff --git a/doc/sandbox/castle/discussion/test_comment.mdwn b/doc/sandbox/castle/discussion/test_comment.mdwn
deleted file mode 100644
index 4dd2cb0bf..000000000
--- a/doc/sandbox/castle/discussion/test_comment.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I like this idea of using the blog feature to handle comments. Let's see how it works.
diff --git a/doc/sandbox/check_openID.mdwn b/doc/sandbox/check_openID.mdwn
deleted file mode 100644
index 15363c985..000000000
--- a/doc/sandbox/check_openID.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-wibble
diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn
new file mode 100644
index 000000000..9766475a4
--- /dev/null
+++ b/doc/sandbox/danc.mdwn
@@ -0,0 +1 @@
+ok
diff --git a/doc/sandbox/discussion.mdwn b/doc/sandbox/discussion.mdwn
deleted file mode 100644
index d8c565617..000000000
--- a/doc/sandbox/discussion.mdwn
+++ /dev/null
@@ -1,6 +0,0 @@
-normally a sandbow doesn't have a discussion page 
-but it's a sandbox 
-
-- 
-little light 
-ikiwiki looks great 
diff --git a/doc/sandbox/foo.mdwn b/doc/sandbox/foo.mdwn
deleted file mode 100644
index e3ec71332..000000000
--- a/doc/sandbox/foo.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-a test blog in the ikiwiki sandbox!
diff --git a/doc/sandbox/foobak.mdwn b/doc/sandbox/foobak.mdwn
deleted file mode 100644
index c0b526f73..000000000
--- a/doc/sandbox/foobak.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Foobaka bakfoo.
diff --git a/doc/sandbox/hello.mdwn b/doc/sandbox/hello.mdwn
deleted file mode 100644
index a0e2270db..000000000
--- a/doc/sandbox/hello.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-hehe hohoho
diff --git a/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn b/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn
deleted file mode 100644
index 63642c71c..000000000
--- a/doc/sandbox/ikiwiki_flexibility_makes_me_dream.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-##Why?
-* Because I can do things like this
-* Because I can use my favourite SCM, as the rest of my project elements (that's the only reason I complain about Trac...)
-* Because the perfect tool does not exist, but custommizing very simple approaches like this I can build my own
-* Because I'm just adding a new topic to see how diff works
diff --git a/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn b/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn
deleted file mode 100644
index 8b604cb9f..000000000
--- a/doc/sandbox/ikiwiki_flexibility_makes_me_dream/discussion.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Perhaps
diff --git a/doc/sandbox/plop.mdwn b/doc/sandbox/plop.mdwn
new file mode 100644
index 000000000..e8b7c915c
--- /dev/null
+++ b/doc/sandbox/plop.mdwn
@@ -0,0 +1 @@
+plop
diff --git a/doc/sandbox/prova_blog.html b/doc/sandbox/prova_blog.html
new file mode 100644
index 000000000..d69937ea8
--- /dev/null
+++ b/doc/sandbox/prova_blog.html
@@ -0,0 +1,8 @@
+Questa è una prova.
+Vediamo se funziona
+
+<pre>
+#!/bin/bash
+
+echo "ciao"
+</pre>
diff --git a/doc/sandbox/sidebar.mdwn b/doc/sandbox/sidebar.mdwn
new file mode 100644
index 000000000..9daeafb98
--- /dev/null
+++ b/doc/sandbox/sidebar.mdwn
@@ -0,0 +1 @@
+test
diff --git a/doc/sandbox/test.mdwn b/doc/sandbox/test.mdwn
deleted file mode 100644
index db20a2fbc..000000000
--- a/doc/sandbox/test.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-testing my openid provider @ www.steve.org.uk
diff --git a/doc/sandbox/test_nested_inlines.mdwn b/doc/sandbox/test_nested_inlines.mdwn
deleted file mode 100644
index 0e6074fbd..000000000
--- a/doc/sandbox/test_nested_inlines.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Testing nested inlines:
-
-[[!inline pages="sandbox/test_nested_inlines/* and !sandbox/test_nested_inlines/*/*" feeds="no"]]
diff --git a/doc/sandbox/test_pi.mdwn b/doc/sandbox/test_pi.mdwn
deleted file mode 100644
index 32b0e7f4c..000000000
--- a/doc/sandbox/test_pi.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I tried to make a page called **testπ** and it didn't work. So this is a page called **test pi**.
diff --git a/doc/sandbox/test_post.mdwn b/doc/sandbox/test_post.mdwn
deleted file mode 100644
index b687aa253..000000000
--- a/doc/sandbox/test_post.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-hi mom!
\ No newline at end of file
diff --git a/doc/sandbox/testpage.mdwn b/doc/sandbox/testpage.mdwn
deleted file mode 100644
index b9439ad02..000000000
--- a/doc/sandbox/testpage.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Test page content.
diff --git a/doc/sandbox/testsubpage.mdwn b/doc/sandbox/testsubpage.mdwn
deleted file mode 100644
index 3db7aaaab..000000000
--- a/doc/sandbox/testsubpage.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-# Test subpage
-
-This is a test subpage. Isn't that special?
diff --git a/doc/sandbox/this_is_pretty_cool.mdwn b/doc/sandbox/this_is_pretty_cool.mdwn
deleted file mode 100644
index 32b01f70f..000000000
--- a/doc/sandbox/this_is_pretty_cool.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-I am very impressed.
\ No newline at end of file
diff --git a/doc/sandbox/한글.mdwn b/doc/sandbox/한글.mdwn
deleted file mode 100644
index e0ba32639..000000000
--- a/doc/sandbox/한글.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-~를 어떻게 할까~
diff --git a/doc/sandbox/한글페이지.mdwn b/doc/sandbox/한글페이지.mdwn
deleted file mode 100644
index 4fac7976c..000000000
--- a/doc/sandbox/한글페이지.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Wow test