From ee166d1b6d59e30729f1ab18e96eddd4d5bc0b6e Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 08:53:36 -0400 Subject: fixes confirmed --- doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn b/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn index 5d5e90f7a..472597c46 100644 --- a/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn +++ b/doc/bugs/unicode_chars_in_wikiname_break_auth.mdwn @@ -11,6 +11,10 @@ Replacing "·" with "-" in `wikiname` fixed this login issue. > issues too.) Seems like I will have to possibly break some sessions and > entity-encode the wikiname in the cookie.. [[done]]. --[[Joey]] +>> I confirm it fixes the bug for me. --[[intrigeri]] + (BTW, such a char was replaced by -I don't remember what encoding thingie- in my setup file, when running `ikiwiki-transition setupformat`.) > Thanks for the heads up, fixed that too. --[[Joey]] + +>> I confirm it fixes the bug for me. --[[intrigeri]] -- cgit v1.2.3 From 3fe59803d5a0e3cf8754128c62e3c683359e4d4d Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 10:02:45 -0400 Subject: --- doc/users/hb/discussion.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/users/hb/discussion.mdwn b/doc/users/hb/discussion.mdwn index 6dfa6a23b..15c065e45 100644 --- a/doc/users/hb/discussion.mdwn +++ b/doc/users/hb/discussion.mdwn @@ -1,4 +1,5 @@ I'd love to see any notes you have on using ikiwiki for GTD. Would you consider documenting them? Perhaps we could turn the result into a [[tip|tips]]. -[[JoshTriplett]] -> Well, certainly. Basically it's just inline + tag feature. I'm going to have more time in May for ikiwiki, I hope. \ No newline at end of file +> Well, certainly. Basically it's just inline + tag feature. I'm going to have more time in May for ikiwiki, I hope. +> > Any news about that ? -- cgit v1.2.3 From 044e34f329a989509cf87f21701b23158e2a4af6 Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 10:06:26 -0400 Subject: My opinion --- doc/todo/clear_page_to_delete.mdwn | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'doc') diff --git a/doc/todo/clear_page_to_delete.mdwn b/doc/todo/clear_page_to_delete.mdwn index ccb7634e5..36742fe21 100644 --- a/doc/todo/clear_page_to_delete.mdwn +++ b/doc/todo/clear_page_to_delete.mdwn @@ -24,3 +24,8 @@ the page. That's what the user intended to do in this case. The information content of an empty vs. a deleted page is essentially the same, I'd say. But having ikiwiki remove those stale pages would save some (minimal, admittedly) time needed for manual clean-up. --[[tschwinge]] + +On EmacsWiki, a page is marked for deletion when it contains just the DeletedPage +keyword and if there were no page editions since XX days. Here, I use pages that +can be empty everyday and filled all day long. It does not make sense to me to +delete these pages :). --[[xma]] -- cgit v1.2.3 From 217eb43aec4cf2ef8bab745a6d0d76dccfa286b4 Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 10:12:49 -0400 Subject: --- doc/users/xma/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/xma/discussion.mdwn (limited to 'doc') diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn new file mode 100644 index 000000000..6e1134c24 --- /dev/null +++ b/doc/users/xma/discussion.mdwn @@ -0,0 +1 @@ +How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there a way to git clone/pull/push and thus to use our favorite [text editor](http://www.gnu.org/software/emacs) ? --[[xma]] -- cgit v1.2.3 From 3a07fc2802e05dca7a12319067787ac0761aa5f3 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:23:41 -0400 Subject: I was not aware of remove. --- doc/todo/clear_page_to_delete.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/clear_page_to_delete.mdwn b/doc/todo/clear_page_to_delete.mdwn index 36742fe21..50ae246bb 100644 --- a/doc/todo/clear_page_to_delete.mdwn +++ b/doc/todo/clear_page_to_delete.mdwn @@ -29,3 +29,5 @@ On EmacsWiki, a page is marked for deletion when it contains just the DeletedPag keyword and if there were no page editions since XX days. Here, I use pages that can be empty everyday and filled all day long. It does not make sense to me to delete these pages :). --[[xma]] + +I was not aware of [[plugins/remove]]. I don't think another method is necessary -- [[JonDowland]] -- cgit v1.2.3 From 566c1af2aafa7b371a07f5229513ac2014e93fd9 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:25:49 -0400 Subject: split into subpages? --- doc/plugins/write/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/plugins/write/discussion.mdwn b/doc/plugins/write/discussion.mdwn index 039775b79..9a36d7b0b 100644 --- a/doc/plugins/write/discussion.mdwn +++ b/doc/plugins/write/discussion.mdwn @@ -40,3 +40,7 @@ distributed wiki. > > OTOH, if something can be added to the documentation that encourages > good behavior, that'd be a good thing ... --[[Joey]] + +--- + +I would find this page clearer split up into sub-pages. Does anyone agree/disagree? -- [[JonDowland]] -- cgit v1.2.3 From 723aaf1f4694aae1cc84ac13e84c6c784f8b101b Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:27:56 -0400 Subject: I like the forum idea - but a map instead of inline? --- doc/forum/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/discussion.mdwn (limited to 'doc') diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn new file mode 100644 index 000000000..5e2399108 --- /dev/null +++ b/doc/forum/discussion.mdwn @@ -0,0 +1 @@ +I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. Here (will be) an experimental example: [[forum/discussion/mapexample]] -- [[JonDowland]] -- cgit v1.2.3 From 38289006e72d654825b35beed4300350e47f670f Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:30:19 -0400 Subject: a test to see if this is clearer --- doc/forum/forum/discussion/mapexample.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/forum/discussion/mapexample.mdwn (limited to 'doc') diff --git a/doc/forum/forum/discussion/mapexample.mdwn b/doc/forum/forum/discussion/mapexample.mdwn new file mode 100644 index 000000000..9edfd179b --- /dev/null +++ b/doc/forum/forum/discussion/mapexample.mdwn @@ -0,0 +1,8 @@ +This is an experiment to see if a map would be clearer for the forum sub-pages than an inline. +---- +[[!inline pages="forum/* and !forum/discussion and !forum/*/*" +actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=-1]] + +[[!map pages="forum/* and !forum/discussion and !forum/*/*"]] + -- cgit v1.2.3 From b8c7f3d4c4d59e3560198538a42aebbc2c8efb88 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:31:32 -0400 Subject: remove inadvertent header --- doc/forum/forum/discussion/mapexample.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/forum/forum/discussion/mapexample.mdwn b/doc/forum/forum/discussion/mapexample.mdwn index 9edfd179b..9933de596 100644 --- a/doc/forum/forum/discussion/mapexample.mdwn +++ b/doc/forum/forum/discussion/mapexample.mdwn @@ -1,4 +1,5 @@ This is an experiment to see if a map would be clearer for the forum sub-pages than an inline. + ---- [[!inline pages="forum/* and !forum/discussion and !forum/*/*" actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=-1]] -- cgit v1.2.3 From a15b8a62c2d2183c256ebead1d46c41e5edeb0b3 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:32:26 -0400 Subject: --- doc/forum/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn index 5e2399108..483e5e7cf 100644 --- a/doc/forum/discussion.mdwn +++ b/doc/forum/discussion.mdwn @@ -1 +1 @@ -I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. Here (will be) an experimental example: [[forum/discussion/mapexample]] -- [[JonDowland]] +I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. Here is an experimental example: [[forum/discussion/mapexample]] (apologies for the double forum/forum) -- [[JonDowland]] -- cgit v1.2.3 From f1ca9c1e5e4a2423892aafd587cf8fd533e1dca1 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:35:11 -0400 Subject: fix Xavier's links --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index ddf27d2c4..999c0c7c3 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,7 +101,7 @@ Personal sites and blogs * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[JonDowland]]'s [homepage](http://jmtd.net/) -* [[Xavier Maillard]] is using ikiwiki (http://maillard.mobi/~xma/wiki) +* [[Xavier_Maillard]] is using ikiwiki () Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From 4201010873bc152c84b846948b7c0b739f28bda1 Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:35:49 -0400 Subject: *really* fix the link :) --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 999c0c7c3..f709f5235 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,7 +101,7 @@ Personal sites and blogs * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[JonDowland]]'s [homepage](http://jmtd.net/) -* [[Xavier_Maillard]] is using ikiwiki () +* [[Xavier_Maillard]] is using ikiwiki () Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From 65e0923f51c86c71a66f230a7a79bf0c253275da Mon Sep 17 00:00:00 2001 From: "http://alcopop.org/me/openid/" Date: Mon, 20 Oct 2008 10:38:39 -0400 Subject: response --- doc/install/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index 815b80f14..2b88f6e66 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -176,3 +176,5 @@ I've tried a couple of times and my cpan has never recognised Bundle::IkiWiki. I > Are you running perl with the environemnt settings specified on the page? > Can you show how it fails to find the bundle? --[[Joey]] + +>> I was not. Next time I build I will have to try that (I'll need to tweak it as I already override PERL5LIB; also I need to specify http proxies). Thanks for your help! -- [[JonDowland]] -- cgit v1.2.3 From 09c648cf85ee5b422649dbecfb82ef5a9b275c89 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 13:14:36 -0400 Subject: response --- doc/users/xma/discussion.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'doc') diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn index 6e1134c24..2aed71b70 100644 --- a/doc/users/xma/discussion.mdwn +++ b/doc/users/xma/discussion.mdwn @@ -1 +1,8 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there a way to git clone/pull/push and thus to use our favorite [text editor](http://www.gnu.org/software/emacs) ? --[[xma]] + +> You can clone ikiwiki's [[git]] repo. I have not implemented a way to +> allow users to push doc wiki only changesets anonymously, but you can +> mails changesets to me. It would be nice to have a git recieve hook that +> checked that a commit contained only changes to .mdwn or other allowed +> extensions.. if someone writes up a good one, I'd be willing to deploy it +> for ikiwiki. --[[Joey]] -- cgit v1.2.3 From 9bad51a77661173a4126f49da8e726ae839c6922 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 15:37:27 -0400 Subject: response --- doc/forum/discussion.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'doc') diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn index 483e5e7cf..dc77d43b1 100644 --- a/doc/forum/discussion.mdwn +++ b/doc/forum/discussion.mdwn @@ -1 +1,7 @@ I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. Here is an experimental example: [[forum/discussion/mapexample]] (apologies for the double forum/forum) -- [[JonDowland]] + +> The easier way to accomplish this is to set archive=yes in the inline. +> Switching to archive view can be useful when there are a lot of long +> posts and people tend to want to scan by title to find interesting ones +> and not necessarily read them all, which probably fits this forum pretty +> well --[[Joey]] -- cgit v1.2.3 From 947fd054723473c2aabf497bbe5960da5e3fed04 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 15:38:17 -0400 Subject: turn on archive mode for forum --- doc/forum.mdwn | 2 +- doc/forum/discussion.mdwn | 2 +- doc/forum/forum/discussion/mapexample.mdwn | 9 --------- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 doc/forum/forum/discussion/mapexample.mdwn (limited to 'doc') diff --git a/doc/forum.mdwn b/doc/forum.mdwn index bab65cac6..729540774 100644 --- a/doc/forum.mdwn +++ b/doc/forum.mdwn @@ -5,4 +5,4 @@ _This is a bold experiment by me, since I have exactly such a question. This ove ## Current topics ## [[!inline pages="forum/* and !forum/discussion and !forum/*/*" -actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=0]] +archive=yes rootpage="forum" postformtext="Add a new thread titled:" show=0]] diff --git a/doc/forum/discussion.mdwn b/doc/forum/discussion.mdwn index dc77d43b1..1e55d3f57 100644 --- a/doc/forum/discussion.mdwn +++ b/doc/forum/discussion.mdwn @@ -1,4 +1,4 @@ -I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. Here is an experimental example: [[forum/discussion/mapexample]] (apologies for the double forum/forum) -- [[JonDowland]] +I like the idea of this forum heirarchy -- but I think a map would be clearer than inlining the sub-pages. -- [[JonDowland]] > The easier way to accomplish this is to set archive=yes in the inline. > Switching to archive view can be useful when there are a lot of long diff --git a/doc/forum/forum/discussion/mapexample.mdwn b/doc/forum/forum/discussion/mapexample.mdwn deleted file mode 100644 index 9933de596..000000000 --- a/doc/forum/forum/discussion/mapexample.mdwn +++ /dev/null @@ -1,9 +0,0 @@ -This is an experiment to see if a map would be clearer for the forum sub-pages than an inline. - ----- -[[!inline pages="forum/* and !forum/discussion and !forum/*/*" -actions=yes rootpage="forum" postformtext="Add a new thread titled:" show=-1]] - -[[!map pages="forum/* and !forum/discussion and !forum/*/*"]] - -- cgit v1.2.3 From 0f2764e6a6bbb9c600dc8f578ed8fa72a0202689 Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 15:44:36 -0400 Subject: --- doc/users/xma/discussion.mdwn | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn index 2aed71b70..d7c50f8a0 100644 --- a/doc/users/xma/discussion.mdwn +++ b/doc/users/xma/discussion.mdwn @@ -2,7 +2,10 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there > You can clone ikiwiki's [[git]] repo. I have not implemented a way to > allow users to push doc wiki only changesets anonymously, but you can -> mails changesets to me. It would be nice to have a git recieve hook that +> mails changesets to me. --[[Joey]] +> > How can I send you the changesets ? (git command) --[[xma]] + +> It would be nice to have a git recieve hook that > checked that a commit contained only changes to .mdwn or other allowed > extensions.. if someone writes up a good one, I'd be willing to deploy it > for ikiwiki. --[[Joey]] -- cgit v1.2.3 From df3b52589d6508ebea7d3c6754d2d4c97d9c994d Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 15:46:02 -0400 Subject: --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index f709f5235..db1727076 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,7 +101,7 @@ Personal sites and blogs * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[JonDowland]]'s [homepage](http://jmtd.net/) -* [[Xavier_Maillard]] is using ikiwiki () +* [Xavier Maillard](xma) is using ikiwiki () Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From 35e95f56e99e5e657a49d6f4abaf560c1556ed9b Mon Sep 17 00:00:00 2001 From: "http://xma.myopenid.com/" Date: Mon, 20 Oct 2008 15:49:11 -0400 Subject: --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index db1727076..dc7153e39 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -101,7 +101,7 @@ Personal sites and blogs * [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[JonDowland]]'s [homepage](http://jmtd.net/) -* [Xavier Maillard](xma) is using ikiwiki () +* [[xma]] is using ikiwiki () Please feel free to add your own ikiwiki site! -- cgit v1.2.3 From 08352165290f44d63582a6f60c88944d57701b1e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 16:19:10 -0400 Subject: response --- doc/users/xma/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) (limited to 'doc') diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn index d7c50f8a0..20cb80ee9 100644 --- a/doc/users/xma/discussion.mdwn +++ b/doc/users/xma/discussion.mdwn @@ -4,6 +4,7 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there > allow users to push doc wiki only changesets anonymously, but you can > mails changesets to me. --[[Joey]] > > How can I send you the changesets ? (git command) --[[xma]] +> > > `git-format-patch` --[[Joey]] > It would be nice to have a git recieve hook that > checked that a commit contained only changes to .mdwn or other allowed -- cgit v1.2.3 From 47294262929f6bcb1f25bf25504d53a3b864da43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 16:55:38 -0400 Subject: pull together info on converting to ikiwiki from other systems --- doc/convert.mdwn | 7 +++++++ doc/index/discussion.mdwn | 4 ++++ doc/plugins/contrib/mediawiki,mdwn | 5 +++++ doc/tips/convert_MoinMoin_and_TWiki_to_ikiwiki.mdwn | 3 +++ doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 4 ++++ 5 files changed, 23 insertions(+) create mode 100644 doc/convert.mdwn create mode 100644 doc/plugins/contrib/mediawiki,mdwn create mode 100644 doc/tips/convert_MoinMoin_and_TWiki_to_ikiwiki.mdwn create mode 100644 doc/tips/convert_mediawiki_to_ikiwiki.mdwn (limited to 'doc') diff --git a/doc/convert.mdwn b/doc/convert.mdwn new file mode 100644 index 000000000..871cd31fe --- /dev/null +++ b/doc/convert.mdwn @@ -0,0 +1,7 @@ +Do you have an existing wiki or blog using other software, and would like +to convert it to ikiwiki? Various tools and techniques have been developed +to handle such conversions. + +* [[tips/convert_mediawiki_to_ikiwiki]] +* [[tips/convert_MoinMoin_and_TWiki_to_ikiwiki]] +* [[tips/convert_blogger_blogs_to_ikiwiki]] diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn index 89e12e6c2..d52cb0a2d 100644 --- a/doc/index/discussion.mdwn +++ b/doc/index/discussion.mdwn @@ -288,6 +288,10 @@ easily, perl is possible (but I'm not strong in perl). >>> It appears the scripts were never posted? I recently imported my Mediawiki site into Iki. If it helps, my notes are here: --[[sabr]] +>>>>> The scripts have been posted now, see [[joshtriplett]]'s user page, +>>>>> and I've pulled together all ways I can find to [[convert]] other +>>>>> systems into ikiwiki. --[[Joey]] + ---- # LaTeX support? diff --git a/doc/plugins/contrib/mediawiki,mdwn b/doc/plugins/contrib/mediawiki,mdwn new file mode 100644 index 000000000..162937ed9 --- /dev/null +++ b/doc/plugins/contrib/mediawiki,mdwn @@ -0,0 +1,5 @@ +[[!template id=plugin name=sar author="[[sabr]]"]] +[[!tag type/format]] + +[The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to +process pages written using MediaWiki markup. diff --git a/doc/tips/convert_MoinMoin_and_TWiki_to_ikiwiki.mdwn b/doc/tips/convert_MoinMoin_and_TWiki_to_ikiwiki.mdwn new file mode 100644 index 000000000..5565dbd8a --- /dev/null +++ b/doc/tips/convert_MoinMoin_and_TWiki_to_ikiwiki.mdwn @@ -0,0 +1,3 @@ +[[JoshTriplett]] has developed scripts to convert MoinMoin and TWiki wikis +to ikiwikis backed by a git repository, including full history. For +details, see [[his_user_page|JoshTriplett]]. diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn new file mode 100644 index 000000000..f03703b46 --- /dev/null +++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn @@ -0,0 +1,4 @@ +[[sabr]] explains how to [import MediaWiki content into +git](http://u32.net/Mediawiki_Conversion/index.html?updated), including +full edit hostory. The [[plugins/contrib/mediawiki]] plugin can then be +used by ikiwiki to build the wiki. -- cgit v1.2.3 From f1213d3ab77218695bb2e3b6fd948eb4827c6ef5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 16:57:37 -0400 Subject: fix name --- doc/plugins/contrib/mediawiki,mdwn | 5 ----- doc/plugins/contrib/mediawiki.mdwn | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 doc/plugins/contrib/mediawiki,mdwn create mode 100644 doc/plugins/contrib/mediawiki.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/mediawiki,mdwn b/doc/plugins/contrib/mediawiki,mdwn deleted file mode 100644 index 162937ed9..000000000 --- a/doc/plugins/contrib/mediawiki,mdwn +++ /dev/null @@ -1,5 +0,0 @@ -[[!template id=plugin name=sar author="[[sabr]]"]] -[[!tag type/format]] - -[The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to -process pages written using MediaWiki markup. diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn new file mode 100644 index 000000000..162937ed9 --- /dev/null +++ b/doc/plugins/contrib/mediawiki.mdwn @@ -0,0 +1,5 @@ +[[!template id=plugin name=sar author="[[sabr]]"]] +[[!tag type/format]] + +[The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to +process pages written using MediaWiki markup. -- cgit v1.2.3 From 22ec2912bed5e0f40c35f78500c2c34cd3b7949c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 16:58:22 -0400 Subject: update --- doc/plugins/contrib/mediawiki.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/mediawiki.mdwn b/doc/plugins/contrib/mediawiki.mdwn index 162937ed9..c0a23254f 100644 --- a/doc/plugins/contrib/mediawiki.mdwn +++ b/doc/plugins/contrib/mediawiki.mdwn @@ -1,4 +1,4 @@ -[[!template id=plugin name=sar author="[[sabr]]"]] +[[!template id=plugin name=mediawiki author="[[sabr]]"]] [[!tag type/format]] [The Mediawiki plugin](http://u32.net/Mediawiki_Plugin/) allows ikiwiki to -- cgit v1.2.3 From df22dd5cbdb50f5686d15af7d288de05c4629029 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 16:59:34 -0400 Subject: add header --- doc/plugins/contrib/highlightcode.mdwn | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/highlightcode.mdwn b/doc/plugins/contrib/highlightcode.mdwn index 9b43a106c..8abb76583 100644 --- a/doc/plugins/contrib/highlightcode.mdwn +++ b/doc/plugins/contrib/highlightcode.mdwn @@ -1,3 +1,6 @@ +[[!template id=plugin name=highlightcode author="[[sabr]]"]] +[[!tag type/format]] + A small plugin to allow Ikiwiki to display source files complete with syntax highlighting. Files with recognized extensions (i.e. my-file.cpp) are be rendered just like any other Ikiwiki page. You can even edit your source files with Ikiwiki's editor. It uses the Syntax::Highlight::Engine::Kate Perl module to do the highlighting. -- cgit v1.2.3 From c746aa1a7c49ef41262a7f4853155432f10a5b30 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 18:39:01 -0400 Subject: response --- doc/users/xma/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'doc') diff --git a/doc/users/xma/discussion.mdwn b/doc/users/xma/discussion.mdwn index 20cb80ee9..c2bb62062 100644 --- a/doc/users/xma/discussion.mdwn +++ b/doc/users/xma/discussion.mdwn @@ -6,7 +6,11 @@ How do you edit this wiki (I mean [ikiwiki]) without the web browser ? Is there > > How can I send you the changesets ? (git command) --[[xma]] > > > `git-format-patch` --[[Joey]] +> > > > Glad to hear I can mail changesets to you, since I wrote the [[todo/applydiff_plugin]] wishlist entry. --[[intrigeri]] + > It would be nice to have a git recieve hook that > checked that a commit contained only changes to .mdwn or other allowed > extensions.. if someone writes up a good one, I'd be willing to deploy it > for ikiwiki. --[[Joey]] + +> > I'll think about it. It may solve some of my offline-being issues. --[[intrigeri]] -- cgit v1.2.3 From 170ebe663bdca9bde394291fcb65ab59485c681a Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 18:40:30 -0400 Subject: added link to another idea --- doc/todo/applydiff_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/todo/applydiff_plugin.mdwn b/doc/todo/applydiff_plugin.mdwn index d3eb9793b..fd0783c2b 100644 --- a/doc/todo/applydiff_plugin.mdwn +++ b/doc/todo/applydiff_plugin.mdwn @@ -54,3 +54,5 @@ modify only *one* page may be easier. Implementation ============== + +Also see [[joey]]'s idea on [[users/xma/discussion]], to allow (filtered) anonymous push to this wiki's repository. -- cgit v1.2.3 From eea52bccc967890c89cc9f87b16844a0a87ce5dc Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 18:54:04 -0400 Subject: initial plugin public apparition --- doc/plugins/contrib/po.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/plugins/contrib/po.mdwn (limited to 'doc') diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn new file mode 100644 index 000000000..06d491d01 --- /dev/null +++ b/doc/plugins/contrib/po.mdwn @@ -0,0 +1,16 @@ +I've been working on a plugin called "po", that adds support for multi-lingual wikis, +translated with gettext, using [po4a](http://po4a.alioth.debian.org/). + +More information: + +* It can be found in my "po" branch on http://repo.or.cz/w/ikiwiki/intrigeri.git +* It involves adding three hooks to ikiwiki core. +* It is documented (including TODO and plans for next work steps) in `doc/plugins/po.mdwn`, which can be found in the same branch. +* No public demo site is available so far, I'm working on this. + +My plan is to get this plugin clean enough to be included in ikiwiki. + +The current version is a proof-of-concept, mature enough for me to dare submitting it here, +but I'm prepared to hear various helpful remarks, and to rewrite parts of it as needed. + +Any thoughts on this? -- cgit v1.2.3 From 93959d45db207690da03f1da216894821bfd78da Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 18:56:21 -0400 Subject: formatting, added git clone information --- doc/plugins/contrib/po.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index 06d491d01..b22b8c179 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -3,7 +3,7 @@ translated with gettext, using [po4a](http://po4a.alioth.debian.org/). More information: -* It can be found in my "po" branch on http://repo.or.cz/w/ikiwiki/intrigeri.git +* It can be found in [my "po" branch](http://repo.or.cz/w/ikiwiki/intrigeri.git?a=shortlog;h=refs/heads/po): `git clone git://repo.or.cz/ikiwiki/intrigeri.git` * It involves adding three hooks to ikiwiki core. * It is documented (including TODO and plans for next work steps) in `doc/plugins/po.mdwn`, which can be found in the same branch. * No public demo site is available so far, I'm working on this. -- cgit v1.2.3 From 2c89dacde45d257207067cdeeb84dc7923f6cdad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 19:18:49 -0400 Subject: wow --- doc/plugins/contrib/po.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index 06d491d01..83fc6c57c 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -14,3 +14,17 @@ The current version is a proof-of-concept, mature enough for me to dare submitti but I'm prepared to hear various helpful remarks, and to rewrite parts of it as needed. Any thoughts on this? + +> Well, I think it's pretty stunning what you've done here. Seems very +> complete and well thought out. I have not read the code in great detail +> yet. +> +> Just using po files is an approach I've never seen tried with a wiki. I +> suspect it will work better for some wikis than others. For wikis that +> just want translations that match the master language as closely as +> possible and don't wander off and diverge, it seems perfect. (But what happens +> if someone edits the Discussion page of a translated page?) +> +> Please keep me posted, when you get closer to having all issues solved +> and ready for merging I can do a review and hopefully help with the +> security items you listed. --[[Joey]] -- cgit v1.2.3 From ee1ccfa863b9d56cf7ec987f7fee89c98c484b0b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 19:22:22 -0400 Subject: use relativedate as the css class for dates that should display relative --- IkiWiki/Plugin/relativedate.pm | 2 +- doc/plugins/relativedate.mdwn | 6 +++--- underlays/javascript/relativedate.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/IkiWiki/Plugin/relativedate.pm b/IkiWiki/Plugin/relativedate.pm index d9d8f7776..f4dba61a4 100644 --- a/IkiWiki/Plugin/relativedate.pm +++ b/IkiWiki/Plugin/relativedate.pm @@ -53,7 +53,7 @@ sub display ($;$) { #{{{ my $gmtime=decode_utf8(POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time))); - return ''. + return ''. IkiWiki::formattime($time, $format).''; } #}}} diff --git a/doc/plugins/relativedate.mdwn b/doc/plugins/relativedate.mdwn index 121bce477..32f8c798b 100644 --- a/doc/plugins/relativedate.mdwn +++ b/doc/plugins/relativedate.mdwn @@ -10,7 +10,7 @@ show the absolute date instead. Also, this plugin can be used with other plugins like [[prettydate]] that change how the absolute date is displayed. If this plugin is enabled, you may also add relative dates to pages in the -wiki, by using html elements in the "date" class. For example, this will -display as a relative date: +wiki, by using html elements in the "relativedate" class. For example, this +will display as a relative date: - Fri Oct 17 18:36:13 EDT 2008 + Fri Oct 17 18:36:13 EDT 2008 diff --git a/underlays/javascript/relativedate.js b/underlays/javascript/relativedate.js index c5e62b3cc..8e05d4065 100644 --- a/underlays/javascript/relativedate.js +++ b/underlays/javascript/relativedate.js @@ -1,4 +1,4 @@ -// Causes html elements in the 'date' and 'pagedate' classes to be displayed +// Causes html elements in the 'relativedate' class to be displayed // as relative dates. The date is parsed from the title attribute, or from // the element content. @@ -7,7 +7,7 @@ var dateElements; hook("onload", getDates); function getDates() { - dateElements = getElementsByClass('date'); + dateElements = getElementsByClass('relativedate'); for (var i = 0; i < dateElements.length; i++) { var elt = dateElements[i]; var title = elt.attributes.title; -- cgit v1.2.3 From 94797b66c4d7f807245aa4bf09dd645468079142 Mon Sep 17 00:00:00 2001 From: intrigeri Date: Mon, 20 Oct 2008 19:45:49 -0400 Subject: answering joey --- doc/plugins/contrib/po.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index ad06e8570..cbc046d98 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -28,3 +28,19 @@ Any thoughts on this? > Please keep me posted, when you get closer to having all issues solved > and ready for merging I can do a review and hopefully help with the > security items you listed. --[[Joey]] + +>> Thanks a lot for your quick review, it's reassuring to hear such nice words +>> from you. I did not want to design and write a full translation system, when +>> tools such as gettext/po4a already have all the needed functionality, for cases +>> where the master/slave languages paradigm fits. +>> Integrating these tools into ikiwiki plugin system was a pleasure. +>> +>> I'll tell you when I'm ready for merging, but in the meantime, +>> I'd like you to review the changes I did to the core (3 added hooks). +>> Can you please do this? If not, I'll go on and hope I'm not going to far in +>> the wrong direction. +>> +>> The Discussion pages issue is something I am not sure about yet. But I will +>> probably decide that "slave" pages, being only translations, don't deserve +>> a discussion page: the discussion should happen in the language in which the +>> pages are written for real, which is the "master" one. --[[intrigeri]] -- cgit v1.2.3 From dbf8358d6805fd81925dde1fd9ff3f10dc99fb77 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 20:16:30 -0400 Subject: bit of a design for how a post-receive hook could work --- doc/todo/applydiff_plugin.mdwn | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'doc') diff --git a/doc/todo/applydiff_plugin.mdwn b/doc/todo/applydiff_plugin.mdwn index fd0783c2b..b8ddcd6ce 100644 --- a/doc/todo/applydiff_plugin.mdwn +++ b/doc/todo/applydiff_plugin.mdwn @@ -56,3 +56,40 @@ Implementation ============== Also see [[joey]]'s idea on [[users/xma/discussion]], to allow (filtered) anonymous push to this wiki's repository. + +> Ideally the filtering should apply the same constraints on what's pushed +> as are applied to web edits. So locked pages can't be changed, etc. +> +> That could be accomplished by making the git pre-receive hook be a +> ikiwiki wrapper. A new `git_receive_wrapper` config setting could cause +> the wrapper to be generated, with `$config{receive}` set to true. +> +> When run that way, ikiwiki would call `rcs_receive`. In the case of git, +> that would look at the received changes as fed into the hook on stdin, +> and use `parse_diff_tree` to get a list of the files changed. Then it +> could determine if the changes were allowed. +> +> To do that, it should perhaps first look at what unix user received the +> commit. That could be mapped directly to an ikiwiki user. This would +> typically be an unprivelidged user, but you might also want to set up +> separate users who have fewer limits on what they can push. OTOH, I'm not +> sure how to get this info in an ikiwiki wrapper.. the real and effective +> gid are already trampled. So maybe leave this out and always treat it as +> an anonymous edit from a non-logged in user? +> +> Then it seems like it would want to call `check_canedit` to test if an +> edit to each changed page is allowed. Might also want to call +> `check_canattach` and `check_canremove` if the attach and remove plugins +> are enabled. All three expect to be passed a CGI and a CGI::Session +> object, which is a bit problimatic here. So dummy the objects up? (To call +> `check_canattach` the changed attachment would need to be extracted to a +> temp file for it to check..) +> +> If a change is disallowed, it would print out what was disallowed, and +> exit nonzero. I think that git then discards the pushed objects (or maybe +> they remain in the database until `git-gc` .. if so, that could be used +> to DOS by uploading junk, so need to check this point). +> +> Also, I've not verified that the objects have been recieved already when +> whe pre-receive hook is called. Although the docs seem to say that is the +> case. --[[Joey]] -- cgit v1.2.3 From 2af90681c713c4b54d1dfb7f1cc94cd8bc78a751 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 20:32:07 -0400 Subject: re-encode to utf-8 I noticed the Fedora package doing this as part of its build. --- doc/tips/vim_syntax_highlighting/ikiwiki.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/tips/vim_syntax_highlighting/ikiwiki.vim b/doc/tips/vim_syntax_highlighting/ikiwiki.vim index fd87f49a2..bbcad4239 100644 --- a/doc/tips/vim_syntax_highlighting/ikiwiki.vim +++ b/doc/tips/vim_syntax_highlighting/ikiwiki.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: Ikiwiki (links) -" Maintainer: Recai Okta (roktasATdebian.org) +" Maintainer: Recai Oktaş (roktasATdebian.org) " Last Change: 2007 May 29 " Instructions: -- cgit v1.2.3 From 9eb995ba9de2c1ffb76126a5c7b9e74a9b85040d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 20:34:29 -0400 Subject: randomly stumbled over fedora packages of ikiwiki --- doc/download.mdwn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'doc') diff --git a/doc/download.mdwn b/doc/download.mdwn index 6566dc122..86ddb46b2 100644 --- a/doc/download.mdwn +++ b/doc/download.mdwn @@ -24,6 +24,8 @@ Or download the deb from . There is a backport of a recent version of ikiwiki for Debian 4.0 at . +Fedora versions 8 and newer have RPMs of ikiwiki available. + There is also an unofficial backport of ikiwiki for Ubuntu Hardy, provided by [[Paweł_Tęcza|users/ptecza]], at [http://gpa.net.icm.edu.pl/ubuntu/](http://gpa.net.icm.edu.pl/ubuntu/index-en.html). -- cgit v1.2.3 From ec566c02fdf4e1f76e6559afbb8c01ec772412f8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 20:57:42 -0400 Subject: response --- doc/plugins/contrib/po.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'doc') diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn index cbc046d98..30ede95a6 100644 --- a/doc/plugins/contrib/po.mdwn +++ b/doc/plugins/contrib/po.mdwn @@ -40,6 +40,14 @@ Any thoughts on this? >> Can you please do this? If not, I'll go on and hope I'm not going to far in >> the wrong direction. >> +>>> Sure.. I'm not completly happy with any of the hooks since they're very +>>> special purpose, and also since `run_hooks` is not the best interface +>>> for a hook that modifies a variable, where only the last hook run will +>>> actually do anything. It might be better to just wrap +>>> `targetpage`, `bestlink`, and `beautify_urlpath`. But, I noticed +>>> the other day that such wrappers around exported functions are only visible by +>>> plugins loaded after the plugin that defines them. +>> >> The Discussion pages issue is something I am not sure about yet. But I will >> probably decide that "slave" pages, being only translations, don't deserve >> a discussion page: the discussion should happen in the language in which the -- cgit v1.2.3 From cc311beef30bb73a460ce3c573401d6db2d85a80 Mon Sep 17 00:00:00 2001 From: AndrewGreenberg Date: Mon, 20 Oct 2008 21:34:02 -0400 Subject: Added "SVG aren't images" bug. --- doc/bugs/SVG_files_not_recognized_as_images.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/bugs/SVG_files_not_recognized_as_images.mdwn (limited to 'doc') diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn new file mode 100644 index 000000000..2339b075a --- /dev/null +++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn @@ -0,0 +1,5 @@ +In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm, the hardcoded list of image file extensions does not include ".svg", which it probably should unless there's some other issue about rendering SVGs? + +The 'img' plugin also seems to not support SVGs. + + -- cgit v1.2.3 From 59ef1ebe5dbe10b48024f48f665dceef8d735a88 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 20 Oct 2008 21:51:33 -0400 Subject: response --- doc/bugs/SVG_files_not_recognized_as_images.mdwn | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/bugs/SVG_files_not_recognized_as_images.mdwn b/doc/bugs/SVG_files_not_recognized_as_images.mdwn index 2339b075a..41452e7c1 100644 --- a/doc/bugs/SVG_files_not_recognized_as_images.mdwn +++ b/doc/bugs/SVG_files_not_recognized_as_images.mdwn @@ -1,5 +1,15 @@ -In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm, the hardcoded list of image file extensions does not include ".svg", which it probably should unless there's some other issue about rendering SVGs? +In ikiwiki 2.66, SVG images are not recognized as images. In ikiwiki.pm, +the hardcoded list of image file extensions does not include ".svg", which +it probably should unless there's some other issue about rendering SVGs? The 'img' plugin also seems to not support SVGs. - +> SVG images can only be included via an ``, ``, or +> `