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

diff --git a/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__.mdwn b/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__.mdwn
new file mode 100644 (file)
index 0000000..c7c2b72
--- /dev/null
+++ b/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__.mdwn
@@ -0,0 +1,10 @@
+How to migrate multiple pages in root directory into a new subdirectory?
+
+I have multiple pages in the root directory of my website:
+    
+    $ pwd
+    /home/doss/public_html
+    $ ls
+    a. mdwn    b.mdwn  section.mdwn subdir
+
+What's the procedures to migrate a.mdwn and b.mdwn to subdir and keep correct links to them that might exist in other pages like section.mdwn?

diff --git a/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__/comment_1_a83a1a33afbf245971733b4128809365._comment b/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__/comment_1_a83a1a33afbf245971733b4128809365._comment
new file mode 100644 (file)
index 0000000..1935c70
--- /dev/null
+++ b/doc/forum/How_to_migrate_multiple_pages_in_root_directory_into_a_new_subdirectory__63__/comment_1_a83a1a33afbf245971733b4128809365._comment
@@ -0,0 +1,15 @@
+[[!comment format=mdwn
+ username="http://jmtd.livejournal.com/"
+ ip="94.65.111.123"
+ subject="comment 1"
+ date="2011-08-22T12:53:03Z"
+ content="""
+If you use the [[plugins/rename]] plugin and go page-by-page, it will update backlinks for you.
+
+If you want to move a lot of files, such that it is impractical to do one at a time, you could write a script that
+
+ * moved each page to the new location
+ * replaced the old page with one containing a [[plugins/meta]] redirect to the new location.
+
+-- [[Jon]]
+"""]]

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8f3d64d5e85513b71cd42911e0d66206dc047dcd..f761c45ecb52d7e20d1c7c3bf6c2b7f343ead17d 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -18,7 +18,7 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki
 
 Let's try this~!
 
-w00t, how does this look on the **git** end?
+w00t, how does this look on the **git** end? Well, as a commit of course.
 
 Testing this sandbox thing.
 
@@ -119,7 +119,7 @@ Test some tags
 [[!taglink tech life linux]]
 
 A poll:
-[[!poll 3 "red" 2 "green" 1 "blue" 2 "purple"]]
+[[!poll 6 "red" 3 "green" 2 "blue" 3 "purple"]]
 
 Toggle:
 [[!toggle  id="ipsum" text="show"]]