22 files changed, 17 insertions, 90 deletions
diff --git a/doc/news/version_3.20120203.mdwn b/doc/news/version_3.20120203.mdwn
deleted file mode 100644
index 22d14042f..000000000
--- a/doc/news/version_3.20120203.mdwn
+++ /dev/null
@@ -1,20 +0,0 @@
-ikiwiki 3.20120203 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * osm: New plugin to embed an OpenStreetMap into a wiki page.
-     Supports waypoints, tags, and can even draw paths matching
-     wikilinks between pages containing waypoints.
-     Thanks to Blars Blarson and Antoine Beaupré, as well as the worldwide
-     OpenStreetMap community for this utter awesomeness.
-   * trail: New plugin to add navigation trails through pages via Next and
-     Previous links. Trails can easily be added to existing inlines by setting
-     trail=yes in the inline.
-     Thanks to Simon McVittie for his persistance developing this feature.
-   * Fix a snail mail address. Closes: #[659158](http://bugs.debian.org/659158)
-   * openid-jquery.js: Update URL of Wordpress favicon. Closes: #[660549](http://bugs.debian.org/660549)
-   * Drop the version attribute on the generator tag in Atom feeds
-     to make builds more reproducible. Closes: #[661569](http://bugs.debian.org/661569) (Paul Wise)
-   * shortcut: Support Wikipedia's form of url-encoding for unicode
-     characters, which involves mojibake. Closes: #[661198](http://bugs.debian.org/661198)
-   * Add a few missing jquery UI icons to attachment upload widget underlay.
-   * URI escape filename when generating the diffurl.
-   * Add build-affected hook. Used by trail."""]]
-\ No newline at end of file
diff --git a/doc/news/version_3.20121016.mdwn b/doc/news/version_3.20121016.mdwn
new file mode 100644
index 000000000..62cb39758
--- /dev/null
+++ b/doc/news/version_3.20121016.mdwn
@@ -0,0 +1,17 @@
+ikiwiki 3.20121016 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * monochrome: New theme, contributed by Jon Dowland.
+   * rst: Ported to python 3, while still also being valid python 2.
+     Thanks, W. Trevor King
+   * Try to avoid a situation in which so many ikiwiki cgi wrapper programs
+     are running, all waiting on some long-running thing like a site rebuild,
+     that it prevents the web server from doing anything else. The current
+     approach only avoids this problem for GET requests; if multiple cgi's
+     run GETs on a site at the same time, one will display a "please wait"
+     page for a configurable number of seconds, which then redirects to retry.
+     To enable this protection, set cgi\_overload\_delay to the number of
+     seconds to wait. This is not enabled by default.
+   * Add back a 1em margin between archivepage divs.
+   * recentchangesdiff: Correct broken template that resulted in duplicate
+     diff icons being displayed, and bloated the recentchanges page with
+     inline diffs when the configuration should have not allowed them."""]]
+\ No newline at end of file
diff --git a/doc/sandbox/Fantasia.mdwn b/doc/sandbox/Fantasia.mdwn
deleted file mode 100644
index 8845ec967..000000000
--- a/doc/sandbox/Fantasia.mdwn
+++ /dev/null
@@ -1,10 +0,0 @@
->> Block
->>> Two Block
-
-[[blog]] blog
-
-* one
-* two
-
-# one
-# two
diff --git a/doc/sandbox/Hey__33__.mdwn b/doc/sandbox/Hey__33__.mdwn
deleted file mode 100644
index 6902ee32d..000000000
--- a/doc/sandbox/Hey__33__.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Don't you love it...
diff --git a/doc/sandbox/Just_a_new_post_with_non-latin_characters:_日本語.mdwn b/doc/sandbox/Just_a_new_post_with_non-latin_characters:_日本語.mdwn
deleted file mode 100644
index 44b139a92..000000000
--- a/doc/sandbox/Just_a_new_post_with_non-latin_characters:_日本語.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Ελληνικά
diff --git a/doc/sandbox/Mooooo.mdwn b/doc/sandbox/Mooooo.mdwn
deleted file mode 100644
index 6f11d357c..000000000
--- a/doc/sandbox/Mooooo.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Hrm.
diff --git a/doc/sandbox/Nur_so..mdwn b/doc/sandbox/Nur_so..mdwn
deleted file mode 100644
index 32c9f2397..000000000
--- a/doc/sandbox/Nur_so..mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Das ist ein Test.
diff --git a/doc/sandbox/Nyus_of_se_däi.mdwn b/doc/sandbox/Nyus_of_se_däi.mdwn
deleted file mode 100644
index 6205f18bd..000000000
--- a/doc/sandbox/Nyus_of_se_däi.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Sies ahr se nyus of se däi...... säi ahr väri interesting, for schur.
diff --git a/doc/sandbox/Test_it.mdwn b/doc/sandbox/Test_it.mdwn
deleted file mode 100644
index 5478d7a67..000000000
--- a/doc/sandbox/Test_it.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Test it just now!
diff --git a/doc/sandbox/Testing_blog_entry.mdwn b/doc/sandbox/Testing_blog_entry.mdwn
deleted file mode 100644
index aa5fa5b20..000000000
--- a/doc/sandbox/Testing_blog_entry.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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/adding_a_new_post.mdwn b/doc/sandbox/adding_a_new_post.mdwn
deleted file mode 100644
index b42ae703e..000000000
--- a/doc/sandbox/adding_a_new_post.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Bob has many drives to archive his data, most of them kept offline, in a safe place.
-
-With git-annex, Bob has a single directory tree that includes all his files, even if their content is being stored offline. He can reorganize his files using that tree, committing new versions to git, without worry about accidentally deleting anything. 
diff --git a/doc/sandbox/ainvyu.mdwn b/doc/sandbox/ainvyu.mdwn
deleted file mode 100644
index 7c9609598..000000000
--- a/doc/sandbox/ainvyu.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-## 룰루랄라 잘되나 테스트
-
-### 두번째
-
-#### 세번째
-
-[[link test]]
-
-    code test
-    basic
-
-----
-
-몸에 좋고 맛도 좋은 소고기
diff --git a/doc/sandbox/bullet_list_and_code_test.mdwn b/doc/sandbox/bullet_list_and_code_test.mdwn
deleted file mode 100644
index a17729c90..000000000
--- a/doc/sandbox/bullet_list_and_code_test.mdwn
+++ /dev/null
@@ -1,12 +0,0 @@
-paragraph.
-
-    code
-
- * bullet list
- * bullet list
-
-    more code
-
- * bullet list continued
-
-    tailing code
diff --git a/doc/sandbox/danc.mdwn b/doc/sandbox/danc.mdwn
deleted file mode 100644
index 9766475a4..000000000
--- a/doc/sandbox/danc.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-ok
diff --git a/doc/sandbox/dateenumeration.mdwn b/doc/sandbox/dateenumeration.mdwn
deleted file mode 100644
index adc40bd23..000000000
--- a/doc/sandbox/dateenumeration.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-* 1. January
-* 23. February
-* 99. March
-* 7. November
diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn
deleted file mode 100644
index a955185ef..000000000
--- a/doc/sandbox/hey.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-* Hello
diff --git a/doc/sandbox/plop.mdwn b/doc/sandbox/plop.mdwn
deleted file mode 100644
index e8b7c915c..000000000
--- a/doc/sandbox/plop.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-plop
diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn
deleted file mode 100644
index 2b1cd2f94..000000000
--- a/doc/sandbox/revert_me.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-this looks good
diff --git a/doc/sandbox/sandbocen.mdwn b/doc/sandbox/sandbocen.mdwn
deleted file mode 100644
index 8f7e049c5..000000000
--- a/doc/sandbox/sandbocen.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Great!
-
-<code>
-if (sample == test) goto Dijkstra
-</code>
diff --git a/doc/sandbox/sandbox_subpost.mdwn b/doc/sandbox/sandbox_subpost.mdwn
deleted file mode 100644
index 2f349c112..000000000
--- a/doc/sandbox/sandbox_subpost.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-Hmm. I was'nt redirected to my openid provider.
diff --git a/doc/sandbox/sidebar.mdwn b/doc/sandbox/sidebar.mdwn
deleted file mode 100644
index 9daeafb98..000000000
--- a/doc/sandbox/sidebar.mdwn
+++ /dev/null
@@ -1 +0,0 @@
-test
diff --git a/doc/sandbox/Как_ikiwiki_транслитерует_русские_буквы__63__.mdwn b/doc/sandbox/Как_ikiwiki_транслитерует_русские_буквы__63__.mdwn
deleted file mode 100644
index 315b0fd3f..000000000
--- a/doc/sandbox/Как_ikiwiki_транслитерует_русские_буквы__63__.mdwn
+++ /dev/null
@@ -1,3 +0,0 @@
-Как ikiwiki транслитерует русские буквы в URL?
-
-Никак. Это хорошо.