Merge remote-tracking branch 'anarcat/inline_diffs'

diff --git a/doc/bugs/Existing_Discussion_pages_appear_as_non-existing.mdwn b/doc/bugs/Existing_Discussion_pages_appear_as_non-existing.mdwn
index 093eb77aa8d66508b8bbc0fb72e366e769922e77..9ba4ede6ec52939be48b3c6f62735ecc205abaf3 100644 (file)
--- a/doc/bugs/Existing_Discussion_pages_appear_as_non-existing.mdwn
+++ b/doc/bugs/Existing_Discussion_pages_appear_as_non-existing.mdwn
@@ -1,3 +1,5 @@
 If you look at [[todo/org mode]], the link to the Discussion page is not there (has a question mark), as if it didn't exist. But--through the search--I discovered that the Discussion page does exist actually: [[todo/org mode/Discussion]]. 
 
 So, there is a bug that prevents a link to the existing Discussion page from appearing in the correct way on the corresponding main page. --Ivan Z.
+
+Perhaps, this has something to do with the same piece of code/logic (concerning case-sensitivity) as the fixed [[bugs/unwanted discussion links on discussion pages]]? --Ivan Z.

diff --git a/doc/forum/Slow_ikiwiki_after_first_run.mdwn b/doc/forum/Slow_ikiwiki_after_first_run.mdwn
new file mode 100644 (file)
index 0000000..db07f6d
--- /dev/null
+++ b/doc/forum/Slow_ikiwiki_after_first_run.mdwn
@@ -0,0 +1 @@
+I have local ikiwiki on my notebook. When I save an edit the first time after booting and logging in, saving is very slow. Any idea how to fix this?

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 9474cd75699ee3d707355a2eb4fb075f41f7a50f..8e641b69a1aa1525cfef2320340e9e82938148c6 100644 (file)
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -81,6 +81,7 @@ Projects & Organizations
 * [Arcada Project](http://arcadaproject.org/)
 * [*BSD UNIX user group in Denmark](http://www.bsd-dk.dk/)
 * [Telecomix Broadcast System](http://broadcast.telecomix.org/)
+* [WikiMIX.cc](http://WikiMIX.cc/)
 
 Personal sites and blogs
 ========================

diff --git a/doc/news/version_3.20120115.mdwn b/doc/news/version_3.20120115.mdwn
deleted file mode 100644 (file)
index ba665c6..0000000
--- a/doc/news/version_3.20120115.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-ikiwiki 3.20120115 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Make backlink(.) work. Thanks, Giuseppe Bilotta.
-   * mdwn: Workaround discount's eliding of <style> blocks.
-   * attachment: Fix utf-8 display bug."""]]
\ No newline at end of file

diff --git a/doc/news/version_3.20120629.mdwn b/doc/news/version_3.20120629.mdwn
new file mode 100644 (file)
index 0000000..3496979
--- /dev/null
+++ b/doc/news/version_3.20120629.mdwn
@@ -0,0 +1,4 @@
+ikiwiki 3.20120629 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * mirrorlist: Add mirrorlist\_use\_cgi setting that avoids usedirs or
+     other config differences by linking to the mirror's CGI. (intrigeri)"""]]
\ No newline at end of file

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 703244947b9a99aabc7c285685cce4eeebb3f1b2..b7c1582ca4e1348cef265f06ddbf0579389772c4 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -229,6 +229,14 @@ are not rendered correctly on the slave pages:
   could be used to support it, but it would need a security audit
 * other markup languages have not been tested.
 
+Renaming a page
+---------------
+
+A translatable page may be renamed using the web interface and the
+[[rename plugin|plugins/rename]], or using the VCS directly; in
+the latter case, *both* the "master" page and every corresponding
+`.po` file must be renamed in the same commit.
+
 Security
 ========