From f3582ee2d6d8d0d9e24e82d5d2db4fe47b605e92 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkARRfU19FmAvBQJ0zR_vlTi_KEiL9meFE" Date: Mon, 26 Dec 2011 13:06:19 -0400 Subject: [PATCH 1/4] Fixed link to Pandoc-Iki GitHub repo --- doc/forum/pandoc-iki_plugin.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/pandoc-iki_plugin.mdwn b/doc/forum/pandoc-iki_plugin.mdwn index 6a25fd723..b9cc6b3d2 100644 --- a/doc/forum/pandoc-iki_plugin.mdwn +++ b/doc/forum/pandoc-iki_plugin.mdwn @@ -1,4 +1,4 @@ -I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See for details. +I've updated [[Jason Blevin|users/jasonblevins]]'s pandoc plugin to permit tighter integration between Ikiwiki and [Pandoc](http://johnmacfarlane.net/pandoc/). Given the features Pandoc has added over the past 6-12 months, this makes for a very powerful combination, e.g. with code block syntax highlighting and lots of options for how to process and display inline TeX. See for details. How do I get this added to the contrib section of the plugin list? --Profjim From 5aed69b96a865ca5fc17499b2f4b2a24ddd17c30 Mon Sep 17 00:00:00 2001 From: Erkan_Yilmaz Date: Tue, 27 Dec 2011 00:56:03 -0400 Subject: [PATCH 2/4] typo --- doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn index 8d1d52b49..788a9be6e 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn @@ -1,6 +1,6 @@ [[!toc levels=2]] -Mediawiki is a dynamically-generated wiki which stores it's data in a +Mediawiki is a dynamically-generated wiki which stores its data in a relational database. Pages are marked up using a proprietary markup. It is possible to import the contents of a Mediawiki site into an ikiwiki, converting some of the Mediawiki conventions into Ikiwiki ones. From ce79cf47e745f89d61aeaadfe464149b65601abb Mon Sep 17 00:00:00 2001 From: Erkan_Yilmaz Date: Tue, 27 Dec 2011 01:01:32 -0400 Subject: [PATCH 3/4] rc + link to me --- doc/users/Erkan_Yilmaz.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/users/Erkan_Yilmaz.mdwn diff --git a/doc/users/Erkan_Yilmaz.mdwn b/doc/users/Erkan_Yilmaz.mdwn new file mode 100644 index 000000000..070a3a45a --- /dev/null +++ b/doc/users/Erkan_Yilmaz.mdwn @@ -0,0 +1,2 @@ +* [[recentchanges]] +* my site: [here](http://iaskquestions.com) From 0daa03f4c99a445a94f85ddba4e297c26e6da008 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Tue, 27 Dec 2011 12:18:33 -0400 Subject: [PATCH 4/4] Added a comment --- ..._f9240b217b2d1ee8d51dada9cb1186b3._comment | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment diff --git a/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment new file mode 100644 index 000000000..635aa9340 --- /dev/null +++ b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_f9240b217b2d1ee8d51dada9cb1186b3._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="comment 2" + date="2011-12-27T16:18:31Z" + content=""" +In both old and new host gitorigin_branch is empty string in ikiwiki.setup. + + tale@tugelbend:~$ grep -i gitorigin ikiwiki.setup + gitorigin_branch => '', + +The branches subdir is empty on both hosts: + + tale@tugelbend:~$ LANG=C ls -lha wiki/src.git/branches/ + total 8.0K + drwxr-xr-x 2 tale tale 4.0K Dec 24 2009 . + drwxr-xr-x 7 tale tale 4.0K Dec 24 2009 .. + tale@tugelbend:~$ + +I do not know what value I should assign to gitorigin_branch. + +I tried + + wiki.git/hooks/post-update + +but nothing seems to happen. No output, web page stays the same. File timestamps are not updated +on the dest directory. +"""]]