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

diff --git a/doc/forum/Chinese_file_name_corruption.mdwn b/doc/forum/Chinese_file_name_corruption.mdwn
new file mode 100644 (file)
index 0000000..49d7d5b
--- /dev/null
+++ b/doc/forum/Chinese_file_name_corruption.mdwn
@@ -0,0 +1,5 @@
+I added a file with Chinese file name, and committed and pushed it to my Ikiwiki instance on Web. It displays correctly in browser. But, the file name shows up like
+
+http://i53.tinypic.com/2cikb9y.png
+
+Is there a way to fix it?

diff --git a/doc/forum/How_is_TITLE_evaluated_in_inline_archive_templates__63__.mdwn b/doc/forum/How_is_TITLE_evaluated_in_inline_archive_templates__63__.mdwn
new file mode 100644 (file)
index 0000000..fc84fab
--- /dev/null
+++ b/doc/forum/How_is_TITLE_evaluated_in_inline_archive_templates__63__.mdwn
@@ -0,0 +1,11 @@
+Hi,
+
+I'm wondering how is TITLE evaluated in inline archive templates?
+
+Needless to say, I don't know much perl except the code that looks similar to other languages like bash.
+
+I found this line:
+
+$template->param(title => pagetitle(basename($page)));
+
+It seems to return a page name (pagetitle having no effect). Or maybe I'm not testing this the right way!

diff --git a/doc/forum/move_pages.mdwn b/doc/forum/move_pages.mdwn
new file mode 100644 (file)
index 0000000..44d36f6
--- /dev/null
+++ b/doc/forum/move_pages.mdwn
@@ -0,0 +1 @@
+How to move pages in ikiwiki?

diff --git a/doc/forum/move_pages/comment_1_3f1b9563af1e729a7311e869cf7a7787._comment b/doc/forum/move_pages/comment_1_3f1b9563af1e729a7311e869cf7a7787._comment
new file mode 100644 (file)
index 0000000..7e24243
--- /dev/null
+++ b/doc/forum/move_pages/comment_1_3f1b9563af1e729a7311e869cf7a7787._comment
@@ -0,0 +1,11 @@
+[[!comment format=mdwn
+ username="http://smcv.pseudorandom.co.uk/"
+ nickname="smcv"
+ subject="comment 1"
+ date="2011-08-05T13:57:09Z"
+ content="""
+Enable the [[plugins/rename]] plugin and ensure that you have permission to edit the page.
+Edit the page and press the Rename button.
+
+\"Following Unix tradition, renaming also allows moving to a different directory.\" —from its documentation
+"""]]

diff --git a/doc/forum/section_editing.mdwn b/doc/forum/section_editing.mdwn
new file mode 100644 (file)
index 0000000..a20fa1d
--- /dev/null
+++ b/doc/forum/section_editing.mdwn
@@ -0,0 +1 @@
+Is [[Section editing|http://www.wikimatrix.org/wiki/feature:Section%20Editing]] possible in ikiwiki? Is there a plugin?

diff --git a/doc/ikiwiki/pagespec/discussion.mdwn b/doc/ikiwiki/pagespec/discussion.mdwn
index 4c553925a9fafbcc9df4a4c66936210e5439db7e..2b2008001792c51f81f0a9c8448bdc863e914570 100644 (file)
--- a/doc/ikiwiki/pagespec/discussion.mdwn
+++ b/doc/ikiwiki/pagespec/discussion.mdwn
@@ -103,3 +103,27 @@ which does not work though. I also tried it in this Wiki. Just take a look at th
 
 > Unlike wikilinks, pagespecs match relative to the top of the wiki by
 > default. So lose the "/" and it will work. --[[Joey]]
+
+
+----
+
+I'd like to create a collapsable tree with a map, eg
+
+* top level item
+
+* * second level item1
+
+* * * content 1
+
+* * * content 2
+
+* * * content 3
+
+* * second level item2
+
+* * second level item3
+
+
+but I can't work out how to specify "all items at this level, and all directories at ../ and all the other directories to the root
+
+any ideas?

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 7c2fa13d712a404b75197631e7d5cf358c0f5325..f7b97a2d93ed4942fd5362b13d0fe3ddd78a98e9 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,14 @@
 # Sandbox
 
+
+[[!sidebar  content="dfdsfsf""
+This is my custom sidebar for this page.
+
+\[[!calendar pages="posts/*"]]
+"""]]
+
+[[!sidebar ]]
+
 ## number 2
 
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 053c0771fb81eda9a14476d6854891161c924a8b..f957fc2baf763465540fe052315324ccaf2db2ac 100644 (file)
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -25,8 +25,8 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
 * [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]]
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
-* [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
-  * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
+* [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]]
+  * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`.  See <http://snapshot.debian.org/> for details.
 * [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]