From 9d51be7942f3aecc0d304c578465ef7397cbd035 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 9 Nov 2011 23:43:00 +0000 Subject: [PATCH 001/460] Document trail plugin v3 --- doc/plugins/contrib/album.mdwn | 3 + .../contrib/ikiwiki/directive/trail.mdwn | 24 +++ .../ikiwiki/directive/trailinline.mdwn | 11 ++ .../contrib/ikiwiki/directive/trailitem.mdwn | 9 ++ .../contrib/ikiwiki/directive/traillink.mdwn | 16 ++ doc/plugins/contrib/trail.mdwn | 148 ++++++++++-------- doc/todo/Pagination_next_prev_links.mdwn | 22 +++ 7 files changed, 170 insertions(+), 63 deletions(-) create mode 100644 doc/plugins/contrib/ikiwiki/directive/trail.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/traillink.mdwn diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn index 8dfbbf716..dde533e76 100644 --- a/doc/plugins/contrib/album.mdwn +++ b/doc/plugins/contrib/album.mdwn @@ -6,6 +6,9 @@ Available from [[smcv]]'s git repository, in the `album2` branch. Older (pre-rebase) versions in `album`, `album-live` (the latter was used on an actual website and didn't explode too much). +[The version currently available hasn't been modified to work with the +November 2011 version of [[trail]]. -[[smcv]]] + This plugin formats a collection of images into a photo album, in the same way as many websites: good examples include the PHP application [Gallery](http://gallery.menalto.com/), Flickr, diff --git a/doc/plugins/contrib/ikiwiki/directive/trail.mdwn b/doc/plugins/contrib/ikiwiki/directive/trail.mdwn new file mode 100644 index 000000000..cf8c370a7 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/trail.mdwn @@ -0,0 +1,24 @@ +The `trail` directive is supplied by the +[[!iki plugins/contrib/trail desc=trail]] plugin. It sets options for the +trail represented by this page, and can also add pages to the trail. Example usage: + + \[[!trail sort="meta(title)" circular="no"]] + +The available options are: + +* `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail + +* `pagenames`: adds a space-separated list of pages to the trail, + with the same [[SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]] + +* `sort`: sets a [[ikiwiki/pagespec/sorting]] order; if not specified, the + items of the trail are ordered according to the first link to each item + found on the trail page + +* `reverse`: reverses the [[ikiwiki/pagespec/sorting]] order + +* `circular`: if set to `yes` or `1`, the trail is made into a loop by + making the last page's "next" link point to the first page, and the first + page's "previous" link point to the last page + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn b/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn new file mode 100644 index 000000000..4fae7ac8a --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn @@ -0,0 +1,11 @@ +The `trailinline` directive is provided by the +[[!iki plugins/contrib/trail desc=trail]] +plugin. It is equivalent to combining [[ikiwiki/directive/trail]] and +[[ikiwiki/directive/inline]] directives with the same options. + +A typical use is to navigate through all posts in a blog: + + \[[!trailinline pages="page(./posts/*) and !*/Discussion" archive=yes + feedshow=10 quick=yes]] + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn b/doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn new file mode 100644 index 000000000..73b1985a5 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/trailitem.mdwn @@ -0,0 +1,9 @@ +The `trailitem` directive is supplied by the +[[!iki plugins/contrib/trail desc=trail]] plugin. It is used like this: + + \[[!trailitem some_other_page]] + +to add `some_other_page` to the trail represented by this page, without +generating a visible hyperlink. + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/traillink.mdwn b/doc/plugins/contrib/ikiwiki/directive/traillink.mdwn new file mode 100644 index 000000000..0e40e2411 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/traillink.mdwn @@ -0,0 +1,16 @@ +The `traillink` directive is supplied by the +[[!iki plugins/contrib/trail desc=trail]] +plugin. It generates a visible [[ikiwiki/WikiLink]], and also adds the +linked page to the trail represented by the page containing the directive. + +In its simplest form, the first parameter is like the content of a WikiLink: + + \[[!traillink some_other_page]] + +The displayed text can also be overridden, either with a `|` symbol or with +a `text` parameter: + + \[[!traillink Click_here_to_start_the_trail|some_other_page]] + \[[!traillink some_other_page text="Click here to start the trail"]] + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index def91d85a..6b96585b8 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -1,95 +1,117 @@ -[[!tag type/chrome patch]] +[[!tag patch]] [[!template id=gitbranch branch=smcv/trail author="[[smcv]]"]] Available from [[smcv]]'s git repository, in the `trail` branch. This -plugin aims to solve [[todo/wikitrails]] in a simpler way. +plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be +used for [[navigation through blog posts|Pagination_next_prev_links]]. -Updated, June 2011: +The branch also includes machinery to run most of the IkiWiki regression +tests under [[!cpan Devel::Cover]]. -* removed `inline` integration for now +Demo: -* added `` tags +* [a trail based on links](http://demo.hosted.pseudorandom.co.uk/trail/) +* [a hybrid trail/inline](http://demo.hosted.pseudorandom.co.uk/trail2/) -* switched from a custom data structure to using typed links +The page `e` in the demo is in both trails, to demonstrate how that looks. + +The `smcv/trail2` branch is an older version of `trail` which used typed links +as its data structure, resulting in timing-related limitations (it couldn't +select pages for the trail by using pagespecs, because pagespecs can't be +evaluated correctly until the scan stage has finished). + +Updated, November 2011: + +* reinstated `inline` integration ([[report]] integration would probably be + pretty easy too, if this gets merged) + +* switched from typed links back to a custom data structure to avoid + chicken/egg problems with ordering + +* create typed links too, as a side-effect, but not when using an inline + +* regression test with nearly full coverage + +* CSS for the default anti-theme and all built-in themes (it looks nicest + in the default anti-theme and in actiontabs - the demo uses actiontabs) + +Known bugs: + +* the blueview and goldtype CSS nearly work, but the alignment is a bit off ---- [[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]] +[[!tag type/chrome]] -It's sometimes useful to have "trails" of pages in a wiki, as a guided -tour, sequence of chapters etc. In this plugin, a trail is represented -by a page, and the pages in the trail are indicated by specially marked -links within that page. +This plugin provides the [[ikiwiki/directive/trail]], +[[ikiwiki/directive/traillink]], [[ikiwiki/directive/trailitem]], +and [[ikiwiki/directive/trailinline]] [[directives|ikiwiki/directive]]. + +It's sometimes useful to have "trails" of pages in a wiki where each +page links to the next and/or previous page. For instance, you could use +this for a guided tour, sequence of chapters, or sequence of blog posts. + +In this plugin, a trail is represented by a page, and the pages in the +trail are indicated by specially marked links within that page, or by +including groups of pages with a [[ikiwiki/directive]]. If using the default `page.tmpl`, each page automatically displays the trails that it's a member of (if any), with links to the trail and to the next and previous members. HTML `` tags with the `prev`, `next` and `up` relations are also generated. -The `traillink` [[ikiwiki/directive]] is used to record which pages -are in a trail, and simultaneously link to them. Alternatively, the -[[ikiwiki/directive/trailitem]] directive can be used to make an -invisible `traillink`. +Pages can be included in a trail in various ways: -## Directives +* The [[ikiwiki/directive/trailinline]] directive sets up an [[inline]], + and at the same time adds the matching pages (from `pages` or `pagenames`) + to the trail. One use is to navigate through all posts in a blog: -(These will go to the appropriate pages in [[ikiwiki/directive]] if this -plugin is included in ikiwiki.) + \[[!trailinline pages="page(./posts/*) and !*/Discussion" archive=yes + feedshow=10 quick=yes]] -### trailitem + This directive only works if the [[!iki plugins/inline desc=inline]] + plugin is also enabled. -The `trailitem` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]] -plugin. It is used like this: +* The [[ikiwiki/directive/trail]] directive has optional `pages` and + `pagenames` options which behave the same as in [[inline]], but don't + produce any output in the page, so you can have trails that don't list + all their pages. - \[[!trailitem some_other_page]] +* The [[ikiwiki/directive/traillink]] directive makes a visible link + and also adds the linked page to the trail. This will typically be + used in a bullet list, but could also be in paragraph text: -to add `some_other_page` to the trail represented by this page, without -generating a visible hyperlink. + * [[!traillink Introduction]] + * [[!traillink "Chapter 1"]] + * [[!traillink Chapter_2]] + * [[!traillink Appendix_A]] -### traillink + or -The `traillink` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]] -plugin. It generates a visible [[ikiwiki/WikiLink]], and also adds the linked page to -the trail represented by the page containing the directive. + To use this software you must \[[!traillink install]] it, + \[[!traillink configuration text="configure it"]], + and finally \[[!traillink running|run_it]]. -In its simplest form, the first parameter is like the content of a WikiLink: + This also counts as a [[ikiwiki/WikiLink]] for things like the `link()` + [[ikiwiki/PageSpec]] item. - \[[!traillink some_other_page]] +* The [[ikiwiki/directive/trailitem]] directive adds a page to the trail + like `traillink`, but produces an invisible link, rather like `\[[!tag]]`: -The displayed text can also be overridden, either with a `|` symbol or with -a `text` parameter: + To use this software you must \[[!traillink install]] it, + \[[!trailitem installing_from_packages]] + \[[!trailitem installing_from_source]] + \[[!traillink configuration text="configure it"]], + and finally \[[!traillink running|run_it]]. + \[[!trailitem troubleshooting]] - \[[!traillink Click_here_to_start_the_trail|some_other_page]] - \[[!traillink some_other_page text="Click here to start the trail"]] + Like `\[[!tag]]`, this still counts as a [[ikiwiki/WikiLink]] even though + there's no visible link. -### trailoptions +You can mix several of these directives in one page, and the resulting +trail will contain all of the pages matched by any of the directives, +in the same order as the directives (unless you use the `sort` option +on `\[[!trail]]` or `\[[!trailinline]]`, which takes precedence). -The `trailoptions` directive is supplied by the [[!iki plugins/contrib/trail desc=trail]] -plugin. It sets options for the trail represented by this page. Example usage: - - \[[!trailoptions sort="meta(title)" circular="no"]] - -The available options are: - -* `sort`: sets a [[ikiwiki/pagespec/sorting]] order; if not specified, the - items of the trail are ordered according to the first link to each item - found on the trail page - -* `circular`: if set to `yes` or `1`, the trail is made into a loop by - making the last page's "next" link point to the first page, and the first - page's "previous" link point to the last page - ----- - -## Future directions - -The current version of this plugin doesn't implement inline-based or -otherwise [[ikiwiki/PageSpec]]-based trails. This is difficult because -there's a circular dependency: - -* adding typed links should happen *before* scanning has finished, to - guarantee that they're available before the first page is rendered - -* evaluating pagespecs should only happen *after* scanning has finished, - to guarantee that everything you might want to base a pagespec on - (`meta`, etc.) has been gathered by scanning +The [[ikiwiki/directive/trail]] directive can also be used to set options. diff --git a/doc/todo/Pagination_next_prev_links.mdwn b/doc/todo/Pagination_next_prev_links.mdwn index f1c12d33f..e2b56a0cc 100644 --- a/doc/todo/Pagination_next_prev_links.mdwn +++ b/doc/todo/Pagination_next_prev_links.mdwn @@ -27,7 +27,29 @@ Thank you > reduces the generic usefulness of typed links, though - in particular > you can no longer use "is part of trail A" in a PageSpec. --[[smcv]] +>> Version 3 of [[plugins/contrib/trail]] now does this. For `traillink` +>> and `trailitem` it additionally adds a typed link, which it does not +>> itself consume; for `trailinline` and `trail` it doesn't. --[[smcv]] + >>> Indeed, I know the problem; I ran into the same kind of thing with my [[plugins/contrib/report]] plugin and its `trail` concept. >>> I simply had to declare that one couldn't use "trail" and "maketrail" options within the same report. That way, "maketrail" will add links in the "scan" pass, and "trail" will test for links in the "build" pass. That usually works. --[[KathrynAndersen]] +>>>> I'm not sure that even that is *quite* right: if your `trail` takes +>>>> pagespecs as arguments, then it's potentially evaluating those pagespecs +>>>> before all pages have been scanned, which could mean it lists pages +>>>> which matched the spec before a recent change, or doesn't list pages +>>>> which didn't previously match the spec but do now. +>>>> +>>>> In version 3 of [[plugins/contrib/trail]] I ended up storing +>>>> uninterpreted pagespecs and links at scan time, and evaluating them the +>>>> first time a page is built. I *think* that's sufficiently lazy to give +>>>> the right answer... --[[smcv]] + >> Do you have an example? --[[hendry]] + +>>> Now linked on the plugin's page - it doesn't pretend to be a blog, but +>>> [the second demo](http://demo.hosted.pseudorandom.co.uk/trail2/) +>>> is a `trailinline`, so you could do that with blog posts just as well. +>>> Making [[plugins/contrib/album]] require `trail` v3, and trying it out +>>> on my blog, are next on the list. +>>> --[[smcv]] From cbea2d78d2153b3af29d80fc6d3992304c981a70 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 9 Nov 2011 23:44:05 +0000 Subject: [PATCH 002/460] fix broken link --- doc/plugins/contrib/trail.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 6b96585b8..9b8da32d0 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -3,7 +3,7 @@ Available from [[smcv]]'s git repository, in the `trail` branch. This plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be -used for [[navigation through blog posts|Pagination_next_prev_links]]. +used for [[navigation through blog posts|todo/Pagination_next_prev_links]]. The branch also includes machinery to run most of the IkiWiki regression tests under [[!cpan Devel::Cover]]. From 6b4351acbaf91b5420e9e5aba985b3f1378bb966 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 9 Nov 2011 23:49:30 +0000 Subject: [PATCH 003/460] request test coverage machinery, propose branch --- doc/plugins/contrib/trail.mdwn | 3 +-- doc/todo/test_coverage.mdwn | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 doc/todo/test_coverage.mdwn diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 9b8da32d0..5adff4c78 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -5,8 +5,7 @@ Available from [[smcv]]'s git repository, in the `trail` branch. This plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be used for [[navigation through blog posts|todo/Pagination_next_prev_links]]. -The branch also includes machinery to run most of the IkiWiki regression -tests under [[!cpan Devel::Cover]]. +The branch also includes [[todo/test_coverage]] machinery. Demo: diff --git a/doc/todo/test_coverage.mdwn b/doc/todo/test_coverage.mdwn new file mode 100644 index 000000000..4c0e9e16c --- /dev/null +++ b/doc/todo/test_coverage.mdwn @@ -0,0 +1,18 @@ +[[!tag patch]] +[[!template id=gitbranch branch=smcv/coverage author="[[smcv]]"]] + +It would be nice for `make coverage` (or something) to produce a HTML +test-coverage report. I found this very useful for test-driven development of +[[plugins/contrib/trail]]. + +Limitations of the current branch, which uses [[!cpan Devel::Cover]]: + +* Some tests use `./blib` and some use `.` so coverage gets split between + the two copies of each module; not a problem for [[plugins/contrib/trail]] + which only has one test. + +* The [[plugins/git]] and [[plugins/mercurial]] plugins want to `chdir`, + and so does [[!cpan Devel::Cover]], so they fight. For now, those tests + are disabled under `make coverage`. + +--[[smcv]] From 0c9b67136089cdde67cd01dea0d1a7f483538b19 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Thu, 10 Nov 2011 02:22:05 -0400 Subject: [PATCH 004/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index ddf1ecd84..a7605534e 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]]. +and is [[FreeSoftware]] [[http://1800woodworking.com|Wood]]. From 86fe017a542d2e5c5f60b92543cc8737600d6bb4 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Thu, 10 Nov 2011 02:22:53 -0400 Subject: [PATCH 005/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index a7605534e..941aeda66 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] [[http://1800woodworking.com|Wood]]. +and is [[FreeSoftware]] [[Wood|http://1800woodworking.com]]. From c1aa4451bfab2431edc040985d20b3d77c7cd953 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI" Date: Thu, 10 Nov 2011 02:43:49 -0400 Subject: [PATCH 006/460] spam bye bye --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 941aeda66..ddf1ecd84 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] [[Wood|http://1800woodworking.com]]. +and is [[FreeSoftware]]. From 795b22f736370bc35687b3dcfa80a971177cb134 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:10:43 -0400 Subject: [PATCH 007/460] --- doc/users/Terry_Golubiewski.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/users/Terry_Golubiewski.mdwn b/doc/users/Terry_Golubiewski.mdwn index 15b995270..edf871843 100644 --- a/doc/users/Terry_Golubiewski.mdwn +++ b/doc/users/Terry_Golubiewski.mdwn @@ -1,2 +1,3 @@ +[[!meta title="Terry Golubiewski"]] Terry Golubiewski likes to program in C++ and manages software projects. Terry is just starting to use ikiwiki. From c9f52c61712e511a82c00ffebdecd912d9224701 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:11:12 -0400 Subject: [PATCH 008/460] rename users/Terry_Golubiewski.mdwn to users/tjgolubi.mdwn --- doc/users/{Terry_Golubiewski.mdwn => tjgolubi.mdwn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/users/{Terry_Golubiewski.mdwn => tjgolubi.mdwn} (100%) diff --git a/doc/users/Terry_Golubiewski.mdwn b/doc/users/tjgolubi.mdwn similarity index 100% rename from doc/users/Terry_Golubiewski.mdwn rename to doc/users/tjgolubi.mdwn From 30b16fdf0ca51a5048cd16487da03ee0b329bd27 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:11:12 -0400 Subject: [PATCH 009/460] update for rename of users/Terry_Golubiewski.mdwn to users/tjgolubi.mdwn --- doc/plugins/contrib/mscgen.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/mscgen.mdwn b/doc/plugins/contrib/mscgen.mdwn index 63d6512c3..792aaa4e3 100644 --- a/doc/plugins/contrib/mscgen.mdwn +++ b/doc/plugins/contrib/mscgen.mdwn @@ -1,4 +1,4 @@ -[[!template id=plugin name=mscgen author="[[users/Terry_Golubiewski]]"]] +[[!template id=plugin name=mscgen author="[[users/Tjgolubi]]"]] [[!tag type/widget]] ## NAME From fd29916bff3a25e6fd38fc3f0bebf1473ea51a4a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:13:26 -0400 Subject: [PATCH 010/460] --- doc/users/tjgolubi2.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/users/tjgolubi2.mdwn diff --git a/doc/users/tjgolubi2.mdwn b/doc/users/tjgolubi2.mdwn new file mode 100644 index 000000000..f5c06c79c --- /dev/null +++ b/doc/users/tjgolubi2.mdwn @@ -0,0 +1,4 @@ +[[!meta title="Terry Golubiewski"]] + +Terry Golubiewski likes to program in C++ and manages software projects. +Terry is just starting to use ikiwiki. From d6b9ef678547158fd574c8daac60e78db776409b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:15:15 -0400 Subject: [PATCH 011/460] removed --- doc/users/tjgolubi2.mdwn | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 doc/users/tjgolubi2.mdwn diff --git a/doc/users/tjgolubi2.mdwn b/doc/users/tjgolubi2.mdwn deleted file mode 100644 index f5c06c79c..000000000 --- a/doc/users/tjgolubi2.mdwn +++ /dev/null @@ -1,4 +0,0 @@ -[[!meta title="Terry Golubiewski"]] - -Terry Golubiewski likes to program in C++ and manages software projects. -Terry is just starting to use ikiwiki. From b197506d6f585426f7580437f91d1d612810f772 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Thu, 10 Nov 2011 13:16:35 -0400 Subject: [PATCH 012/460] --- doc/todo/Support_MultiMarkdown_3.X.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/Support_MultiMarkdown_3.X.mdwn b/doc/todo/Support_MultiMarkdown_3.X.mdwn index f7f0ec8e5..ad724442b 100644 --- a/doc/todo/Support_MultiMarkdown_3.X.mdwn +++ b/doc/todo/Support_MultiMarkdown_3.X.mdwn @@ -7,4 +7,4 @@ but I'd rather not change the system file or uninstall the perl modules. Perhaps a custom Plugin/mdwn.pm or a clever way to set $markdown_sub would suffice, but I don't know perl. If I wanted to replace Plugin/mdwn.pm with something simple that didn't bother to check for Text::*Markdown, calling /home/me/bin/mymdwn instead, -what would that look like? +what would that look like? -- [[tjgolubi]] From acd8d983943f5ae9c3730f1686783c7aa0b0646c Mon Sep 17 00:00:00 2001 From: micahrl Date: Thu, 10 Nov 2011 15:32:19 -0400 Subject: [PATCH 013/460] --- doc/forum/Help_with_tag__95__autocreate.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Help_with_tag__95__autocreate.mdwn diff --git a/doc/forum/Help_with_tag__95__autocreate.mdwn b/doc/forum/Help_with_tag__95__autocreate.mdwn new file mode 100644 index 000000000..213a8c62b --- /dev/null +++ b/doc/forum/Help_with_tag__95__autocreate.mdwn @@ -0,0 +1,7 @@ +I have the tag plugin enabled, and these additional lines in my setup file: + + tagbase => "tags", + tag_autocreate => 1, + tag_autocreate_commit => 1, + +However, when I use a !tag or !taglink directive, nothing gets autocreated in the tags/ directory. What am I doing wrong? From 1cf7d53ad670eb4181cd50d061ad0ee8ff70497e Mon Sep 17 00:00:00 2001 From: micahrl Date: Thu, 10 Nov 2011 15:47:02 -0400 Subject: [PATCH 014/460] added ikiwiki version. --- doc/forum/Help_with_tag__95__autocreate.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/forum/Help_with_tag__95__autocreate.mdwn b/doc/forum/Help_with_tag__95__autocreate.mdwn index 213a8c62b..1b28c18ae 100644 --- a/doc/forum/Help_with_tag__95__autocreate.mdwn +++ b/doc/forum/Help_with_tag__95__autocreate.mdwn @@ -5,3 +5,5 @@ I have the tag plugin enabled, and these additional lines in my setup file: tag_autocreate_commit => 1, However, when I use a !tag or !taglink directive, nothing gets autocreated in the tags/ directory. What am I doing wrong? + +Edit: I'm using ikiwiki version 3.20100122ubuntu1 on Ubuntu 10.04.3 LTS. From 2a1fac91f03119aaf767f5a3439123a9cdcc7af1 Mon Sep 17 00:00:00 2001 From: micahrl Date: Thu, 10 Nov 2011 15:49:48 -0400 Subject: [PATCH 015/460] --- doc/forum/Help_with_tag__95__autocreate.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Help_with_tag__95__autocreate.mdwn b/doc/forum/Help_with_tag__95__autocreate.mdwn index 1b28c18ae..f470c57cf 100644 --- a/doc/forum/Help_with_tag__95__autocreate.mdwn +++ b/doc/forum/Help_with_tag__95__autocreate.mdwn @@ -6,4 +6,4 @@ I have the tag plugin enabled, and these additional lines in my setup file: However, when I use a !tag or !taglink directive, nothing gets autocreated in the tags/ directory. What am I doing wrong? -Edit: I'm using ikiwiki version 3.20100122ubuntu1 on Ubuntu 10.04.3 LTS. +Edit: I'm using ikiwiki version 3.20100122ubuntu1 on Ubuntu 10.04.3 LTS... upgraded to ikiwiki_3.20110905_all from the debian repository and that solved my problem. Oops. :) From c231b6770b82d136771dbe862b5a1164f84f17d9 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Thu, 10 Nov 2011 17:46:56 -0400 Subject: [PATCH 016/460] manual installation / a known bug --- doc/plugins/contrib/trail.mdwn | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 5adff4c78..3ffe5a868 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -5,14 +5,31 @@ Available from [[smcv]]'s git repository, in the `trail` branch. This plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be used for [[navigation through blog posts|todo/Pagination_next_prev_links]]. +Manual installation requires these files (use the "raw" link in gitweb to download): + +* [trail.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/IkiWiki/Plugin/trail.pm) + in an `IkiWiki/Plugin` subdirectory of your configured `plugindir` +* [page.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/templates/page.tmpl) + and + [trails.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/templates/trails.tmpl) + in your configured `templatedir`, or a `templates` subdirectory of your wiki repository +* the trail-related bits from the end of the + [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/doc/style.css) +* the trail-related bits at the end of the + [actiontabs](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/themes/actiontabs/style.css) + or [blueview](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/themes/blueview/style.css) + stylesheets, if you use one of those themes + The branch also includes [[todo/test_coverage]] machinery. Demo: -* [a trail based on links](http://demo.hosted.pseudorandom.co.uk/trail/) -* [a hybrid trail/inline](http://demo.hosted.pseudorandom.co.uk/trail2/) +* [in use on entries in my blog](http://smcv.pseudorandom.co.uk/) +* [a demo trail based on links](http://demo.hosted.pseudorandom.co.uk/trail/) +* [a demo hybrid trail/inline](http://demo.hosted.pseudorandom.co.uk/trail2/) -The page `e` in the demo is in both trails, to demonstrate how that looks. +The page `e` is in both demo trails, to demonstrate how a page in more than +one trail looks. The `smcv/trail2` branch is an older version of `trail` which used typed links as its data structure, resulting in timing-related limitations (it couldn't @@ -23,20 +40,17 @@ Updated, November 2011: * reinstated `inline` integration ([[report]] integration would probably be pretty easy too, if this gets merged) - * switched from typed links back to a custom data structure to avoid chicken/egg problems with ordering - * create typed links too, as a side-effect, but not when using an inline - * regression test with nearly full coverage - * CSS for the default anti-theme and all built-in themes (it looks nicest in the default anti-theme and in actiontabs - the demo uses actiontabs) Known bugs: * the blueview and goldtype CSS nearly work, but the alignment is a bit off +* a `trailinline` with no `sort` option is sorted in arbitrary order ---- From 0e0abda31b681e0b62c398ba1b043ef23e0b5b11 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Fri, 11 Nov 2011 12:43:10 -0400 Subject: [PATCH 017/460] --- doc/tips/Adding_Disqus_to_your_wiki/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/tips/Adding_Disqus_to_your_wiki/discussion.mdwn diff --git a/doc/tips/Adding_Disqus_to_your_wiki/discussion.mdwn b/doc/tips/Adding_Disqus_to_your_wiki/discussion.mdwn new file mode 100644 index 000000000..4f2e13700 --- /dev/null +++ b/doc/tips/Adding_Disqus_to_your_wiki/discussion.mdwn @@ -0,0 +1 @@ +This appears to add the Disqus code to every page, including Archive pages and the blog index. Is there a way to only add it to the blog posts? From ad02a40b3b253984078514696291a06b28a12844 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 12 Nov 2011 10:37:24 -0400 Subject: [PATCH 018/460] clearer branch naming --- doc/plugins/contrib/trail.mdwn | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 3ffe5a868..fc43afef4 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -1,24 +1,26 @@ [[!tag patch]] -[[!template id=gitbranch branch=smcv/trail author="[[smcv]]"]] +[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]] -Available from [[smcv]]'s git repository, in the `trail` branch. This +Available from [[smcv]]'s git repository, in the `trail3` branch. This plugin aims to solve [[todo/wikitrails]] in a simpler way; it can also be used for [[navigation through blog posts|todo/Pagination_next_prev_links]]. -Manual installation requires these files (use the "raw" link in gitweb to download): +If you don't want to use a branch of ikiwiki, manual installation requires +these files (use the "raw" link in gitweb to download): -* [trail.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/IkiWiki/Plugin/trail.pm) +* [trail.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/IkiWiki/Plugin/trail.pm) in an `IkiWiki/Plugin` subdirectory of your configured `plugindir` -* [page.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/templates/page.tmpl) +* [page.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/page.tmpl) and - [trails.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/templates/trails.tmpl) + [trails.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/templates/trails.tmpl) in your configured `templatedir`, or a `templates` subdirectory of your wiki repository * the trail-related bits from the end of the - [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/doc/style.css) + [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/doc/style.css) + (put them in your local.css) * the trail-related bits at the end of the - [actiontabs](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/themes/actiontabs/style.css) - or [blueview](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail:/themes/blueview/style.css) - stylesheets, if you use one of those themes + [actiontabs](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/actiontabs/style.css) + or [blueview/goldtype](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/trail3:/themes/blueview/style.css) + stylesheets, if you use one of those themes (again, put them in your local.css) The branch also includes [[todo/test_coverage]] machinery. @@ -31,7 +33,7 @@ Demo: The page `e` is in both demo trails, to demonstrate how a page in more than one trail looks. -The `smcv/trail2` branch is an older version of `trail` which used typed links +The `smcv/trail2` branch is an older version of `trail3` which used typed links as its data structure, resulting in timing-related limitations (it couldn't select pages for the trail by using pagespecs, because pagespecs can't be evaluated correctly until the scan stage has finished). From 5914a770e8662f7bad8237247afed62ce72473b8 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 12 Nov 2011 10:56:46 -0400 Subject: [PATCH 019/460] possible solution --- ...ust_save_before_uploading_more_than_one_attachment.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn index 66c763f58..20d5dc8e6 100644 --- a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn +++ b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn @@ -23,3 +23,10 @@ Is this a problem on my site or does anyone else see this? >> \[[!map pages="path/to/page/* and ! ... >> >> This told me that [[plugins/autoindex]] is the bad guy. Deactivating this plugin helps out. Don't know if this is worth fixing... I can live without that plugin. --bacuh + +>>> The right fix would probably be for `do=create` to allow replacing a page +>>> in the transient underlay without complaining (like the behaviour that +>>> `do=edit` normally has). That wouldn't help you unless [[plugins/autoindex]] +>>> defaulted to making transient pages (`autoindex_commit => 0`), but if we +>>> can fix [[removal_of_transient_pages]] then maybe that default can change? +>>> --[[smcv]] From ab7d4e6af5289ad64dc6661c1a608913f15cc17e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 11:54:16 -0400 Subject: [PATCH 020/460] --- .../must_save_before_uploading_more_than_one_attachment.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn index 20d5dc8e6..5739343cc 100644 --- a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn +++ b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn @@ -30,3 +30,5 @@ Is this a problem on my site or does anyone else see this? >>> defaulted to making transient pages (`autoindex_commit => 0`), but if we >>> can fix [[removal_of_transient_pages]] then maybe that default can change? >>> --[[smcv]] + +[[http://nhasach.edu.vn|Nha sach]] From d1a1844263e804cbb00a7196bdd0c70501a8d380 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 11:54:44 -0400 Subject: [PATCH 021/460] --- .../must_save_before_uploading_more_than_one_attachment.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn index 5739343cc..e604345ec 100644 --- a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn +++ b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn @@ -31,4 +31,4 @@ Is this a problem on my site or does anyone else see this? >>> can fix [[removal_of_transient_pages]] then maybe that default can change? >>> --[[smcv]] -[[http://nhasach.edu.vn|Nha sach]] +[[http://nhasach.edu.vn Nha sach]] From 3ae0a2a5db3b4b4695bd447f4af76ba21840d914 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 11:55:19 -0400 Subject: [PATCH 022/460] --- .../must_save_before_uploading_more_than_one_attachment.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn index e604345ec..20d5dc8e6 100644 --- a/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn +++ b/doc/bugs/must_save_before_uploading_more_than_one_attachment.mdwn @@ -30,5 +30,3 @@ Is this a problem on my site or does anyone else see this? >>> defaulted to making transient pages (`autoindex_commit => 0`), but if we >>> can fix [[removal_of_transient_pages]] then maybe that default can change? >>> --[[smcv]] - -[[http://nhasach.edu.vn Nha sach]] From 63effaf1944e487764e5d0d15119c0aa726e00b9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:00:54 -0400 Subject: [PATCH 023/460] --- doc/rcs/git.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index b4f639c61..c02c0216d 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -116,3 +116,5 @@ pulling changes from the bare root repository, you will need to manually update the local wiki, with a command such as `ikiwiki -setup localwiki.setup -refresh`. You could use git's `post-merge` hook to automate that command. + +[[nha sach|http://nhasach.edu.vn]] From ad914e9e0ba9c5e9afef1e216025e60c0f8b93ea Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:02:00 -0400 Subject: [PATCH 024/460] --- doc/rcs/git.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index c02c0216d..85fa862e0 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -114,7 +114,7 @@ the first time you run setup.) Use standard git commands to handle pulling from and pushing to the server. **Note**: After pulling changes from the bare root repository, you will need to manually update the local wiki, with a command such as `ikiwiki --setup localwiki.setup -refresh`. You could use git's `post-merge` hook +-setup localwiki.setup -refresh`. You [[Du lich|http://didaudidau.vn]] could use git's `post-merge` hook to automate that command. -[[nha sach|http://nhasach.edu.vn]] + From 1d722dd03b85f114194119f7dd238151e79f903a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:02:39 -0400 Subject: [PATCH 025/460] --- doc/rcs.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index 1f6b3c24e..c304572c3 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -11,7 +11,7 @@ generic that it can be adapted to work with many systems by writing a While all supported revision control systems work well enough for basic use, some advanced or special features are not supported in all of them. The table below summarises this for each revision control system and -links to more information about each. +links to more information about each [[du lich|http://didaudidau.vn]]. [[!table data=""" feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] From 273bdc47f8447cbeff4e2c064bbe8fcbacee1a31 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:03:50 -0400 Subject: [PATCH 026/460] --- doc/recentchanges.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 3383fc703..2e380893a 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -3,5 +3,5 @@ """]] Recent changes to this wiki: -[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" +[[!inline pages="internal(recentchanges/change_*) and [[du lich|http://didaudidau.vn]] !*/Discussion" template=recentchanges show=0]] From e41c86efe2d98dbe6a1a8dedf8f2c8936c68e878 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:04:12 -0400 Subject: [PATCH 027/460] --- doc/recentchanges.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 2e380893a..b3ba13551 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -3,5 +3,6 @@ """]] Recent changes to this wiki: -[[!inline pages="internal(recentchanges/change_*) and [[du lich|http://didaudidau.vn]] !*/Discussion" +[[!inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] +[[du lich|http://didaudidau.vn]] From 8a52f59eb44dbc0940e7044e22711e9751fed241 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:04:44 -0400 Subject: [PATCH 028/460] --- doc/recentchanges.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index b3ba13551..2b5d55516 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -4,5 +4,5 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" -template=recentchanges show=0]] -[[du lich|http://didaudidau.vn]] +template=recentchanges show=0]][[du lich|http://didaudidau.vn]] + From 99b80c57dbf98840065082a77dc498525c8d38cc Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:07:34 -0400 Subject: [PATCH 029/460] --- doc/examples/blog.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 5f8f6c3ce..23a5e440b 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -16,7 +16,7 @@ Some additional configuration you might want to do, if not using \[[!tag life]] * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud - to display on the [[index]]. + to display on the [[index]] [[du lich|http://didaudidau.vn]]. * Enable the [[comments|plugins/comments]] plugin to enable comments to posts to the blog. From 438b72407566b0c95f904f98ea5db2804b8be8ec Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkJHb27RVmw93kqyzfoxZWNKjqR8MEVt3A" Date: Sat, 12 Nov 2011 12:08:54 -0400 Subject: [PATCH 030/460] --- doc/examples.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples.mdwn b/doc/examples.mdwn index e24973b69..fe1d82a85 100644 --- a/doc/examples.mdwn +++ b/doc/examples.mdwn @@ -5,7 +5,7 @@ page gives some examples of ways to use ikiwiki. * [[softwaresite]] - a website for some software package, the package can also build static html docs from its wiki -Each example is contained in its own subdirectory; just copy the source +Each example [[du lich|http://didaudidau.vn]] is contained in its own subdirectory; just copy the source files into your wiki to start using one of the examples. The [[tips]] page has some other ideas for ways to use ikiwiki, and the From f0cbd662fdb615a4b5c0715c06bc375f9d81f4ad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 12 Nov 2011 12:17:09 -0400 Subject: [PATCH 031/460] Revert multiple spams --- doc/examples.mdwn | 2 +- doc/examples/blog.mdwn | 2 +- doc/rcs.mdwn | 2 +- doc/rcs/git.mdwn | 4 +--- doc/recentchanges.mdwn | 3 +-- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/examples.mdwn b/doc/examples.mdwn index fe1d82a85..e24973b69 100644 --- a/doc/examples.mdwn +++ b/doc/examples.mdwn @@ -5,7 +5,7 @@ page gives some examples of ways to use ikiwiki. * [[softwaresite]] - a website for some software package, the package can also build static html docs from its wiki -Each example [[du lich|http://didaudidau.vn]] is contained in its own subdirectory; just copy the source +Each example is contained in its own subdirectory; just copy the source files into your wiki to start using one of the examples. The [[tips]] page has some other ideas for ways to use ikiwiki, and the diff --git a/doc/examples/blog.mdwn b/doc/examples/blog.mdwn index 23a5e440b..5f8f6c3ce 100644 --- a/doc/examples/blog.mdwn +++ b/doc/examples/blog.mdwn @@ -16,7 +16,7 @@ Some additional configuration you might want to do, if not using \[[!tag life]] * Enable the [[pagestats|plugins/pagestats]] plugin to get a tag cloud - to display on the [[index]] [[du lich|http://didaudidau.vn]]. + to display on the [[index]]. * Enable the [[comments|plugins/comments]] plugin to enable comments to posts to the blog. diff --git a/doc/rcs.mdwn b/doc/rcs.mdwn index c304572c3..1f6b3c24e 100644 --- a/doc/rcs.mdwn +++ b/doc/rcs.mdwn @@ -11,7 +11,7 @@ generic that it can be adapted to work with many systems by writing a While all supported revision control systems work well enough for basic use, some advanced or special features are not supported in all of them. The table below summarises this for each revision control system and -links to more information about each [[du lich|http://didaudidau.vn]]. +links to more information about each. [[!table data=""" feature |[[git]]|[[svn]]|[[bzr]] |[[monotone]]|[[mercurial]]|[[darcs]]|[[tla]] |[[cvs]] diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn index 85fa862e0..b4f639c61 100644 --- a/doc/rcs/git.mdwn +++ b/doc/rcs/git.mdwn @@ -114,7 +114,5 @@ the first time you run setup.) Use standard git commands to handle pulling from and pushing to the server. **Note**: After pulling changes from the bare root repository, you will need to manually update the local wiki, with a command such as `ikiwiki --setup localwiki.setup -refresh`. You [[Du lich|http://didaudidau.vn]] could use git's `post-merge` hook +-setup localwiki.setup -refresh`. You could use git's `post-merge` hook to automate that command. - - diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 2b5d55516..3383fc703 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -4,5 +4,4 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" -template=recentchanges show=0]][[du lich|http://didaudidau.vn]] - +template=recentchanges show=0]] From 6549f1e75a21565a39376aff8d8054762c349370 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Nov 2011 17:22:06 +0000 Subject: [PATCH 032/460] split trail directive into trailitems and trailoptions --- .../contrib/ikiwiki/directive/trail.mdwn | 24 ------------------- .../ikiwiki/directive/trailinline.mdwn | 2 +- .../contrib/ikiwiki/directive/trailitems.mdwn | 24 +++++++++++++++++++ .../ikiwiki/directive/trailoptions.mdwn | 18 ++++++++++++++ doc/plugins/contrib/trail.mdwn | 16 +++++++------ 5 files changed, 52 insertions(+), 32 deletions(-) delete mode 100644 doc/plugins/contrib/ikiwiki/directive/trail.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn diff --git a/doc/plugins/contrib/ikiwiki/directive/trail.mdwn b/doc/plugins/contrib/ikiwiki/directive/trail.mdwn deleted file mode 100644 index cf8c370a7..000000000 --- a/doc/plugins/contrib/ikiwiki/directive/trail.mdwn +++ /dev/null @@ -1,24 +0,0 @@ -The `trail` directive is supplied by the -[[!iki plugins/contrib/trail desc=trail]] plugin. It sets options for the -trail represented by this page, and can also add pages to the trail. Example usage: - - \[[!trail sort="meta(title)" circular="no"]] - -The available options are: - -* `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail - -* `pagenames`: adds a space-separated list of pages to the trail, - with the same [[SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]] - -* `sort`: sets a [[ikiwiki/pagespec/sorting]] order; if not specified, the - items of the trail are ordered according to the first link to each item - found on the trail page - -* `reverse`: reverses the [[ikiwiki/pagespec/sorting]] order - -* `circular`: if set to `yes` or `1`, the trail is made into a loop by - making the last page's "next" link point to the first page, and the first - page's "previous" link point to the last page - -[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn b/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn index 4fae7ac8a..91d8a4edf 100644 --- a/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn +++ b/doc/plugins/contrib/ikiwiki/directive/trailinline.mdwn @@ -1,6 +1,6 @@ The `trailinline` directive is provided by the [[!iki plugins/contrib/trail desc=trail]] -plugin. It is equivalent to combining [[ikiwiki/directive/trail]] and +plugin. It is equivalent to combining [[ikiwiki/directive/trailitems]] and [[ikiwiki/directive/inline]] directives with the same options. A typical use is to navigate through all posts in a blog: diff --git a/doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn b/doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn new file mode 100644 index 000000000..4106ed33b --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/trailitems.mdwn @@ -0,0 +1,24 @@ +The `trailitems` directive is supplied by the +[[!iki plugins/contrib/trail desc=trail]] plugin. It adds pages +to the trail represented by the current page, without producing any output +on that page. + + \[[!trailitems pages="posts/*" sort="age"]] + + \[[!trailitems pagenames="a b c"]] + +Options are similar to [[!iki ikiwiki/directive/inline desc=inline]]: + +* `pages`: adds pages that match a [[ikiwiki/PageSpec]] to the trail + (cannot be used with `pagenames`) + +* `pagenames`: adds a space-separated list of pages to the trail, + with the same [[ikiwiki/SubPage/LinkingRules]] as for a [[ikiwiki/WikiLink]] + (cannot be used with `pages`) + +* `sort`: add the pages matched by `pages` to the trail in this + [[ikiwiki/pagespec/sorting]] order (cannot be used with `pagenames`) + +* `reverse`: reverse the order of `sort` (cannot be used with `pagenames`) + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn b/doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn new file mode 100644 index 000000000..e1603f11b --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/trailoptions.mdwn @@ -0,0 +1,18 @@ +The `trailoptions` directive is supplied by the +[[!iki plugins/contrib/trail desc=trail]] plugin. It sets options for the +trail represented by this page. + + \[[!trailoptions sort="meta(title)" circular="no"]] + +Options available: + +* `sort`: sets a [[ikiwiki/pagespec/sorting]] order for the entire trail, + overriding the order in which they were added + +* `reverse`: reverses the order of the trail + +* `circular`: if set to `yes` or `1`, the trail is made into a loop by + making the last page's "next" link point to the first page, and the first + page's "previous" link point to the last page + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index fc43afef4..59daa58e7 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -59,8 +59,9 @@ Known bugs: [[!template id=plugin name=trail author="[[Simon_McVittie|smcv]]"]] [[!tag type/chrome]] -This plugin provides the [[ikiwiki/directive/trail]], +This plugin provides the [[ikiwiki/directive/trailoptions]], [[ikiwiki/directive/traillink]], [[ikiwiki/directive/trailitem]], +[[ikiwiki/directive/trailitems]] and [[ikiwiki/directive/trailinline]] [[directives|ikiwiki/directive]]. It's sometimes useful to have "trails" of pages in a wiki where each @@ -76,6 +77,9 @@ trails that it's a member of (if any), with links to the trail and to the next and previous members. HTML `` tags with the `prev`, `next` and `up` relations are also generated. +The [[ikiwiki/directive/trailoptions]] directive sets options for the +entire trail. + Pages can be included in a trail in various ways: * The [[ikiwiki/directive/trailinline]] directive sets up an [[inline]], @@ -88,7 +92,7 @@ Pages can be included in a trail in various ways: This directive only works if the [[!iki plugins/inline desc=inline]] plugin is also enabled. -* The [[ikiwiki/directive/trail]] directive has optional `pages` and +* The [[ikiwiki/directive/trailitems]] directive has optional `pages` and `pagenames` options which behave the same as in [[inline]], but don't produce any output in the page, so you can have trails that don't list all their pages. @@ -124,9 +128,7 @@ Pages can be included in a trail in various ways: Like `\[[!tag]]`, this still counts as a [[ikiwiki/WikiLink]] even though there's no visible link. -You can mix several of these directives in one page, and the resulting +You can mix several of these directives in one page. The resulting trail will contain all of the pages matched by any of the directives, -in the same order as the directives (unless you use the `sort` option -on `\[[!trail]]` or `\[[!trailinline]]`, which takes precedence). - -The [[ikiwiki/directive/trail]] directive can also be used to set options. +in the same order that the directives appear (unless you use the `sort` or +`reverse` options on `\[[!trailoptions]]`). From fb818882f4facc7edf42675ab45212848cec05bc Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 12 Nov 2011 13:33:17 -0400 Subject: [PATCH 033/460] sorting is now sane --- doc/plugins/contrib/trail.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/plugins/contrib/trail.mdwn b/doc/plugins/contrib/trail.mdwn index 59daa58e7..bfd4d3d0b 100644 --- a/doc/plugins/contrib/trail.mdwn +++ b/doc/plugins/contrib/trail.mdwn @@ -52,7 +52,6 @@ Updated, November 2011: Known bugs: * the blueview and goldtype CSS nearly work, but the alignment is a bit off -* a `trailinline` with no `sort` option is sorted in arbitrary order ---- From 194bbf5f36e85c24ef08b512c4d1a1cbfc53e4cf Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sat, 12 Nov 2011 13:39:37 -0400 Subject: [PATCH 034/460] new patch --- doc/todo/sorting_by_path.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/todo/sorting_by_path.mdwn diff --git a/doc/todo/sorting_by_path.mdwn b/doc/todo/sorting_by_path.mdwn new file mode 100644 index 000000000..b7af9f919 --- /dev/null +++ b/doc/todo/sorting_by_path.mdwn @@ -0,0 +1,16 @@ +[[!tag patch]] +[[!template id=gitbranch branch=smcv/trail3 author="[[smcv]]"]] + +My branch for [[plugins/contrib/trail]] also includes `path` +and `path_natural` sort orders, which sort the entire page name, +e.g. "a a/z ab ab/c b", much like [[ikiwiki/directive/map]]. +I used `path` as the default order for the +[[plugins/contrib/ikiwiki/directive/trailitems]] directive, +since it seemed the most sensible. +([[plugins/contrib/ikiwiki/directive/trailinline]] uses +`age` as its default, to be consistent with `inline`.) + +It's one commit (including a regression test) which can be +cherry-picked if you don't want the rest of `trail`. + +--[[smcv]] From 71c9365cc71b51b3bc0617a43218e2a6455e8ff9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 13 Nov 2011 08:18:23 -0400 Subject: [PATCH 035/460] Howto --- doc/todo/pdf_output.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index 1a1411093..5f6611c8a 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -4,3 +4,6 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te > I've actually written one, it's just not publicly released. You can check it out from the "experimental" branch of my ikiplugins githup repo. It's called "html2pdf" and it depends on the static version of wkhtmltopdf rather than requiring a whole LaTeX setup. It's only been used on Ubuntu, so I can't say what problems there might be on other setups, but it works for me. It's not properly documented; I'd appreciate some help with that. > -- [[KathrynAndersen]] + +> Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's +> From 8f9ff4b0e5a3c4e68c64dbf1f71f5301df56c690 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 13 Nov 2011 08:50:42 -0400 Subject: [PATCH 036/460] --- doc/todo/pdf_output.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index 5f6611c8a..0de0776cf 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -6,4 +6,4 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te > -- [[KathrynAndersen]] > Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's -> +> -- [[micheal]] From 4f5156187cf97c2079d30d5e7aa37b2285392b2d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Sun, 13 Nov 2011 09:18:09 -0400 Subject: [PATCH 037/460] --- .../Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn diff --git a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn new file mode 100644 index 000000000..2f02f89bc --- /dev/null +++ b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn @@ -0,0 +1,2 @@ +It would be nice, if configured for multimarkdown, for ikiwiki to recognize and use/remove meta information from multimarkdown documents. +Title, Author, and Date would be especially nice. From 4eb969a59063153bcd65ddf53aa99b6aadd0e691 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 13 Nov 2011 09:48:44 -0400 Subject: [PATCH 038/460] --- doc/todo/Wikilink_to_a_symbolic_link.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/Wikilink_to_a_symbolic_link.mdwn diff --git a/doc/todo/Wikilink_to_a_symbolic_link.mdwn b/doc/todo/Wikilink_to_a_symbolic_link.mdwn new file mode 100644 index 000000000..1f9a12d9c --- /dev/null +++ b/doc/todo/Wikilink_to_a_symbolic_link.mdwn @@ -0,0 +1,5 @@ +Some time ago I asked in the [[ikiwiki forum|http://ikiwiki.info/forum/Wikilink_to_a_symbolic_link/]] how to create wikilinks to symbolic links. The answer was that this is not possible because of security reasons. + +However I use ikiwiki only locally for my personal use. So it wouldn't be a security issue for me. The point is, that I want to link to pdf-files that are somewhere on my harddrive because I want to have automatically the newest versions of the files linked to in my ikiwiki. So my idea would be to create a symbolic links to those files in my scrdir. + +Would be great if something like that would be possible soon. From e52ad543da6dd4a15e1b4c24d86148b3fcdbbd9f Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 13 Nov 2011 11:33:59 -0400 Subject: [PATCH 039/460] actually mark as done --- doc/todo/supporting_comments_via_disussion_pages.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/supporting_comments_via_disussion_pages.mdwn b/doc/todo/supporting_comments_via_disussion_pages.mdwn index aae0b3008..420ae4a7e 100644 --- a/doc/todo/supporting_comments_via_disussion_pages.mdwn +++ b/doc/todo/supporting_comments_via_disussion_pages.mdwn @@ -218,3 +218,5 @@ I've updated smcvpostcomment and publicised it as [[plugins/contrib/comments]]. > While there is still room for improvement and entirely other approaches, > I am calling this done since smcv's comments plugin is ready. --[[Joey]] + +[[done]] From ed7cd1a66ba44f2813ba38ffca4f19e4da959002 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 13 Nov 2011 11:37:20 -0400 Subject: [PATCH 040/460] link to alternative implementation --- doc/todo/wikitrails.mdwn | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/doc/todo/wikitrails.mdwn b/doc/todo/wikitrails.mdwn index ca97c9404..616857966 100644 --- a/doc/todo/wikitrails.mdwn +++ b/doc/todo/wikitrails.mdwn @@ -1,17 +1,23 @@ ## summary at times it is useful to have a guided tour or trail through a subset of the pages of a wiki; in pmwiki, this is implemented as [wikitrails](http://www.pmwiki.org/wiki/PmWiki/WikiTrails). +### smcv's implementation + +... is the out-of-tree [[plugins/contrib/trail]] plugin, see there for details. + +### chrysn's implementation + i'm working on a python xmlrpc plugin for ikiwiki to support wikitrails, both as a navigation feature (have "forward" and "back" links based on a sequence) and a modified inline that includes all pages in the trail with appropriate modifications (suitable for printing if necessary). the current status is published on `git://github.com/github076986099/ikiwiki-plugins.git`; as of now, i don't have a public demo of it. feedback on both the concept and the code is very much appreciated by [[discussion]] or [email](mailto:chrysn@fsfe.org). -## usage +#### usage two preprocessor commands are provided: -### \[[!trail index="my_indexpage"]] +##### \[[!trail index="my_indexpage"]] embeds a navigation object with forward and back links as well as an indicator of the current position in the trail. @@ -19,15 +25,15 @@ if index is not specified, a suitable page up the path is used. this works very well together with the [[sidebar|plugins/sidebar]] plugin if the pages in a directory are roughly the same as the pages in the trail and the `index` is directory index page; just put the \[[!trail]] in the sidebar. -### \[[!trailinclude index="my_indexpage"]] +##### \[[!trailinclude index="my_indexpage"]] all pages linked from the index page are included in the same way as \[[!inline]] does, but in the proper sequence, with headings according to the indent in the source page and adoptions for the headings inside the page (a level 2 heading in a page that is a sub-sub-chapter in the whole trail will become a level 5 heading when trailincluded). -## the index page +#### the index page the index page is parsed as markdown; numbered lists and "`*`" bulleted lists are discovered. -## current issues +#### current issues * rebuilding --- currently, there is no propper rebuilding of pages (will use `will_render` and `add_depends`). care has to be taken of how not yet created pages play into this. * inline recursion --- there is simply no guard yet From 46d01601a92616ef77923c95b716285f4660dff9 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 13 Nov 2011 11:39:05 -0400 Subject: [PATCH 041/460] clarify --- doc/todo/wikitrails/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/wikitrails/discussion.mdwn b/doc/todo/wikitrails/discussion.mdwn index 9dbbb6bc8..1ceb51f0d 100644 --- a/doc/todo/wikitrails/discussion.mdwn +++ b/doc/todo/wikitrails/discussion.mdwn @@ -1,3 +1,7 @@ +(This mainly discusses the original implementation (chrysn's). --[[smcv]]) + +---- + This is a nice idea, I do have my gripes about the imeplementation. Assuming that the index's list is in mdwn format is not ideal. I guess the From 17ddbd9cbfa869aef9c73ddd863ba0daed1a4dae Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 13 Nov 2011 23:50:06 +0000 Subject: [PATCH 042/460] document album v3, based on trail v3 --- doc/plugins/contrib/album.mdwn | 185 ++++++++---------- .../contrib/ikiwiki/directive/album.mdwn | 56 ++++++ .../contrib/ikiwiki/directive/albumimage.mdwn | 26 +++ .../ikiwiki/directive/albumsection.mdwn | 29 +++ 4 files changed, 189 insertions(+), 107 deletions(-) create mode 100644 doc/plugins/contrib/ikiwiki/directive/album.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/albumimage.mdwn create mode 100644 doc/plugins/contrib/ikiwiki/directive/albumsection.mdwn diff --git a/doc/plugins/contrib/album.mdwn b/doc/plugins/contrib/album.mdwn index dde533e76..836a98f33 100644 --- a/doc/plugins/contrib/album.mdwn +++ b/doc/plugins/contrib/album.mdwn @@ -1,147 +1,118 @@ [[!template id=plugin name=album author="[[Simon_McVittie|smcv]]"]] -[[!template id=gitbranch branch=smcv/album2 author="[[Simon_McVittie|smcv]]"]] [[!tag type/chrome]] -Available from [[smcv]]'s git repository, in the `album2` branch. -Older (pre-rebase) versions in `album`, `album-live` (the latter -was used on an actual website and didn't explode too much). +This plugin provides the [[ikiwiki/directive/album]] [[ikiwiki/directive]], +which turns a page into a photo album or image gallery, containing all +images attached to the album or its subpages. It also provides the +[[ikiwiki/directive/albumsection]] and [[ikiwiki/directive/albumimage]] +directives. -[The version currently available hasn't been modified to work with the -November 2011 version of [[trail]]. -[[smcv]]] +This plugin automatically enables the [[filecheck]], [[img]], [[inline]], +[[trail]] and [[transient]] plugins. The [[meta]] plugin is also +recommended. -This plugin formats a collection of images into a photo album, -in the same way as many websites: good examples include the -PHP application [Gallery](http://gallery.menalto.com/), Flickr, -and Facebook's Photos "application". +## Changing the templates +When a viewer page is generated or inlined into an album, the template can +contain these extra variables: + +* `` - page name of the album +* `` - relative URL to the album +* `` - title of the album, usually taken from + a [[ikiwiki/directive/meta]] directive +* `` - caption for the image +* `` - a small [[ikiwiki/directive/img]] for the image +* `` - width of the full-size image in pixels +* `` - height of the full-size image in pixels +* `` - size of the image, e.g. `1.2 MiB` +* `` - format of the image, typically `JPEG` + +The template for the viewer page can also contain: + +* `` - a large [[ikiwiki/directive/img]] to display the image +* `` - a link to the previous viewer, typically with a + thumbnail +* `` - a link to the next viewer, typically with a + thumbnail + +## Including album entries elsewhere + +To display images from elsewhere in the wiki with the same appearance as +an [[ikiwiki/directive/album]] or [[ikiwiki/directive/albumsection]], +you can use an [[ikiwiki/directive/inline]] with the `albumitem` +template: + + \[[!inline pages="..." sort="-age" template="albumitem"]] + +---- + +[[!template id=gitbranch branch=smcv/album3 author="[[Simon_McVittie|smcv]]"]] + +Available from [[smcv]]'s git repository, in the `album3` branch. I've called it `album` to distinguish it from [[contrib/gallery|plugins/contrib/gallery]], although `gallery` might well be a better name for this functionality. -The web UI I'm trying to achieve consists of one -[HTML page of thumbnails](http://ikialbum.hosted.pseudorandom.co.uk/album/) -as an entry point to the album, where each thumbnail links to -[a "viewer" HTML page](http://ikialbum.hosted.pseudorandom.co.uk/album/img_0120/) -with a full size image, next/previous thumbnail links, and -[[plugins/comments]]. - (The Summer of Code [[plugins/contrib/gallery]] plugin does the next/previous UI in Javascript using Lightbox, which means that individual photos can't be bookmarked in a meaningful way, and the best it can do as a fallback for non-Javascript browsers is to provide a direct link to the image.) -

album directive

+Updated, November 2011: rebased onto [[trail]] v3, CSS adjusted. -Each page containing an `album` directive is treated as a photo album. +## Manual installation -Every image attached to an album or its subpages is considered to be part of -the album. A "viewer" page, with the wiki's default page extension, will be -generated in the [[transient underlay|todo/transient_pages]] to display the -image, if there isn't already a page of the same name as the image: for -instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists, -then `debconf/tuesday/p100.mdwn` might be created. +If you don't want to use a branch of ikiwiki, manual installation requires +these files (use the "raw" link in gitweb to download), in addition to the +ones needed by [[trail]]: -There's currently a hard-coded list of extensions that are treated as images: -`png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video types could -be added in future. Videos aren't currently handled very well; -ideally, something like totem-video-thumbnailer would be used. +* [album.pm](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/IkiWiki/Plugin/album.pm) + in an `IkiWiki/Plugin` subdirectory of your configured `plugindir` +* [albumviewer.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumviewer.tmpl), + [albumitem.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumitem.tmpl), + [albumnext.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumnext.tmpl) and + [albumprev.tmpl](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/templates/albumprev.tmpl), + in your configured `templatedir`, or a `templates` subdirectory of your wiki repository +* the album-related bits from the end of the + [stylesheet](http://git.pseudorandom.co.uk/smcv/ikiwiki.git/blob/album3:/doc/style.css) + (put them in your local.css) -The `album` directive also produces an [[ikiwiki/directive/inline]] which -automatically includes all the viewers for this album, except those that -will appear in an albumsection (if every image -is in a section, then the `album` directive won't have any visible effect). +## Demo -The `inline` is in `archive` and `quick` mode, but can include some -extra information about the images, including file size and a thumbnail made -using [[ikiwiki/directive/img]]). The default template is `albumitem.tmpl`, -which takes advantage of these things. - -

albumsection directive

- -The `albumsection` directive is used to split an album into sections. It can -only appear on a page that also has the album directive. - -The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages -are matched. The `albumsection` directive displays all the images that match -the filter, and the `album` directive displays any leftover images, like -this: - - # Holiday photos - - \[[!album]] - - - ## People - - \[[!albumsection filter="tagged(people)"]] - - - ## Landscapes - - \[[!albumsection filter="tagged(landscapes)"]] - - -

albumimage directive

- -Each viewer page produced by the album directive -contains an `albumimage` directive, which is replaced by an -[[ikiwiki/directive/img]], wrapped in some formatting using a -template (by default it's `albumviewer.tmpl`). That template can also include -links to the next photo, the previous photo and the album it's in; the default -template has all of these. - -The next/previous links are themselves implemented by evaluating a template, -either `albumnext.tmpl` or `albumprev.tmpl` by default. - -The directive can also have parameters: - -* `title`, `copyright` and `date` are short-cuts for the corresponding - [[ikiwiki/directive/meta]] directives - -* `caption` sets a caption which is displayed in the album and viewer - pages - -The viewer page can also have other contents before or after the actual -image viewer. +* [HTML page of thumbnails](http://ikialbum.hosted.pseudorandom.co.uk/album/) + as an entry point to the album +* Each thumbnail links to + [a "viewer" HTML page](http://ikialbum.hosted.pseudorandom.co.uk/album/img_0120/) + with a full size image, optional next/previous thumbnail links, and + optional [[plugins/comments]] ## Bugs +* There's currently a hard-coded list of extensions that are treated as + images: `png`, `gif`, `jpg`, `jpeg` or `mov` files. More image and video + types could be added in future. + +* Videos aren't currently handled very well; ideally, something like + totem-video-thumbnailer would be used. + * The plugin doesn't do anything special to handle albums that are subpages of each other. If, say, `debconf` and `debconf/monday` are both albums, then `debconf/monday/p100.jpg` will currently be assigned to one or the other, arbitrarily. It should probably pick the closest (longest) album name. + (I'm not sure that it can do this reliably, though, since the scan stage + runs in an undefined order.) * The plugin doesn't do anything special to handle photos with similar names. If you have `p100.jpg` and `p100.png`, one will get a viewer page called - `p100` and the other will be ignored. + `p100` and the other will be ignored. (I'm not sure what we could do better, + though.) * If there's no `albumimage` in a viewer page, one should probably be appended automatically. -* When editing a viewer page, rebuilding it seems to fail at the moment. - Probably related to: - -* Integration with [[plugins/contrib/trail]] is new, untested and not - very well implemented. In particular, the prev/up/next links are - redundant with the ones from `trail`. - ## TODO -* The documentation should mention how to replicate the appearance of - `album` and `albumsection` using an `inline` of viewer pages, - elsewhere on the site. - -* The documentation should mention all the template variables and - all the parameters. - -* The generated viewer page should include most or all of the possible - parameters to the `albumimage` directive, with empty values, as a - template for editing. - * The generated viewer page should extract as much metadata as possible from the photo's EXIF tags (creation/modification dates, author, title, caption, copyright). [[smcv]] has a half-written implementation which runs diff --git a/doc/plugins/contrib/ikiwiki/directive/album.mdwn b/doc/plugins/contrib/ikiwiki/directive/album.mdwn new file mode 100644 index 000000000..433eec8bd --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/album.mdwn @@ -0,0 +1,56 @@ +The `album` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin. + +Each page containing an `album` directive is treated as a photo album +or image gallery. Example usage is as simple as: + + \[[!album]] + +Every image attached to an album or its [[subpages|ikiwiki/subpage]] is +considered to be part of the album. A "viewer" page, with the wiki's default +page extension, will be generated in the +[[transient underlay|plugins/transient]] to display the +image, if there isn't already a page of the same name as the image: for +instance, if `debconf` is an album and `debconf/tuesday/p100.jpg` exists, +then `debconf/tuesday/p100.mdwn` might be created. + +The album is treated as a [[!iki plugins/contrib/trail desc=trail]], which +gives each viewer page a link back to the album, and a link to the previous +and next viewer in the album. + +The `album` directive also produces an [[ikiwiki/directive/inline]] which +automatically includes all the viewers for this album, except those that +will appear in an [[albumsection]]. If every image in the album is in a +section, then the `album` directive is still required, but won't produce +any output in the page. + +The `inline` can include some extra information about the images, including +file size and a thumbnail made using [[ikiwiki/directive/img]]). The +default template is `albumitem.tmpl`, which takes advantage of these things. + +## Options + +The directive can have some options for the entire album. The defaults are: + + \[[!album + sort="-age" + size="full" + thumbnailsize="96x96" + viewertemplate="albumviewer" + prevtemplate="albumprev" + nexttemplate="albumnext" + +* `sort` - sets the order in which images appear, defaulting to earliest + creation date first +* `size` - if not `full`, the [[ikiwiki/directive/img]] in the viewer page + will be resized to be no larger than this +* `thumbnailsize` - the [[ikiwiki/directive/img]] in the album page, + which can also be used in the previous/next links, will be no larger than + this +* `viewertemplate` - the template used for the [[albumimage]] in each + viewer page +* `prevtemplate` - the template used to replace `` if used in + the viewer page +* `nexttemplate` - the template used to replace `` if used in + the viewer page + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/albumimage.mdwn b/doc/plugins/contrib/ikiwiki/directive/albumimage.mdwn new file mode 100644 index 000000000..2385bb535 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/albumimage.mdwn @@ -0,0 +1,26 @@ +The `albumimage` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin. + +Each viewer page produced by the [[album]] directive +contains an `albumimage` directive, which is replaced by an +[[ikiwiki/directive/img]], wrapped in some formatting using a +template (by default it's `albumviewer.tmpl`). That template can also include +links to the next and previous photos, in addition to those provided by the +[[!iki plugins/contrib/trail desc=trail]] plugin. + +The next/previous links are themselves implemented by evaluating a template, +either `albumnext.tmpl` or `albumprev.tmpl` by default. + +The directive can also have parameters: + +* `title`, `date`, `updated`, `author`, `authorurl`, `copyright`, `license` + and `description` are short-cuts for the corresponding + [[ikiwiki/directive/meta]] directives + +* `caption` sets a caption which is displayed near this image in the album + and viewer pages + +The viewer page can also contain any text and markup before or after the +`albumimage` directive, which will appear before or after the image in the +viewer page. + +[[!meta robots="noindex, follow"]] diff --git a/doc/plugins/contrib/ikiwiki/directive/albumsection.mdwn b/doc/plugins/contrib/ikiwiki/directive/albumsection.mdwn new file mode 100644 index 000000000..7e5749e05 --- /dev/null +++ b/doc/plugins/contrib/ikiwiki/directive/albumsection.mdwn @@ -0,0 +1,29 @@ +The `albumsection` directive is supplied by the [[!iki plugins/contrib/album desc=album]] plugin. + +The `albumsection` directive is used to split an album into sections. It can +only appear on a page that also has the [[album]] directive. + +The `filter` parameter is a [[ikiwiki/PageSpec]] against which viewer pages +are matched. The `albumsection` directive displays all the images that match +the filter, and the `album` directive displays any leftover images, like +this: + + # Holiday photos + + \[[!album]] + + + ## People + + \[[!albumsection filter="tagged(people)"]] + + + ## Landscapes + + \[[!albumsection filter="tagged(landscapes)"]] + + +[[!meta robots="noindex, follow"]] From 6f26e11bf061e37eab68c30f4c4c037625bd9c3f Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 14 Nov 2011 06:50:37 -0400 Subject: [PATCH 043/460] summarize IRC discussion --- .../conditional_preprocess_during_scan.mdwn | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/doc/bugs/conditional_preprocess_during_scan.mdwn b/doc/bugs/conditional_preprocess_during_scan.mdwn index 254ebac22..23b9fd2cc 100644 --- a/doc/bugs/conditional_preprocess_during_scan.mdwn +++ b/doc/bugs/conditional_preprocess_during_scan.mdwn @@ -28,7 +28,27 @@ reprocessed is done so in the same conditions as the original call. >> upstream. >> For what it's worth, I think that my post_scan hook mechanism would work ->> rather fine with your trail plugin. However, the case of the if +>> rather fine with your trail plugin. + +>>> We discussed this on IRC, and I think it's actually more complicated +>>> than that: the branch to sort by newest inlined entry wants a +>>> "pagespecs now work" hook, whereas for trail I want a "sorting now +>>> works" hook: +>>> +>>> * scan +>>> * pagespecs now work (post-scan) +>>> * Giuseppe's version of inline can decide what each inline +>>> contains, and thus decide where they go in `inline(mtime)` +>>> order +>>> * pagespecs and sorting now work (pre-render) +>>> * my trail plugin can decide what each trail contains, and +>>> also sort them in the right order (which might be +>>> `inline(mtime)`, so might be undefined until pagespecs work) +>>> * render +>>> +>>> --[[smcv]] + +>> However, the case of the if >> directive is considerably more complicated, because the conditional >> can introduce a much stronger feedback effect in the pre/post scanning >> dependency. In fact, it's probably possible to build a couple of pages From 5e45c3f92b211c39d26ff038dc03ed3353ebb7aa Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Mon, 14 Nov 2011 18:35:49 -0400 Subject: [PATCH 044/460] Added author info --- .../Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn index 2f02f89bc..3e5fc8bb5 100644 --- a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn +++ b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__.mdwn @@ -1,2 +1,4 @@ +[[!meta author=tjgolubi]] + It would be nice, if configured for multimarkdown, for ikiwiki to recognize and use/remove meta information from multimarkdown documents. -Title, Author, and Date would be especially nice. +Title, Author, and Date would be especially nice. -- [[tjgolubi]] From f5379757860a88b4db0244d8b99c06a457798a42 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Mon, 14 Nov 2011 19:02:49 -0400 Subject: [PATCH 045/460] --- ...in__47__multimarkdown_instead_of_Text::MultiMarkdown.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/How_to_use___126____47__bin__47__multimarkdown_instead_of_Text::MultiMarkdown.mdwn diff --git a/doc/forum/How_to_use___126____47__bin__47__multimarkdown_instead_of_Text::MultiMarkdown.mdwn b/doc/forum/How_to_use___126____47__bin__47__multimarkdown_instead_of_Text::MultiMarkdown.mdwn new file mode 100644 index 000000000..5dadb600d --- /dev/null +++ b/doc/forum/How_to_use___126____47__bin__47__multimarkdown_instead_of_Text::MultiMarkdown.mdwn @@ -0,0 +1,5 @@ +[[!meta author=tjgolubi]] + +I want to configure IkiWiki to use Fletcher Penney's recent version of [[MultiMarkdown|http://fletcherpenney.net/multimarkdown]] instead of the default perl implementation. +I don't know perl, but I think I need to replace the mdwn.pm plugin with something that uses "open2". +Please help me get started. -- [[tjgolubi]] From 4a5248d59719b01ebd5ce19748de21ad7c514b8b Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 15 Nov 2011 21:46:23 -0400 Subject: [PATCH 046/460] --- doc/todo/hyphenation.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/todo/hyphenation.mdwn diff --git a/doc/todo/hyphenation.mdwn b/doc/todo/hyphenation.mdwn new file mode 100644 index 000000000..af9c22610 --- /dev/null +++ b/doc/todo/hyphenation.mdwn @@ -0,0 +1,4 @@ +[!tag wishlist] + +I recently found [Hyphenator](http://code.google.com/p/hyphenator/) which is quite cool ... but it should be possible to implement this functionality within ikiwiki and not rely on javascript and the client. + From c9076b35cd6d3eefb46ec47f9438b79d05fbba15 Mon Sep 17 00:00:00 2001 From: martin Date: Tue, 15 Nov 2011 21:46:59 -0400 Subject: [PATCH 047/460] --- doc/todo/hyphenation.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/hyphenation.mdwn b/doc/todo/hyphenation.mdwn index af9c22610..217141e1c 100644 --- a/doc/todo/hyphenation.mdwn +++ b/doc/todo/hyphenation.mdwn @@ -1,4 +1,4 @@ -[!tag wishlist] +[[!tag wishlist]] I recently found [Hyphenator](http://code.google.com/p/hyphenator/) which is quite cool ... but it should be possible to implement this functionality within ikiwiki and not rely on javascript and the client. From dc9516c1041f06eb96c482898fa8fff3937df92a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:18:15 -0400 Subject: [PATCH 048/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index ddf1ecd84..f8ae4eff3 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]]. +and is [[FreeSoftware]] [[http://didaudidau.vn/ve-may-bay/|Ve may bay]]. From 99e54852b62f7280eeac97f4ace3a9cbaf531cbd Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:19:04 -0400 Subject: [PATCH 049/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index f8ae4eff3..524918e3f 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] [[http://didaudidau.vn/ve-may-bay/|Ve may bay]]. +and is [[FreeSoftware]] [[http://didaudidau.vn/ve-may-bay/ Ve may bay]]. From 55f0a4377633756a1045fa99f0308b4c851d5b51 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:19:28 -0400 Subject: [PATCH 050/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 524918e3f..1d4f085a4 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -26,4 +26,4 @@ The [[RoadMap]] describes where the project is going. can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] [[http://didaudidau.vn/ve-may-bay/ Ve may bay]]. +and is [[FreeSoftware]] [[Ve may bay|http://didaudidau.vn/ve-may-bay/]]. From a00e7abaa383ae65d0cbd8b8b9d4de5dc510dd79 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:20:41 -0400 Subject: [PATCH 051/460] --- doc/index.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 1d4f085a4..55ba8dafb 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -23,7 +23,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and tracked using this wiki. +can be submitted and tracked using this wiki [[sach|http://nhasach.edu.vn/]]. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] [[Ve may bay|http://didaudidau.vn/ve-may-bay/]]. +and is [[FreeSoftware]] From 384ea4e4fd53528ab6c2978935941c534dc8298f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:21:52 -0400 Subject: [PATCH 052/460] Added a comment --- .../comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment diff --git a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment new file mode 100644 index 000000000..b361ecf05 --- /dev/null +++ b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" + nickname="Customer" + subject="comment 1" + date="2011-11-16T07:21:52Z" + content=""" +May be no [[sach|http://nhasach.edu.vn/]]. + +"""]] From 4fe1538b4df838f73382ed64648aa7c12c7ef50a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:23:18 -0400 Subject: [PATCH 053/460] Added a comment --- ...omment_1_afb4a03f6152a2282779b39f2119d15c._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment diff --git a/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment b/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment new file mode 100644 index 000000000..5b89f5452 --- /dev/null +++ b/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" + nickname="Customer" + subject="comment 1" + date="2011-11-16T07:23:18Z" + content=""" +Chang a to 1 +----------------------------------- +[[nha sach giam gia|http://nhasach.edu.vn/]]. + +"""]] From 17fa3f3b4d785b335d23c3877894110a3fc5ac4f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:24:07 -0400 Subject: [PATCH 054/460] Added a comment --- ...mment_1_e4271cbea01284b22ba8ddbe477f2774._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment diff --git a/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment b/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment new file mode 100644 index 000000000..c77c894fa --- /dev/null +++ b/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" + nickname="Customer" + subject="comment 1" + date="2011-11-16T07:24:07Z" + content=""" +I suggest you use google translate + + +[[nha sach truc tuyen|http://nhasach.edu.vn/]]. + +"""]] From 6a655196b8af625c07a0ad563873448f6729eb05 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" Date: Wed, 16 Nov 2011 03:27:04 -0400 Subject: [PATCH 055/460] Added a comment --- ...omment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment diff --git a/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment b/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment new file mode 100644 index 000000000..5ca9055aa --- /dev/null +++ b/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" + nickname="Customer" + subject="comment 2" + date="2011-11-16T07:27:04Z" + content=""" +Thanks for your help + +-------------------------- +[[Nha sach truc tuyen|http://nhasach.edu.vn]] +"""]] From 06ea48ed5105d8fba9328835e600b7116cd8c2e5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 16 Nov 2011 03:32:06 -0400 Subject: [PATCH 056/460] revert spam --- ...mment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment | 9 --------- ...mment_1_afb4a03f6152a2282779b39f2119d15c._comment | 11 ----------- ...mment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment | 11 ----------- ...mment_1_e4271cbea01284b22ba8ddbe477f2774._comment | 12 ------------ doc/index.mdwn | 4 ++-- 5 files changed, 2 insertions(+), 45 deletions(-) delete mode 100644 doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment delete mode 100644 doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment delete mode 100644 doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment delete mode 100644 doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment diff --git a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment b/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment deleted file mode 100644 index b361ecf05..000000000 --- a/doc/forum/Can_Ikiwiki_recognize_multimarkdown_meta_tags__63__/comment_1_35de6d81abb4760fbd27b5d4aa09f0d1._comment +++ /dev/null @@ -1,9 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" - nickname="Customer" - subject="comment 1" - date="2011-11-16T07:21:52Z" - content=""" -May be no [[sach|http://nhasach.edu.vn/]]. - -"""]] diff --git a/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment b/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment deleted file mode 100644 index 5b89f5452..000000000 --- a/doc/forum/How_to_use_number_as_bullet_labels_but_not_letter_in_toc_plugin/comment_1_afb4a03f6152a2282779b39f2119d15c._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" - nickname="Customer" - subject="comment 1" - date="2011-11-16T07:23:18Z" - content=""" -Chang a to 1 ------------------------------------ -[[nha sach giam gia|http://nhasach.edu.vn/]]. - -"""]] diff --git a/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment b/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment deleted file mode 100644 index 5ca9055aa..000000000 --- a/doc/forum/create_download_link/comment_2_59dfbe0d0d6ee7b131b18479413a02e1._comment +++ /dev/null @@ -1,11 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" - nickname="Customer" - subject="comment 2" - date="2011-11-16T07:27:04Z" - content=""" -Thanks for your help - --------------------------- -[[Nha sach truc tuyen|http://nhasach.edu.vn]] -"""]] diff --git a/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment b/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment deleted file mode 100644 index c77c894fa..000000000 --- a/doc/forum/how_do_I_translate_a_TWiki_site/comment_1_e4271cbea01284b22ba8ddbe477f2774._comment +++ /dev/null @@ -1,12 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawkljravtnjpauReS81ng5zVurZx_thpse8" - nickname="Customer" - subject="comment 1" - date="2011-11-16T07:24:07Z" - content=""" -I suggest you use google translate - - -[[nha sach truc tuyen|http://nhasach.edu.vn/]]. - -"""]] diff --git a/doc/index.mdwn b/doc/index.mdwn index 55ba8dafb..ddf1ecd84 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -23,7 +23,7 @@ ikiwiki [[!version ]]. The [[RoadMap]] describes where the project is going. [[Bugs]], [[TODO]] items, [[wishlist]] items, and [[patches|patch]] -can be submitted and tracked using this wiki [[sach|http://nhasach.edu.vn/]]. +can be submitted and tracked using this wiki. Ikiwiki is developed by [[Joey]] and many contributors, -and is [[FreeSoftware]] +and is [[FreeSoftware]]. From 73d094cf0c264fcdca66baa65f5d8f8836865a9e Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 16 Nov 2011 12:17:02 -0400 Subject: [PATCH 057/460] --- doc/todo/hyphenation.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/todo/hyphenation.mdwn b/doc/todo/hyphenation.mdwn index 217141e1c..be1eebcb8 100644 --- a/doc/todo/hyphenation.mdwn +++ b/doc/todo/hyphenation.mdwn @@ -2,3 +2,4 @@ I recently found [Hyphenator](http://code.google.com/p/hyphenator/) which is quite cool ... but it should be possible to implement this functionality within ikiwiki and not rely on javascript and the client. +A Perl implementation of the algorithm exists in [[!cpan TeX::Hyphen]]. From 56b896f83549dd05fa8a440d72f99ece24d7b536 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 16 Nov 2011 12:50:02 -0400 Subject: [PATCH 058/460] I think this is better done client-side --- doc/todo/hyphenation.mdwn | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/doc/todo/hyphenation.mdwn b/doc/todo/hyphenation.mdwn index be1eebcb8..5b4aaf5c9 100644 --- a/doc/todo/hyphenation.mdwn +++ b/doc/todo/hyphenation.mdwn @@ -3,3 +3,27 @@ I recently found [Hyphenator](http://code.google.com/p/hyphenator/) which is quite cool ... but it should be possible to implement this functionality within ikiwiki and not rely on javascript and the client. A Perl implementation of the algorithm exists in [[!cpan TeX::Hyphen]]. + +> I'd be inclined to say that Javascript run in the client is a better +> place to do hyphenation: this is the sort of non-essential, +> progressive-enhancement thing that JS is perfect for. If you did it +> at the server side, to cope with browser windows of different sizes +> you'd have to serve HTML sprinkled with soft-hyphen entities at +> every possible hyphenation point, like +> +> pro­gress­ive en­hance­ment +> +> which is nearly twice the byte-count and might stop +> search engines from indexing your site correctly. +> +> A browser that supports Javascript probably also supports +> soft-hyphen marks, but I doubt all non-JS browsers support them +> correctly. +> +> It might be good to have a plugin to insert a reference to the +> hyphenation JS into the ``, or a general way to enable +> this sort of thing without writing a plugin or changing your +> `page.tmpl`, though. Perhaps we should have a `local.js` +> alongside `local.css`? :-) +> +> --[[smcv]] From b46aefe3197f5b0a271b5d3b3655ecea464841a6 Mon Sep 17 00:00:00 2001 From: cymor Date: Wed, 16 Nov 2011 17:23:59 -0400 Subject: [PATCH 059/460] Removed broken, dead links, and sites no longer using ikiwiki --- doc/ikiwikiusers.mdwn | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index e9853129c..72f2c6b8e 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -30,14 +30,11 @@ Projects & Organizations * [Debian Mentors wiki](http://jameswestby.net/mentors/) * [The BSD Associate Admin Book Project](http://bsdwiki.reedmedia.net/) * The [maildirman wiki](http://svcs.cs.pdx.edu/maildirman) -* The [linuxbierwanderung wiki/homepage](http://www.linuxbierwanderung.org) * The [Relativistic Programming research wiki](http://wiki.cs.pdx.edu/rp). * [Debian-IN](http://debian-in.alioth.debian.org/) * [Braawi Ltd](http://braawi.com/) and the community site [Braawi.org](http://braawi.org/) * [Webconverger](http://webconverger.org/) (a Web only linux distribution) with a [blog](http://webconverger.org/blog/) -* [debian-community.org](http://debian-community.org/) * [DebTorrent](http://debtorrent.alioth.debian.org) -* The [netconf project](http://netconf.alioth.debian.org) * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/) * The [libkdtree project](http://libkdtree.alioth.debian.org) * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project. (Simple rcs backend) @@ -49,18 +46,14 @@ Projects & Organizations * [Børneuniversitetet](http://support.borneuni.dk/) ([source](http://source.borneuni.dk/)) * [CampusGrün Hamburg](http://www.campusgruen.org/) * The [awesome window manager homepage](http://awesome.naquadah.org/) -* [Enemies of Carlotta](http://www.e-o-c.org/) * [vcs-pkg](http://vcs-pkg.org) * [vcs-home](http://vcs-home.madduck.net) -* [Query Object Framework](http://qof.alioth.debian.org/) -* [Estron - Object Relational Mapping interpreter](http://estron.alioth.debian.org/) * [Public Domain collection of Debian related tips & tricks](http://dabase.com/tips/) - please add any tips too * [Finnish Debian community](http://debian.fi) * [INCL intranuclear cascade and ABLA evaporation/fission](http://www.cs.helsinki.fi/u/kaitanie/incl/) * [dist-bugs](http://dist-bugs.kitenet.net/) * [Chaos Computer Club Düsseldorf](https://www.chaosdorf.de) * [monkeysphere](http://web.monkeysphere.info/) -* [The Walden Effect](http://www.waldeneffect.org/) * [St Hugh of Lincoln Catholic Primary School in Surrey](http://www.sthugh-of-lincoln.surrey.sch.uk/) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. * [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) @@ -94,7 +87,6 @@ Personal sites and blogs * [Ulrik's personal web page](http://kaizer.se/wiki/) * [kite](http://kitenet.net) * [Paul Collins's as-yet purposeless wiki](http://wiki.ondioline.org/) -* [Andre Luis Lopes's personal website](http://www.andrelop.org/). Brazilian Portuguese only * [Alessandro Dotti Contra's personal website](http://www.dotticontra.org/) and [weblog](http://www.dotticontra.org/blog) * [Kelly Clowers' personal website](http://www.clowersnet.net/) * [Anna's nature features](http://kitenet.net/~anna/nature-feature/) @@ -105,8 +97,6 @@ Personal sites and blogs * [Adam Shand's homepage](http://adam.shand.net/iki/) * [Hess family wiki](http://kitenet.net/~family/) * [Zack](http://upsilon.cc/~zack)'s homepage, including [his weblog](http://upsilon.cc/~zack/blog/) -* [Taquiones: Victor Moral's personal website in Spanish](http://taquiones.net) - * [Venexma Europa, S.L.](http://www.venexma.net): It's a small company dedicated to the distribution of shoe accessories. We use ikiwiki for development of internal applications (some areas are password protected). In spanish, of course. * [betacantrips, the personal website of Ethan Glasser-Camp](http://www.betacantrips.com/) * [Keith Packard's homepage and blog](http://keithp.com/). * [Christian Mock's homepage](http://www.tahina.priv.at/). @@ -114,19 +104,13 @@ Personal sites and blogs * [Tales from the Gryphon](http://www.golden-gryphon.com/blog/manoj/), Manoj Srivastava's free software blog. * [Proper Treatment 正當作法](http://conway.rutgers.edu/~ccshan/wiki/) * [lost scraps](http://web.mornfall.net), pages/blog of Petr Ročkai aka mornfall -* [formorers blog and website](http://www.formorer.de/webwiki/) -* [Mark Jaroski's blog](http://movemearound.org/) * [Schabis blaue Seite](http://schabi.de) - I abuse ikiwiki as blog/cms combo, and will migrate all existing content into ikiwiki eventually. -* [Ben Coffey's blog and personal site](http://inelegant.org/). * [blog of LukClaes](http://zomers.be/~luk/blog/). -* [Effective Programming](http://effectiveprogramming.com/) * [Embedded Moose](http://embeddedmoose.com), Andrew Greenberg's personal and consulting page. -* [Chez Fred](http://fred.ccheznous.org) * [Cameron Dale](http://www.camrdale.org/) * [[KarlMW]]'s [homepage](http://mowson.org/karl/), generated with an ikiwiki [asciidoc plugin](http://mowson.org/karl/colophon/). * [Carl Worth's Boring Web Pages](http://www.cworth.org) -* I keep my personal and project notes in a private ikiwiki - it's the perfect tool for this task. - [h01ger](http://layer-acht.org/) * [[NicolasLimare]] ([nil](http://poivron.org/~nil/)+[lab](http://www.ann.jussieu.fr/~limare/)+[id](http://nicolas.limare.net/)+[french translation of the basewiki](http://poivron.org/~nil/ikiwiki-fr/)) * Andrew Sackville-West has setup a [family wiki](http://wiki.swclan.homelinux.org) * [Simon Ward's site](http://bleah.co.uk/) and [blog](http://bleah.co.uk/blog/). @@ -134,13 +118,10 @@ Personal sites and blogs * [Martin's PhD wiki](http://phd.martin-krafft.net/wiki) * [David Riebenbauer's page](http://liegesta.at/) * [Thomas Harning's 'eHarning' wiki](http://www.eharning.us/wiki/) -* [David Bremner's blog](http://www.cs.unb.ca/~bremner/wiki/blog) * [madduck's (new) homepage](http://madduck.net) * [Olivier Berger's professional homepage](http://www-public.it-sudparis.eu/~berger_o/) -* [Andrey Tarantsov's homepage](http://www.tarantsov.com/) * [Don Marti's blog](http://zgp.org/~dmarti/) * [[users/Jon]]'s [homepage](http://jmtd.net/) -* [[xma]] is using ikiwiki () * [[JanWalzer|jwalzer]]'s [homepage](http://wa.lzer.net/) -- Work in Progress * [[Adam_Trickett|ajt]]'s home intranet/sanbox system ([Internet site & blog](http://www.iredale.net/) -- not ikiwiki yet) * [[Simon_McVittie|smcv]]'s [website](http://www.pseudorandom.co.uk/) and @@ -150,16 +131,13 @@ Personal sites and blogs * [Per Bothner's blog](http://per.bothner.com/blog/) * [Bernd Zeimetz (bzed)](http://bzed.de/) * [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch) -* [Simon C.](http://simon.kisikew.org/) - several other sites, too. * [NeoCarz Wiki](http://www.neocarz.com/wiki/) Yes - its actually Ikiwiki behind that! I'm using Nginx and XSL to transform the ikiwiki renderings thanks to the valid XHTML output of ikiwiki. Great work Joey!! * [Natalian - Kai Hendry's personal blog](http://natalian.org/) * [Mick Pollard aka \_lunix_ - Personal sysadmin blog and wiki](http://www.lunix.com.au) -* [tumashu's page](http://tumashu.github.com) This is my personal site in github created with ikiwiki and only a page,you can get the [source](http://github.com/tumashu/tumashu/tree/master) * [Skirv's Wiki](http://wiki.killfile.org) - formerly Skirv's Homepage * [Jimmy Tang - personal blog and wiki](http://www.sgenomics.org/~jtang) * [Nico Schottelius' homepage](http://www.nico.schottelius.org) * [Andreas Zwinkaus homepage](http://beza1e1.tuxen.de) -* [Salient Dream](http://salient.dre.am) * [Walden Effect](http://waldeneffect.org) * [Avian Aqua Miser](http://www.avianaquamiser.com/) * [Cosmic Cookout](http://www.cosmiccookout.com/) @@ -168,7 +146,6 @@ Personal sites and blogs * [Andreas's homepage](http://0x7.ch/) - Ikiwiki, Subversion and CSS template * [Chris Dombroski's boring bliki](https://www.icanttype.org/) * [Josh Triplett's homepage](http://joshtriplett.org/) - Git backend with the CGI disabled, to publish a static site with the convenience of ikiwiki. -* [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) * [Mukund](https://mukund.org/) From ceacee1c17ca0bd32d5056d9a19be335c7b60cf9 Mon Sep 17 00:00:00 2001 From: martin Date: Wed, 16 Nov 2011 19:03:25 -0400 Subject: [PATCH 060/460] --- doc/todo/hyphenation.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/hyphenation.mdwn b/doc/todo/hyphenation.mdwn index 5b4aaf5c9..e7f6bc401 100644 --- a/doc/todo/hyphenation.mdwn +++ b/doc/todo/hyphenation.mdwn @@ -27,3 +27,6 @@ A Perl implementation of the algorithm exists in [[!cpan TeX::Hyphen]]. > alongside `local.css`? :-) > > --[[smcv]] + +>> Thanks, I did not realize that the javascript does something else than add &shy;s - took a closer look at it now. +>> I doubt however that adding them will increase the byte count more than transmitting the javascript. From dbfaea88738c8e753afba2e71b42fd3a1d46685d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Thu, 17 Nov 2011 17:17:48 -0400 Subject: [PATCH 061/460] --- .../resized_img_with_only_width_or_height_breaks_ie.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn diff --git a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn new file mode 100644 index 000000000..2ab1fee36 --- /dev/null +++ b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn @@ -0,0 +1,6 @@ +When using the img directive while reducing the size of the image by only specifying either the width ("100x") or height ("x100"), the resulting HTML breaks/confuses IE (at least 8 and 9). + +In those cases img plugin do generate HTML with the missing attribute as "empty". For example, if the new size is specified as "100x", the resulting HTML will be <img ... width="100" height=""/>. When IE encounters such empty attributes, the image is sort of compressed into a one (1!) pixel high (or wide) image, which is **not** what you expected. + +If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well). + From 0c1176f0133f31776a50b11f38e752571e855b40 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Thu, 17 Nov 2011 17:29:28 -0400 Subject: [PATCH 062/460] --- ...g_with_only_width_or_height_breaks_ie.mdwn | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn index 2ab1fee36..c8196b412 100644 --- a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn +++ b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn @@ -4,3 +4,22 @@ In those cases img plugin do generate HTML with the missing attribute as "empty" If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well). +Inline patch: + +diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm +index b98e843..398e9bc 100644 +--- a/IkiWiki/Plugin/img.pm ++++ b/IkiWiki/Plugin/img.pm +@@ -132,9 +132,9 @@ sub preprocess (@) { + $imglink = $file; + } + } +- +- $dwidth = $im->Get("width") unless defined $dwidth; +- $dheight = $im->Get("height") unless defined $dheight; ++ # get true image width and height from resized image attributes ++ $dwidth = $im->Get("width"); ++ $dheight = $im->Get("height"); + } + } + else { From 937c0742322065452a204069e0ba5abc625ec0c6 Mon Sep 17 00:00:00 2001 From: Per Carlson Date: Thu, 17 Nov 2011 22:59:31 +0100 Subject: [PATCH 063/460] Always use true image size --- IkiWiki/Plugin/img.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index b98e843d4..a28d6a6d5 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -132,9 +132,9 @@ sub preprocess (@) { $imglink = $file; } } - - $dwidth = $im->Get("width") unless defined $dwidth; - $dheight = $im->Get("height") unless defined $dheight; + # always get the true size of the resized image + $dwidth = $im->Get("width"); + $dheight = $im->Get("height"); } } else { From 070b90727139c1415300040ea359aeac7fade9d5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Thu, 17 Nov 2011 18:04:04 -0400 Subject: [PATCH 064/460] --- doc/git.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/git.mdwn b/doc/git.mdwn index eb3cc439b..e589b757e 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -73,6 +73,7 @@ think about merging them. This is recommended. :-) * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/` * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` * [[yds]] `git://github.com/yds/ikiwiki.git` +* [[pelle]] `git://gitorious.org/pelle-ikiwiki/patches.git` ## branches From e48ca145f6cc91c819fdba8b8998b95f15744b1b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Thu, 17 Nov 2011 18:17:33 -0400 Subject: [PATCH 065/460] --- doc/users/pelle.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/pelle.mdwn diff --git a/doc/users/pelle.mdwn b/doc/users/pelle.mdwn new file mode 100644 index 000000000..5475b67e8 --- /dev/null +++ b/doc/users/pelle.mdwn @@ -0,0 +1 @@ +Have migrated some company internal wiki's from MediaWiki to IkiWiki. Going from mysql+php to git+perl is a blessing, never going to look back! From a066e0405e22ed846cb21ec26b8ee972413a79e1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Thu, 17 Nov 2011 18:18:57 -0400 Subject: [PATCH 066/460] --- ...g_with_only_width_or_height_breaks_ie.mdwn | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn index c8196b412..6e98a2369 100644 --- a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn +++ b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn @@ -4,22 +4,4 @@ In those cases img plugin do generate HTML with the missing attribute as "empty" If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well). -Inline patch: - -diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm -index b98e843..398e9bc 100644 ---- a/IkiWiki/Plugin/img.pm -+++ b/IkiWiki/Plugin/img.pm -@@ -132,9 +132,9 @@ sub preprocess (@) { - $imglink = $file; - } - } -- -- $dwidth = $im->Get("width") unless defined $dwidth; -- $dheight = $im->Get("height") unless defined $dheight; -+ # get true image width and height from resized image attributes -+ $dwidth = $im->Get("width"); -+ $dheight = $im->Get("height"); - } - } - else { +A patch (tested and deployed) is sitting waiting in my git repository. From 2872e1d738cafcd884f987f0efeea3fa83c4f470 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Nov 2011 18:47:51 -0400 Subject: [PATCH 067/460] cleanup now unused setting --- IkiWiki/Plugin/img.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm index a28d6a6d5..b92e24cc0 100644 --- a/IkiWiki/Plugin/img.pm +++ b/IkiWiki/Plugin/img.pm @@ -118,7 +118,6 @@ sub preprocess (@) { error sprintf(gettext("failed to read %s: %s"), $outfile, $r) if $r; } else { - ($dwidth, $dheight)=($w, $h); $r = $im->Resize(geometry => "${w}x${h}"); error sprintf(gettext("failed to resize: %s"), $r) if $r; @@ -132,6 +131,7 @@ sub preprocess (@) { $imglink = $file; } } + # always get the true size of the resized image $dwidth = $im->Get("width"); $dheight = $im->Get("height"); From 106d55bf47bbf8c26b1986de59072f48c858cad0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 17 Nov 2011 18:53:23 -0400 Subject: [PATCH 068/460] img: Bugfix to width/height tags for scaled down image when only one dimension was provided. Thanks, Per Carlson. --- debian/changelog | 7 +++++++ .../resized_img_with_only_width_or_height_breaks_ie.mdwn | 2 ++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index f8de0d3e9..7f6564d7f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ikiwiki (3.20111107) UNRELEASED; urgency=low + + * img: Bugfix to width/height tags for scaled down image when only + one dimension was provided. Thanks, Per Carlson. + + -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 + ikiwiki (3.20111106) unstable; urgency=low * searchquery.tmpl: Track escaping change in upstream template. diff --git a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn index 6e98a2369..a5a1c6768 100644 --- a/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn +++ b/doc/bugs/resized_img_with_only_width_or_height_breaks_ie.mdwn @@ -5,3 +5,5 @@ In those cases img plugin do generate HTML with the missing attribute as "empty" If we instead always get the resulting the width and height from the resized image, and uses those values in the img attrs, we make IE happy (and all other renders as well). A patch (tested and deployed) is sitting waiting in my git repository. + +> I've applied your patch. Thanks! [[done]] --[[Joey]] From 6a98c7255dd139d9925e4f7342aead626a31df54 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUtmRueCOLddksWZN8zOVnseVrtRSxM58" Date: Fri, 18 Nov 2011 05:32:00 -0400 Subject: [PATCH 069/460] --- doc/git.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git.mdwn b/doc/git.mdwn index e589b757e..2e58c6992 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -73,7 +73,7 @@ think about merging them. This is recommended. :-) * [[sajolida]] `http://un.poivron.org/~sajolida/ikiwiki.git/` * nezmer `git://gitorious.org/ikiwiki-nezmer/ikiwiki-nezmer.git` * [[yds]] `git://github.com/yds/ikiwiki.git` -* [[pelle]] `git://gitorious.org/pelle-ikiwiki/patches.git` +* [[pelle]] `git://github.com/hemmop/ikiwiki.git` ## branches From 38c220324885e521b6223e0a4e16a4b804824740 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnvhgr8_l1yXhOSKzcUYWhc0Wl70apqW3c" Date: Fri, 18 Nov 2011 07:28:15 -0400 Subject: [PATCH 070/460] Added a trivial table example with a pointless heading --- doc/sandbox.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 3aaf6d885..0c6567f73 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -41,6 +41,15 @@ Testing this sandbox thing. >>> ...and different font colors. >>>> ...but it's nothing a little CSS can't fix. +# Pointless heading + +Let's see a table: + +[[!table data=""" +Heading 1|Heading 2|Heading 3 +Item 1| Item 2| Item 3"""]] + + Numbered list 1. First item. From 3f28f5ceb77586891078343ebd743c472e374cc8 Mon Sep 17 00:00:00 2001 From: simonraven Date: Fri, 18 Nov 2011 08:34:54 -0400 Subject: [PATCH 071/460] --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 72f2c6b8e..977641b40 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -170,3 +170,4 @@ Personal sites and blogs * [Richardson Family Wiki](http://the4richardsons.com) A wiki, blog or some such nonsense for the family home page or something or other... I will eventually move the rest of my sites to ikiwiki. The source of the site is in git. * [The personal website of Andrew Back](http://carrierdetect.com) * [SolderPad Documentation](http://docs.solderpad.com) +* various sub-domains at kisikew.org ([example](https://portal.kisikew.org/)) From 9441b2127bc1a7f308e3a5343a10aa38ba90e08c Mon Sep 17 00:00:00 2001 From: sandman Date: Fri, 18 Nov 2011 11:31:20 -0400 Subject: [PATCH 072/460] --- doc/sandbox/sandbocen.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/sandbox/sandbocen.mdwn diff --git a/doc/sandbox/sandbocen.mdwn b/doc/sandbox/sandbocen.mdwn new file mode 100644 index 000000000..8f7e049c5 --- /dev/null +++ b/doc/sandbox/sandbocen.mdwn @@ -0,0 +1,5 @@ +Great! + + +if (sample == test) goto Dijkstra + From a3354791dbc32866313281f68b5611bc19377610 Mon Sep 17 00:00:00 2001 From: sandman Date: Fri, 18 Nov 2011 11:31:29 -0400 Subject: [PATCH 073/460] --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 0c6567f73..06cb4f25c 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,3 +168,4 @@ endmodule """]] +This is simple enough for now [[sandbocen]] no? From f5205731d99f3d706ede67745f7c2b01a24fb904 Mon Sep 17 00:00:00 2001 From: Franek Date: Sat, 19 Nov 2011 12:36:55 -0400 Subject: [PATCH 074/460] --- .../Can_I_have_different_favicons_for_each_folder__63__.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn diff --git a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn new file mode 100644 index 000000000..0fefb3560 --- /dev/null +++ b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__.mdwn @@ -0,0 +1 @@ +I would like to have different favicons for different parts (folders) of my Ikiwiki site, like you can have different CSS files via the localstyle plugin. Is this possible? If not, could it be made possible? From 45edb2c99a51b65e91ee9d0a4171cc13580a8405 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 19 Nov 2011 12:40:52 -0400 Subject: [PATCH 075/460] reorder depends; git first --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 03b3ea8b3..ee59c8515 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl, libjson-perl Recommends: gcc | c-compiler, libc6-dev | libc-dev, - subversion | git-core (>= 1:1.5.0) | git (>= 1:1.7) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, + git (>= 1:1.7) | git-core (>= 1:1.5.0) | subversion | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38) | darcs, libxml-simple-perl, libnet-openid-consumer-perl, libcrypt-ssleay-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), From 22feeab04311b4c0e4b1bf417a7452703eb9214c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Sat, 19 Nov 2011 17:24:43 -0400 Subject: [PATCH 076/460] --- ...endar:_listing_multiple_entries_per_day.mdwn | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn new file mode 100644 index 000000000..d042096ff --- /dev/null +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn @@ -0,0 +1,17 @@ +Hi, + +I'd very much like to be able to list my blog posts on a daily basis (used for logging work) - rather than have the Calendar plugin return the first post only. + +There was some effort to do this as detailed here. + +http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/ + +I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough. + +I'm not sure how I go about swapping the link on the day number to a link to, I guess, a dynamically generated page of links? + + $linkcach{"$year/$mtag/$mday"}{$p} = ${p} + +and a suitable whilst loop looks to be all that's needed... + +Any pointers appreciated. From c3e68657b156424274f03a8fd4fbfa12731a6cb5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Sat, 19 Nov 2011 17:25:10 -0400 Subject: [PATCH 077/460] --- doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn index d042096ff..51c320067 100644 --- a/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day.mdwn @@ -4,7 +4,7 @@ I'd very much like to be able to list my blog posts on a daily basis (used for l There was some effort to do this as detailed here. -http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/ +[[http://ikiwiki.info/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin/]] I had a quick go at doing something similar on Debian Stable (Ikiwiki 3.0) but alas my Ikiwiki fu is not strong enough. From daf2a28f4348cef8e0c440e5c0f7d43c33845b11 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 20 Nov 2011 09:50:57 -0400 Subject: [PATCH 078/460] --- doc/todo/Modern_standard_layout.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/Modern_standard_layout.mdwn diff --git a/doc/todo/Modern_standard_layout.mdwn b/doc/todo/Modern_standard_layout.mdwn new file mode 100644 index 000000000..de7acb28e --- /dev/null +++ b/doc/todo/Modern_standard_layout.mdwn @@ -0,0 +1 @@ +I think it would be a good idea to think about the standard layout style of ikiwiki, the current layout used in a standard setup and on ikiwiki.info as well looks a bit old-fashioned to me. I guess that a nice modern layout would attract more new ikiwiki users and boost the ikwiki community... From e4a08ceb3b8b06065aa9b3501daaaefa40352e55 Mon Sep 17 00:00:00 2001 From: "http://jmtd.livejournal.com/" Date: Mon, 21 Nov 2011 05:36:31 -0400 Subject: [PATCH 079/460] --- doc/todo/Modern_standard_layout.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/Modern_standard_layout.mdwn b/doc/todo/Modern_standard_layout.mdwn index de7acb28e..feb08e8ac 100644 --- a/doc/todo/Modern_standard_layout.mdwn +++ b/doc/todo/Modern_standard_layout.mdwn @@ -1 +1,3 @@ I think it would be a good idea to think about the standard layout style of ikiwiki, the current layout used in a standard setup and on ikiwiki.info as well looks a bit old-fashioned to me. I guess that a nice modern layout would attract more new ikiwiki users and boost the ikwiki community... + +> FWIW, I agree. The actiontabs [[theme|themes]] would be a better default, but something which showed what ikiwiki was capable of (or more precicely: that ikiwiki is as capable as other popular wiki softwares) would be better still. — [[Jon]] From 3383ebbc840047075f39c495434b212966e3e3dd Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 21 Nov 2011 07:37:02 -0400 Subject: [PATCH 080/460] Added a comment --- ..._a01112ba235e2f44a7655c36ef680e7e._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment diff --git a/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment new file mode 100644 index 000000000..dee6e610e --- /dev/null +++ b/doc/forum/Can_I_have_different_favicons_for_each_folder__63__/comment_1_a01112ba235e2f44a7655c36ef680e7e._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 1" + date="2011-11-21T11:37:02Z" + content=""" +You could use [[plugins/pagetemplate]] to override all of `page.tmpl`, but +that's using a sledgehammer to crack a nut. + +Another way to do it would be to modify `IkiWiki/Plugins/favicon.pm` +to use `bestlink` to find the favicon, like [[plugins/localstyle]] does. +If you made it a config option (`localfavicon => 1` or something) +it could probably be included in ikiwiki as part of the official +[[plugins/favicon]] plugin? + +Another way would be to have a new `localfavicon` plugin which overrides +the template variable from [[plugins/favicon]], using `last => 1` to +make sure it \"wins\". +"""]] From dfbe3ce2e9783ed2e447da375b4c78936b670475 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 21 Nov 2011 13:08:50 -0400 Subject: [PATCH 081/460] the anti-theme is a feature, but doesn't necessarily need to be the default --- doc/todo/Modern_standard_layout.mdwn | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/doc/todo/Modern_standard_layout.mdwn b/doc/todo/Modern_standard_layout.mdwn index feb08e8ac..e8c3dc946 100644 --- a/doc/todo/Modern_standard_layout.mdwn +++ b/doc/todo/Modern_standard_layout.mdwn @@ -1,3 +1,25 @@ I think it would be a good idea to think about the standard layout style of ikiwiki, the current layout used in a standard setup and on ikiwiki.info as well looks a bit old-fashioned to me. I guess that a nice modern layout would attract more new ikiwiki users and boost the ikwiki community... > FWIW, I agree. The actiontabs [[theme|themes]] would be a better default, but something which showed what ikiwiki was capable of (or more precicely: that ikiwiki is as capable as other popular wiki softwares) would be better still. — [[Jon]] + +>> As an author of plugins that interact with the UI, I think it's good that +>> a *minimal* ikiwiki has a minimal anti-theme, and that plugins are +>> developed against the anti-theme - it's a "blank slate" for themes. +>> [[plugins/contrib/trail]] was much easier to get working in +>> the default anti-theme than in actiontabs and blueview. +>> +>> Technical detail: all the standard themes are done by appending to the +>> anti-theme's CSS (albeit in ikiwiki's build system rather than during +>> the wiki build), rather than by replacing it - so themes that haven't +>> been updated for a new UI element end up using the version of it from +>> the anti-theme. [[plugins/Comments]] and [[plugins/contrib/trail]] +>> both need some tweaks per-theme to make them integrate nicely, +>> but most of the design comes from the anti-theme. +>> +>> That doesn't necessarily mean the anti-theme should be the one used +>> on ikiwiki.info, or used by default in new wikis - from my +>> point of view, it'd be fine for either of those to be actiontabs +>> or something The important thing is to *have* a "blank slate" anti-theme +>> that looks simple but sufficient, as a basis for new styles (either +>> [[themes]], or wikis that want their own unique stylesheet), and derive +>> the other themes from it. --[[smcv]] From c051862fe338cc1526c800e36522280beb495677 Mon Sep 17 00:00:00 2001 From: NeilSmithline Date: Mon, 21 Nov 2011 18:10:23 -0400 Subject: [PATCH 082/460] --- doc/users/NeilSmithline.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/NeilSmithline.mdwn diff --git a/doc/users/NeilSmithline.mdwn b/doc/users/NeilSmithline.mdwn new file mode 100644 index 000000000..27370248e --- /dev/null +++ b/doc/users/NeilSmithline.mdwn @@ -0,0 +1 @@ +Neil Smithline, that's me! From 7cd083dc66f80a3c27e8717aa0da1465b4e9b9ef Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 15:44:53 -0400 Subject: [PATCH 083/460] --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/bugs/Running_on_an_alternative_port_fails.mdwn diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn new file mode 100644 index 000000000..c6e09171d --- /dev/null +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -0,0 +1,7 @@ +Can't appear to get 'wiki' functions (i.e. editing) running when ikiwiki is running on a port other than the default (port 80). Somewhere in the processing it considers the base URL to exclude the port number and the websever throws back an error finding the page. + +For example if you run on 'http://my.gear.xxx:8080/' then after clicking login (using default password auth) it will process and try to redirect you to 'http://my.gear.xxx/cgi-bin/ikiwiki.cgi'. I'm assuming that somewhere we've used the 'path' and the 'host' and dropped the remainder. I can figure out where this is yet but I'll post back if I get lucky. + + -- fergus + +NB: both the 'url' and the 'cgiurl' include the port and removing the port element provides the expected functionality. From 64e09f9968c5db26aef7bfdd70bde7c86c8fa144 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Nov 2011 16:13:16 -0400 Subject: [PATCH 084/460] cannot reproduce --- IkiWiki/Plugin/highlight.pm | 2 +- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/highlight.pm b/IkiWiki/Plugin/highlight.pm index 33d136fbf..4e86207f1 100644 --- a/IkiWiki/Plugin/highlight.pm +++ b/IkiWiki/Plugin/highlight.pm @@ -52,7 +52,7 @@ sub getsetup () { sub checkconfig () { eval q{use highlight}; - if (highlight::DataDir->can('new')){ + if (highlight::DataDir->can('new')) { $data_dir=new highlight::DataDir(); $data_dir->searchDataDir(""); } else { diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index c6e09171d..8b5fefa91 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -5,3 +5,12 @@ For example if you run on 'http://my.gear.xxx:8080/' then after clicking login ( -- fergus NB: both the 'url' and the 'cgiurl' include the port and removing the port element provides the expected functionality. + +> I tried to reproduce this by making my laptop's web server use port +> 8080. Set up ikiwiki to use that in cgiurl and url, and had +> no problem with either openid or password auth login. +> +> Ikiwiki has had some changes in this area in the past year; you don't say +> what version you were using. It could also be a problem with your web +> server, conceviably, if didn't correctly communicate the port to the cgi +> program. --[[Joey]] From 9d2fe796c97d754bb3052d8174b45bc103990756 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Nov 2011 16:32:07 -0400 Subject: [PATCH 085/460] response --- doc/todo/Modern_standard_layout.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/doc/todo/Modern_standard_layout.mdwn b/doc/todo/Modern_standard_layout.mdwn index e8c3dc946..37f1ee740 100644 --- a/doc/todo/Modern_standard_layout.mdwn +++ b/doc/todo/Modern_standard_layout.mdwn @@ -23,3 +23,17 @@ I think it would be a good idea to think about the standard layout style of ikiw >> that looks simple but sufficient, as a basis for new styles (either >> [[themes]], or wikis that want their own unique stylesheet), and derive >> the other themes from it. --[[smcv]] + +> Ikiwiki's minimal theme is not modern. It's postmodern. I like it for the +> reasons described here. +> " The minimalism sucked you in, it made the web feel like one coherent, +> unified thing, unlike the constellation of corporate edifices occupying +> much of it today." +> +> I see an increasing trend back toward these principles, driven partly +> by limits of eg, smartphone UI. So I certianly won't be changing the +> look of any of my ikiwiki sites, including this one. +> +> `auto.setup` and `auto-blog.setup` could have different defaults, +> or allow a theme to be picked as [Branchable](http://branchable.com/) +> does. Perhaps actiontabs for auto-blog and default for wikis? --[[Joey]] From d4101ad64f801f862cceab51f91a2a66e51b73d8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 16:35:21 -0400 Subject: [PATCH 086/460] --- .../Running_on_an_alternative_port_fails.mdwn | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 8b5fefa91..ca835cb59 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -6,6 +6,8 @@ For example if you run on 'http://my.gear.xxx:8080/' then after clicking login ( NB: both the 'url' and the 'cgiurl' include the port and removing the port element provides the expected functionality. +--- + > I tried to reproduce this by making my laptop's web server use port > 8080. Set up ikiwiki to use that in cgiurl and url, and had > no problem with either openid or password auth login. @@ -14,3 +16,35 @@ NB: both the 'url' and the 'cgiurl' include the port and removing the port eleme > what version you were using. It could also be a problem with your web > server, conceviably, if didn't correctly communicate the port to the cgi > program. --[[Joey]] + +--- + +>> I did think of that so threw a 'printenv' script to check the port was arriving +right. + +>>> SERVER_PORT=8181 +>>> HTTP_HOST=zippy0.ie0.cobbled.net +>>> HTTP_ACCEPT_LANGUAGE=en-ie, en +>>> PATH=/usr/local/bin:/usr/ucb:/bin:/usr/bin +>>> SCRIPT_NAME=/cgi-bin/printenv.sh +>>> HTTP_USER_AGENT=Mozilla/5.0 (X11; U; Linux i686; en-ie) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ Ubuntu/10.10 () Epiphany/2.30.2 +>>> PWD=/home/http1/www/cgi-bin +>>> REQUEST_METHOD=GET +>>> SERVER_SOFTWARE=thttpd +>>> SERVER_NAME=zippy0 +>>> SERVER_PROTOCOL=HTTP/1.1 +>>> HTTP_ACCEPT_ENCODING=gzip +>>> GATEWAY_INTERFACE=CGI/1.1 +>>> CGI_PATTERN=cgi-bin/* +>>> HTTP_COOKIE=ikiwiki_session_c%5E2%3Fsupport%3Dtrue=bdf13df0460966a607ba497967ea5ff4 +>>> REMOTE_ADDR=10.0.0.1 +>>> HTTP_ACCEPT=application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 + +>>Seems to be. Using version from packaging system; + +>>> ikiwiki-3.20110905 + +>> which I'd guess is from Apr last year. Will look for updates and post back if still +wrong. +>> Cheers +>> -- fergus From 79a3148eba767ff903b103372c652ee41484693e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 16:38:31 -0400 Subject: [PATCH 087/460] --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index ca835cb59..7db0db386 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -46,5 +46,10 @@ right. >> which I'd guess is from Apr last year. Will look for updates and post back if still wrong. + >> Cheers + >> -- fergus + +>> PS: all the links generated by CGI pages omit the port; this works if i login first and then +reset the server on the 'odd' port -- hovering over the links absolute links with the port missing. From d6011a150003aa336072a59ff1209a929718ce83 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 16:41:13 -0400 Subject: [PATCH 088/460] --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 7db0db386..2dea7a8dc 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -44,7 +44,7 @@ right. >>> ikiwiki-3.20110905 ->> which I'd guess is from Apr last year. Will look for updates and post back if still +>> which I'd guess is from Sep. Will look for updates and post back if still wrong. >> Cheers From 239e609bcf4e4c85fa505775e16ef4cb07655759 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Nov 2011 16:54:39 -0400 Subject: [PATCH 089/460] analysis --- .../Running_on_an_alternative_port_fails.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 7db0db386..b97f64383 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -24,6 +24,22 @@ right. >>> SERVER_PORT=8181 >>> HTTP_HOST=zippy0.ie0.cobbled.net + +>>>> In apache, `HTTP_HOST` includes the port. This is not part of the CGI +>>>> spec it seems, but perl's `CGI` module seems to rely on it, +>>>> in `virtual_port`: + +
+    my $vh = $self->http('x_forwarded_host') || $self->http('host');
+    my $protocol = $self->protocol;
+    if ($vh) {
+        return ($vh =~ /:(\d+)$/)[0] || ($protocol eq 'https' ? 443 : 80);
+
+ +>>>> The `CGI` module only looks at `SERVER_PORT` when there's no +>>>> `HTTP_HOST`. So this is either a bug in perl's CGI or thttpd. +>>>> --[[Joey]] + >>> HTTP_ACCEPT_LANGUAGE=en-ie, en >>> PATH=/usr/local/bin:/usr/ucb:/bin:/usr/bin >>> SCRIPT_NAME=/cgi-bin/printenv.sh From 0ee337113e722c9fd6ef46dda5819a607ec1a9b6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 18:40:41 -0400 Subject: [PATCH 090/460] Bug identified in user's web server [closed] --- .../Running_on_an_alternative_port_fails.mdwn | 46 +++++++------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index d091bf1fc..864c99fed 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -25,47 +25,33 @@ right. >>> SERVER_PORT=8181 >>> HTTP_HOST=zippy0.ie0.cobbled.net +[ ... ] + >>>> In apache, `HTTP_HOST` includes the port. This is not part of the CGI >>>> spec it seems, but perl's `CGI` module seems to rely on it, >>>> in `virtual_port`: -
-    my $vh = $self->http('x_forwarded_host') || $self->http('host');
-    my $protocol = $self->protocol;
-    if ($vh) {
-        return ($vh =~ /:(\d+)$/)[0] || ($protocol eq 'https' ? 443 : 80);
-
+>>>>> my $vh = $self->http('x_forwarded_host') || $self->http('host'); +>>>>> my $protocol = $self->protocol; +>>>>> if ($vh) { +>>>>> return ($vh =~ /:(\d+)$/)[0] || ($protocol eq 'https' ? 443 : 80); >>>> The `CGI` module only looks at `SERVER_PORT` when there's no >>>> `HTTP_HOST`. So this is either a bug in perl's CGI or thttpd. >>>> --[[Joey]] ->>> HTTP_ACCEPT_LANGUAGE=en-ie, en ->>> PATH=/usr/local/bin:/usr/ucb:/bin:/usr/bin ->>> SCRIPT_NAME=/cgi-bin/printenv.sh ->>> HTTP_USER_AGENT=Mozilla/5.0 (X11; U; Linux i686; en-ie) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ Ubuntu/10.10 () Epiphany/2.30.2 ->>> PWD=/home/http1/www/cgi-bin ->>> REQUEST_METHOD=GET ->>> SERVER_SOFTWARE=thttpd ->>> SERVER_NAME=zippy0 ->>> SERVER_PROTOCOL=HTTP/1.1 ->>> HTTP_ACCEPT_ENCODING=gzip ->>> GATEWAY_INTERFACE=CGI/1.1 ->>> CGI_PATTERN=cgi-bin/* ->>> HTTP_COOKIE=ikiwiki_session_c%5E2%3Fsupport%3Dtrue=bdf13df0460966a607ba497967ea5ff4 ->>> REMOTE_ADDR=10.0.0.1 ->>> HTTP_ACCEPT=application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5 +[ ... ] ->>Seems to be. Using version from packaging system; +--- ->>> ikiwiki-3.20110905 +>>>>> This is interesting. If HTTP_HOST is wrong then ->> which I'd guess is from Sep. Will look for updates and post back if still -wrong. +>>>>> 0. the client header must be wrong (i.e. not including the PORT) +>>>>> 0. `perl`'s doing something bad[tm] (or at least lazy) +>>>>> 0. `apache` is adding it +>>>>> 0. `thttpd` is stripping it ->> Cheers +>>>>> Quick hack shows that `thttpd` must be stripping the port +number from the `Host:` header. That can be fixed. ->> -- fergus - ->> PS: all the links generated by CGI pages omit the port; this works if i login first and then -reset the server on the 'odd' port -- hovering over the links absolute links with the port missing. +>>>>> Thanks for the assist. -- fergus From 65acd8f71c104384ca3c604d4b3efd8ace5624ab Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 19:23:57 -0400 Subject: [PATCH 091/460] Patch for 'thttpd' should anyone else find this problem in archives. --- .../Running_on_an_alternative_port_fails.mdwn | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 864c99fed..8bc0f90af 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -55,3 +55,26 @@ right. number from the `Host:` header. That can be fixed. >>>>> Thanks for the assist. -- fergus + +--- + +Patch for `thttpd-2.25b` for posterity and completeness + +[[!format patch """ + +diff --git a/libhttpd.c b/libhttpd.c +index 73689be..039b7e3 100644 +--- a/libhttpd.c ++++ b/libhttpd.c +@@ -2074,9 +2074,6 @@ httpd_parse_request( httpd_conn* hc ) + cp = &buf[5]; + cp += strspn( cp, " \t" ); + hc->hdrhost = cp; +- cp = strchr( hc->hdrhost, ':' ); +- if ( cp != (char*) 0 ) +- *cp = '\0'; + if ( strchr( hc->hdrhost, '/' ) != (char*) 0 || hc->hdrhost[0] == '.' ) + { + httpd_send_err( hc, 400, httpd_err400title, "", httpd_err400form, "" ); + +"""]] From cf8a46b761ab4131fa08aade85b840bbfd4d2ba1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 23 Nov 2011 19:24:37 -0400 Subject: [PATCH 092/460] --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 8bc0f90af..fa4d86ce0 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -78,3 +78,5 @@ index 73689be..039b7e3 100644 httpd_send_err( hc, 400, httpd_err400title, "", httpd_err400form, "" ); """]] + +-- fergus From 76bccd9b70d29c900306587d566e9e3343c084f3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 23 Nov 2011 19:45:57 -0400 Subject: [PATCH 093/460] filed bug on CGI.pm --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index fa4d86ce0..006c27232 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -80,3 +80,6 @@ index 73689be..039b7e3 100644 """]] -- fergus + +I've gone ahead and filed a bug on CGI.pm too: + --[[Joey]] From ae7fbb50e53c68862485101be4efa25ea143b968 Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 23 Nov 2011 20:46:54 -0400 Subject: [PATCH 094/460] Change all shortcuts to use https where possible. --- doc/shortcuts.mdwn | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn index d81ec98fc..ecd73f52c 100644 --- a/doc/shortcuts.mdwn +++ b/doc/shortcuts.mdwn @@ -13,27 +13,27 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]] * [[!shortcut name=archive url="http://web.archive.org/*/%S"]] -* [[!shortcut name=gmap url="http://maps.google.com/maps?q=%s"]] -* [[!shortcut name=gmsg url="http://groups.google.com/groups?selm=%s"]] +* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]] +* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]] * [[!shortcut name=wikipedia url="https://en.wikimedia.org/wiki/%s"]] * [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]] * [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]] * [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]] -* [[!shortcut name=deblist url="http://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] +* [[!shortcut name=deblist url="https://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]] * [[!shortcut name=debpkg url="http://packages.debian.org/%s"]] * [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]] * [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]] -* [[!shortcut name=debmsg url="http://lists.debian.org/msgid-search/%s"]] +* [[!shortcut name=debmsg url="https://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.org/package/%s/"]] * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`. See for details. -* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]] +* [[!shortcut name=debwiki url="https://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"]] -* [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] -* [[!shortcut name=linuxbug url="http://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]] +* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]] +* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]] * [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]] -* [[!shortcut name=gnulist url="http://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]] +* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]] * [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]] * [[!shortcut name=marclist url="http://marc.info/?l=%s"]] * [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]] @@ -43,7 +43,7 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]] * [[!shortcut name=iki url="http://ikiwiki.info/%S/"]] * [[!shortcut name=ljuser url="http://%s.livejournal.com/"]] -* [[!shortcut name=rfc url="http://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]] +* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]] * [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]] * [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]] * [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]] @@ -53,12 +53,12 @@ This page controls what shortcut links the wiki supports. * [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]] * [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]] * [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]] -* [[!shortcut name=cve url="http://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] +* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]] * [[!shortcut name=cia url="http://cia.vc/stats/project/%s"]] * [[!shortcut name=ciauser url="http://cia.vc/stats/user/%s"]] -* [[!shortcut name=flickr url="http://www.flickr.com/photos/%s"]] +* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]] * [[!shortcut name=man url="http://linux.die.net/man/%s"]] -* [[!shortcut name=ohloh url="http://www.ohloh.net/projects/%s"]] +* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]] * [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]] * [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]] * [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]] From 41fe5053e99221b403a8c003403c5d6143bd1a7c Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 23 Nov 2011 21:21:25 -0400 Subject: [PATCH 095/460] Add information about plugin dependencies, for use when splitting plugins into separate packages. --- ...dencies_into_separate_Debian_packages.mdwn | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn diff --git a/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn b/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn new file mode 100644 index 000000000..e309bad2c --- /dev/null +++ b/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn @@ -0,0 +1,42 @@ +(Notes from discussion between Joey Hess and Josh Triplett.) + +The Debian ikiwiki package has a pile of recommends and suggests for packages needed by various plugins and other optional functionality. To make it easier for people to figure out what to install, and to make it easier for automatic dependency tracking to remove packages ikiwiki no longer needs, we could split the plugins with additional dependencies into their own packages. + +Notable plugin dependencies: + +- [[plugins/img]] depends on [[!debpkg perlmagick]] +- [[plugins/graphviz]] depends on [[!debpkg graphviz]] + - [[plugins/linkmap]] depends on the graphviz plugin, so it should probably go in the same package. +- [[plugins/polygen]] depends on [[!debpkg polygen]] +- [[plugins/teximg]] depends on [[!debpkg dvipng]] and [[!debpkg texlive]] +- [[plugins/htmltidy]] depends on [[!debpkg tidy]] +- [[plugins/table]] depends on [[!debpkg libtext-csv-perl]] +- [[plugins/textile]] depends on [[!debpkg libtext-textile-perl]] +- [[plugins/txt]] should probably just depend on [[!debpkg liburi-find-perl]] +- [[plugins/sparkline]] depends on [[!debpkg libsparkline-php]], which pulls in the whole PHP stack. + - [[plugins/postsparkline]] depends on the sparkline plugin, so it should probably go in the same package. +- [[plugins/search]] depends on [[!debpkg xapian-omega]] and [[!debpkg libsearch-xapian-perl]] +- [[plugins/po]] depends on [[!debpkg po4a]] (and possibly [[!debpkg gettext]] and [[!debpkg liblocale-gettext-perl]], or does something else use those?) +- [[plugins/amazon_s3]] depends on [[!debpkg libnet-amazon-s3-perl]] and [[!debpkg libfile-mimeinfo-perl]] +- [[plugins/highlight]] depends on [[!debpkg libhighlight-perl]] +- [[plugins/htmlbalance]] depends on [[!debpkg libhtml-tree-perl]] +- [[plugins/typography]] depends on [[!debpkg libtext-typography-perl]] +- [[plugins/creole]] depends on [[!debpkg libtext-wikicreole-perl]] +- [[plugins/wikitext]] depends on [[!debpkg libtext-wikiformat-perl]] +- [[plugins/rst]] depends on [[!debpkg librpc-xml-perl]] and [[!debpkg python-docutils]], and pulls in Python +- [[plugins/blogspam]] depends on [[!debpkg librpc-xml-perl]] +- [[plugins/prettydate]] depends on [[!debpkg libtimedate-perl]] +- [[plugins/hnb]] depends on [[!debpkg hnb]] +- [[plugins/fortune]] depends on [[!debpkg fortune]] +- [[plugins/filecheck]] depends on [[!debpkg libfile-mimeinfo-perl]] and file +- [[plugins/ddate]] depends on [[!debpkg libdatetime-calendar-discordian-perl]] and [[!debpkg libdatetime-perl]] +- [[plugins/otl]] depends on [[!debpkg vim-vimoutliner]] +- [[plugins/haiku]] depends on [[!debpkg libcoy-perl]] +- [[plugins/sortnaturally]] depends on [[!debpkg libsort-naturally-perl]] +- [[plugins/pinger]] depends on [[!debpkg liblwpx-paranoidagent-perl]] (it works with plain LWP, but less securely) and should probably just depend on [[!debpkg libcrypt-ssleay-perl]] +- [[plugins/openid]] depends on [[!debpkg libnet-openid-consumer-perl]], and should either recommend or just depend on [[!debpkg liblwpx-paranoidagent-perl]] and [[!debpkg libcrypt-ssleay-perl]] +- Support for tla depends on [[!debpkg libmailtools-perl]] (could make this a package depending on [[!debpkg tla]] and [[!debpkg libmailtools-perl]]) + +Also, ikiwiki should probably just depend on [[!debpkg libauthen-passphrase-perl]] and refuse to store insecure passwords. + +[[!tag wishlist]] From 4d04324d7f11e696e094dbbe1707e96078f1508a Mon Sep 17 00:00:00 2001 From: JoshTriplett Date: Wed, 23 Nov 2011 21:23:51 -0400 Subject: [PATCH 096/460] Remove unnecessary preface. --- ...ith_external_dependencies_into_separate_Debian_packages.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn b/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn index e309bad2c..fdf0dea50 100644 --- a/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn +++ b/doc/todo/Split_plugins_with_external_dependencies_into_separate_Debian_packages.mdwn @@ -1,5 +1,3 @@ -(Notes from discussion between Joey Hess and Josh Triplett.) - The Debian ikiwiki package has a pile of recommends and suggests for packages needed by various plugins and other optional functionality. To make it easier for people to figure out what to install, and to make it easier for automatic dependency tracking to remove packages ikiwiki no longer needs, we could split the plugins with additional dependencies into their own packages. Notable plugin dependencies: From 852e28497b7a9994f03d3b0abfcb7cfd88798138 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 24 Nov 2011 08:46:27 -0400 Subject: [PATCH 097/460] response to query --- doc/todo/pdf_output.mdwn | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index 0de0776cf..bf30d0b7d 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -5,5 +5,10 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te > I've actually written one, it's just not publicly released. You can check it out from the "experimental" branch of my ikiplugins githup repo. It's called "html2pdf" and it depends on the static version of wkhtmltopdf rather than requiring a whole LaTeX setup. It's only been used on Ubuntu, so I can't say what problems there might be on other setups, but it works for me. It's not properly documented; I'd appreciate some help with that. > -- [[KathrynAndersen]] -> Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's -> -- [[micheal]] +>> Thanks, I downloaded the git-repro and did `sudo cp html2pdf.pm /usr/share/perl5/IkiWiki/Plugin/` then I added html2pdf to the addplugins line in my setup-file (`mywiki.setup`) as well a new line `html2pdf_pages=>"/*",`. Then I did `sudo ikiwiki --setup mywiki.setup`. However there is no button or something like that which let's me create the pdf's +>> -- [[micheal]] + +>>> That is because they are created automatically as part of the page-build process. That's what the "html2pdf_pages" option is for: it defines which pages have PDFs generated from them. If a PDF is generated for page "foo", then the PDF itself will be in "foo/foo.pdf". + +>>> I also notice you didn't mention installing wkhtmltopdf - it won't create PDFs without that! +>>> -- [[KathrynAndersen]] From 1d6086d80d6b953114b8001f7714888eac2c4e8a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Thu, 24 Nov 2011 14:58:39 -0400 Subject: [PATCH 098/460] --- doc/todo/pdf_output.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index bf30d0b7d..602180392 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -12,3 +12,5 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te >>> I also notice you didn't mention installing wkhtmltopdf - it won't create PDFs without that! >>> -- [[KathrynAndersen]] + +>>>> Yes, wkhtmltopdf is installed and works, however there are no pdf-files in my /var/www/myiki directory or in scrdir. From f6a6387a290a39f0430b960204a6561af6a8e3b0 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Thu, 24 Nov 2011 18:55:40 -0400 Subject: [PATCH 099/460] need more data --- doc/todo/pdf_output.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/pdf_output.mdwn b/doc/todo/pdf_output.mdwn index 602180392..29c89e4eb 100644 --- a/doc/todo/pdf_output.mdwn +++ b/doc/todo/pdf_output.mdwn @@ -14,3 +14,7 @@ Note that for example dokuwiki has a [[nice plugin|http://danjer.doudouke.org/te >>> -- [[KathrynAndersen]] >>>> Yes, wkhtmltopdf is installed and works, however there are no pdf-files in my /var/www/myiki directory or in scrdir. + +>>>>> Have you tried running it with "verbose" turned on, and noting the output? That could give some clues. +>>>>> And no, the PDFs are not placed in the source dir, only in the destination dir. +>>>>> -- [[KathrynAndersen]] From 5bd543c89f8936592d32c3df572962d1442a30da Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlg64ZtqP3l9baIn5cfxkvnHiBhlpNB4Nk" Date: Fri, 25 Nov 2011 23:05:40 -0400 Subject: [PATCH 100/460] --- ...sion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn new file mode 100644 index 000000000..0eadc5809 --- /dev/null +++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn @@ -0,0 +1 @@ +For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the FormattingHelp link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist. From 083c7b59f34f1d07d796e97587ea99c8710f22f9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmwBHQiKlytEhluwPiAXSqjMh8FNmw6Qww" Date: Sat, 26 Nov 2011 21:53:04 -0400 Subject: [PATCH 101/460] --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 06cb4f25c..9b7375e45 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -11,6 +11,7 @@ This is my custom sidebar for this page. [[!sidebar ]] ## number 2 +### number 3 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). From 0594bfda0ed879f2bb3aa83b50585bcc77268440 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 27 Nov 2011 06:24:36 -0400 Subject: [PATCH 102/460] --- doc/forum/Last_visited_pages.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Last_visited_pages.mdwn diff --git a/doc/forum/Last_visited_pages.mdwn b/doc/forum/Last_visited_pages.mdwn new file mode 100644 index 000000000..ae87cf177 --- /dev/null +++ b/doc/forum/Last_visited_pages.mdwn @@ -0,0 +1 @@ +Is it possible to add a list of the n last visited pages on the bottom of each ikiwiki page (or maybe on a sidebar)? From 2fb93fe7b1e2f7eb19c9511f7919061ee3f0fcb9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 27 Nov 2011 06:31:31 -0400 Subject: [PATCH 103/460] --- doc/todo/wmd_editor_live_preview.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/todo/wmd_editor_live_preview.mdwn diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn new file mode 100644 index 000000000..fb7f04c09 --- /dev/null +++ b/doc/todo/wmd_editor_live_preview.mdwn @@ -0,0 +1,5 @@ +Some time ago there was [[a question|http://ikiwiki.info/forum/wmd_editor_double_preview/]] in the forum about wmd editor and preview. However there were no answers: + +I use the wmd editor in my ikiwiki. However live preview seems not to be a fully correct preview so nevertheless I have to hit the preview button to get a correct preview. However then I have two previews so that I have to scroll down to see the correct one. + +Is it possible to disable the live preview or to replace the live preview with the correct one after pressing the preview button? From 17d2dcc7697db4ed32412bff168f7378007eeda2 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 27 Nov 2011 07:09:55 -0400 Subject: [PATCH 104/460] Added a comment --- .../comment_1_e34650064dd645b35da98e80c0311df9._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Last_visited_pages/comment_1_e34650064dd645b35da98e80c0311df9._comment diff --git a/doc/forum/Last_visited_pages/comment_1_e34650064dd645b35da98e80c0311df9._comment b/doc/forum/Last_visited_pages/comment_1_e34650064dd645b35da98e80c0311df9._comment new file mode 100644 index 000000000..c5e2cc8ad --- /dev/null +++ b/doc/forum/Last_visited_pages/comment_1_e34650064dd645b35da98e80c0311df9._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2011-11-27T11:09:55Z" + content=""" +Only if you could do it with JavaScript or SSI; remember IkiWiki is a wiki *compiler* - all the pages are generated beforehand, their content remains the same no matter what your visitor is doing. +"""]] From 22a03cb74077ba6d6ee0b448bf115752095a1e2b Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 07:45:28 -0400 Subject: [PATCH 105/460] link to remote setup --- doc/setup/discussion.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/setup/discussion.mdwn b/doc/setup/discussion.mdwn index 388d5a49c..7ab935181 100644 --- a/doc/setup/discussion.mdwn +++ b/doc/setup/discussion.mdwn @@ -265,5 +265,7 @@ Did anyone tried to install ikiwiki under a vhost setup ? ikiwiki is installed under a debian lenny system. but without write acces to /etc/ikiwiki (obvious) i am coming not far. Or do i miss something which is probably hidden deeper in the documentation ? +Well it should be similar to shared hosting [or a remote server in general](http://ikiwiki.info/forum/how_to_setup_ikiwiki_on_a_remote_host/) + ---- Perhaps it's worth noting that when installing ikiwiki with apt on Debian stable, you need to use the backports version in order to follow the setup instructions. From 9851638bd2cd59609054d24c345c895b2d7ad21f Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 07:54:34 -0400 Subject: [PATCH 106/460] chmod problem --- .../ikiwiki_generates_html_files_with_600_permission..mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn new file mode 100644 index 000000000..823a74156 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn @@ -0,0 +1,3 @@ +I installed ikiwiki the usual way, my rcs is git, i configure the post-update hook in the bare-repo and use the cgi script in the non-bare. What drives me crazy is the following situation. I update my wiki through git (clone the bare repo on my laptop (WORKING CLONE), make a change and push it back to origin ($REPOSITORY)). Then the post-update hook (configured in my ikiwiki.config) kicks in and updates the checked out wiki ($DESTDIR) and the cgi script there generates html. See [[rcs/git]] if something is not clear. + +My problem is: every generated html/css/favicon file is only write and readable by the user (600) and no one else. From c90f1e330d8a1c7cc3ec1621772a7f836c7ec408 Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 07:55:58 -0400 Subject: [PATCH 107/460] Added a comment --- .../comment_1_698e686ef3df46be3a38d58d0b68671c._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment new file mode 100644 index 000000000..efd65faf1 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="ikiwikert" + ip="134.99.22.236" + subject="comment 1" + date="2011-11-27T11:55:58Z" + content=""" +If i edit the wiki through the webinterface everything is fine. +"""]] From e19a23b63e507fd04754adb836293444a9670a4d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 27 Nov 2011 08:23:31 -0400 Subject: [PATCH 108/460] Added a comment --- .../comment_2_2a0c4e844da1deaa2c286e87c8eab84d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Last_visited_pages/comment_2_2a0c4e844da1deaa2c286e87c8eab84d._comment diff --git a/doc/forum/Last_visited_pages/comment_2_2a0c4e844da1deaa2c286e87c8eab84d._comment b/doc/forum/Last_visited_pages/comment_2_2a0c4e844da1deaa2c286e87c8eab84d._comment new file mode 100644 index 000000000..c5e90752d --- /dev/null +++ b/doc/forum/Last_visited_pages/comment_2_2a0c4e844da1deaa2c286e87c8eab84d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 2" + date="2011-11-27T12:23:31Z" + content=""" +How to to it with JavaScript OR SSI? +"""]] From ce3059f0ac01390cb5bdebc68a4e27f80dd3aeda Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 08:27:25 -0400 Subject: [PATCH 109/460] removed --- .../comment_1_698e686ef3df46be3a38d58d0b68671c._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment deleted file mode 100644 index efd65faf1..000000000 --- a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_698e686ef3df46be3a38d58d0b68671c._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="ikiwikert" - ip="134.99.22.236" - subject="comment 1" - date="2011-11-27T11:55:58Z" - content=""" -If i edit the wiki through the webinterface everything is fine. -"""]] From 20f774b5a314f6939c480caac9c184703b7f273a Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 08:30:39 -0400 Subject: [PATCH 110/460] argl --- .../ikiwiki_generates_html_files_with_600_permission..mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn index 823a74156..445c75ba0 100644 --- a/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn @@ -1,3 +1,6 @@ I installed ikiwiki the usual way, my rcs is git, i configure the post-update hook in the bare-repo and use the cgi script in the non-bare. What drives me crazy is the following situation. I update my wiki through git (clone the bare repo on my laptop (WORKING CLONE), make a change and push it back to origin ($REPOSITORY)). Then the post-update hook (configured in my ikiwiki.config) kicks in and updates the checked out wiki ($DESTDIR) and the cgi script there generates html. See [[rcs/git]] if something is not clear. My problem is: every generated html/css/favicon file is only write and readable by the user (600) and no one else. + +Edit: If i edit the wiki through the webinterface everything is fine. +Edit2: Set _everything_ to chmod 0755 but when i run --setup or push to the bare repo; **then pages that are generated through the post update hook still have the wrong permissions.** From 1d6eab9f554ceb34282ca4faeeab85fea40c21ad Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 08:31:28 -0400 Subject: [PATCH 111/460] fix --- ...ikiwiki_generates_html_files_with_600_permission..mdwn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn index 445c75ba0..70383372b 100644 --- a/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission..mdwn @@ -1,6 +1,8 @@ -I installed ikiwiki the usual way, my rcs is git, i configure the post-update hook in the bare-repo and use the cgi script in the non-bare. What drives me crazy is the following situation. I update my wiki through git (clone the bare repo on my laptop (WORKING CLONE), make a change and push it back to origin ($REPOSITORY)). Then the post-update hook (configured in my ikiwiki.config) kicks in and updates the checked out wiki ($DESTDIR) and the cgi script there generates html. See [[rcs/git]] if something is not clear. +I installed ikiwiki the usual way, my rcs is git, i configure the post-update hook in the bare-repo and use the cgi script in the non-bare. + +I update my wiki through git (clone the bare repo on my laptop (WORKING CLONE), make a change and push it back to origin ($REPOSITORY)). Then the post-update hook (configured in my ikiwiki.config) kicks in and updates the checked out wiki ($DESTDIR) and the cgi script there generates html. See [[rcs/git]] if something is not clear. My problem is: every generated html/css/favicon file is only write and readable by the user (600) and no one else. -Edit: If i edit the wiki through the webinterface everything is fine. -Edit2: Set _everything_ to chmod 0755 but when i run --setup or push to the bare repo; **then pages that are generated through the post update hook still have the wrong permissions.** + - Edit: If i edit the wiki through the webinterface everything is fine. + - Edit2: Set _everything_ to chmod 0755 but when i run --setup or push to the bare repo; **then pages that are generated through the post update hook still have the wrong permissions.** From 964be6671f0ec51c97cb9123f409ada7a446345c Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 27 Nov 2011 09:24:57 -0400 Subject: [PATCH 112/460] Added a comment: your shell has a restrictive umask --- ..._6d73d412a9cc6f6ae426b62885c1f157._comment | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_6d73d412a9cc6f6ae426b62885c1f157._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_6d73d412a9cc6f6ae426b62885c1f157._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_6d73d412a9cc6f6ae426b62885c1f157._comment new file mode 100644 index 000000000..7008a05ac --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_1_6d73d412a9cc6f6ae426b62885c1f157._comment @@ -0,0 +1,19 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="your shell has a restrictive umask" + date="2011-11-27T13:24:57Z" + content=""" +Your shell login to the server (presumably SSH?) is running under a +restrictive `umask`, and by default ikiwiki doesn't overrule that. +For instance, perhaps you're using the `pam_umask` module, or +perhaps your `.bashrc` sets a restrictive mask. This is generally +a good thing for privacy from other users of a shared server, but +counterproductive when you're publishing things! + +You can configure ikiwiki to set a less restrictive `umask` with +the `umask` option in your setup file. 18 is probably a good value +(18 decimal = 022 octal, and a `umask` of 022 octal corresponds +to `chmod 0755`, because the `umask` is subtracted from 0777 octal +to get the default permissions). +"""]] From 6e42d2bee0acc11d8ba0ae584646e66ce918c978 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 27 Nov 2011 09:44:48 -0400 Subject: [PATCH 113/460] when octal and YAML collide... --- .../octal_umask_setting_is_unintuitive.mdwn | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 doc/bugs/octal_umask_setting_is_unintuitive.mdwn diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn new file mode 100644 index 000000000..0a63940ce --- /dev/null +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -0,0 +1,45 @@ +To make ikiwiki publish world-readable files (usually what you want) +regardless of your umask, you override the `umask` setting to 022 +octal (which is 18 in decimal). So far so good. + +However, because it's interpreted as a plain number in Perl, the +way you set it varies between formats. In `IkiWiki::Setup::Standard` +you can use either + + umask => 022 + +or (less obviously) one of + + umask => 18 + umask => "18" + +but if you use + + umask => "022" + +you get the less than helpful umask of 026 octal (22 decimal). + +Similarly, in `IkiWiki::Setup::Yaml` (the default for +[ikiwiki-hosting](http://ikiwiki-hosting.branchable.com/) +you have to use one of + + umask: 18 + umask: "18" + +and if you try to say 022 you'll get 22 decimal = 026 octal. + +Perhaps the best way to solve this would be to have keywords +for the few values of `umask` that are actually useful? + +* `private` (= 077 octal = 63 decimal) +* `group` (= 027 octal = 23 decimal) +* `public` (= 022 octal = 18 decimal) + +I don't think g+w is a good idea in any case, because as +documented on [[security]], if ikiwiki makes its `srcdir` +group-writeable then any member of the group can "cause +trouble" (escalate privileges to those of the wiki user?) +via a symlink attack. So I don't think we need keywords +for those. + +--[[smcv]] From be0aaa6dcd346b83b23ed723ed1ef0127ca8312a Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 27 Nov 2011 09:46:16 -0400 Subject: [PATCH 114/460] Added a comment --- .../comment_2_1392fcde369d11a264f31f6b8993ccec._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_2_1392fcde369d11a264f31f6b8993ccec._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_2_1392fcde369d11a264f31f6b8993ccec._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_2_1392fcde369d11a264f31f6b8993ccec._comment new file mode 100644 index 000000000..7e0818ce6 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_2_1392fcde369d11a264f31f6b8993ccec._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2011-11-27T13:46:16Z" + content=""" +See also [[bugs/octal umask setting is unintuitive]] for more about 18 vs. 022. +"""]] From 3df7d143469d8d659a9a70cae24b71ddcb73f70e Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 27 Nov 2011 14:14:47 +0000 Subject: [PATCH 115/460] Support private, group, public as values for umask These are equivalent to octal 077, 027 and 022, but easier to get from YAML. Signed-off-by: Simon McVittie --- IkiWiki.pm | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 637d56c73..59fefc699 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -305,9 +305,9 @@ sub getsetup () { rebuild => 0, }, umask => { - type => "integer", - example => "022", - description => "force ikiwiki to use a particular umask", + type => "string", + example => "public", + description => "force ikiwiki to use a particular umask (keywords public, group or private, or a number)", advanced => 1, safe => 0, # paranoia rebuild => 0, @@ -587,7 +587,23 @@ sub checkconfig () { unless exists $config{wikistatedir} && defined $config{wikistatedir}; if (defined $config{umask}) { - umask(possibly_foolish_untaint($config{umask})); + my $u = possibly_foolish_untaint($config{umask}); + + if ($u =~ m/^\d+$/) { + umask($u); + } + elsif ($u eq 'private') { + umask(077); + } + elsif ($u eq 'group') { + umask(027); + } + elsif ($u eq 'public') { + umask(022); + } + else { + error(sprintf(gettext("unsupported umask setting %s"), $u)); + } } run_hooks(checkconfig => sub { shift->() }); From 0d947d38513cbfd32f76b2245cb8583237e96678 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 27 Nov 2011 10:15:34 -0400 Subject: [PATCH 116/460] branch implementing my keyword suggestion --- doc/bugs/octal_umask_setting_is_unintuitive.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn index 0a63940ce..f6e5a9a4d 100644 --- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -28,6 +28,9 @@ you have to use one of and if you try to say 022 you'll get 22 decimal = 026 octal. +[[!tag patch]] +[[!template id=gitbranch branch=smcv/umask-keywords author="[[smcv]]"]] + Perhaps the best way to solve this would be to have keywords for the few values of `umask` that are actually useful? From e8c3ba2058867c42bbec2c2aca4b85880a54a0fa Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 11:11:22 -0400 Subject: [PATCH 117/460] Added a comment --- .../comment_3_de893ebfc0b405724d89988c2e11ed76._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment new file mode 100644 index 000000000..ee861424f --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="ikiwikert" + ip="134.99.22.236" + subject="comment 3" + date="2011-11-27T15:11:22Z" + content=""" +Wow, thanks! I try it. My Hoster is [Uberspace](https://uberspace.de) and they really kick ass! +"""]] From 33f5aa2f7c5d68423282256c1758c570fc9b91f0 Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 11:14:07 -0400 Subject: [PATCH 118/460] removed --- .../comment_3_de893ebfc0b405724d89988c2e11ed76._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment deleted file mode 100644 index ee861424f..000000000 --- a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_de893ebfc0b405724d89988c2e11ed76._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="ikiwikert" - ip="134.99.22.236" - subject="comment 3" - date="2011-11-27T15:11:22Z" - content=""" -Wow, thanks! I try it. My Hoster is [Uberspace](https://uberspace.de) and they really kick ass! -"""]] From 42e15638dcd10029168214845919e6eab5dcf283 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Nov 2011 12:45:06 -0400 Subject: [PATCH 119/460] response --- doc/todo/wmd_editor_live_preview.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn index fb7f04c09..891b8199f 100644 --- a/doc/todo/wmd_editor_live_preview.mdwn +++ b/doc/todo/wmd_editor_live_preview.mdwn @@ -3,3 +3,7 @@ Some time ago there was [[a question|http://ikiwiki.info/forum/wmd_editor_double I use the wmd editor in my ikiwiki. However live preview seems not to be a fully correct preview so nevertheless I have to hit the preview button to get a correct preview. However then I have two previews so that I have to scroll down to see the correct one. Is it possible to disable the live preview or to replace the live preview with the correct one after pressing the preview button? + +> There's another page already tracking this UI problem: [[mdwn_preview]] +> There is a patch there, but AFAIK nobody has done any more work on +> WMD integration with ikiwiki. --[[Joey]] From c360815f200bd67812d288d23cc8a51e547e3660 Mon Sep 17 00:00:00 2001 From: ikiwikert Date: Sun, 27 Nov 2011 12:54:06 -0400 Subject: [PATCH 120/460] Added a comment --- ...comment_3_962306f22ceb17afb4150e766e9a05b3._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment new file mode 100644 index 000000000..6ed955061 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_3_962306f22ceb17afb4150e766e9a05b3._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="ikiwikert" + ip="134.99.22.236" + subject="comment 3" + date="2011-11-27T16:54:05Z" + content=""" +thank you for your enlighting post! i set the umask option to 022 (octal) and the wrapper to 0755 and it worked. However i guess it is not a good thing to mix modes and i would appreciate it, if you implemented the \"keyword-approach\" you mentioned. + +Or at least one way of defining modes would be okay for average joes like me. +"""]] From 41f6363a633cffd002f3af9f8b216f56f8924ecc Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Nov 2011 13:19:19 -0400 Subject: [PATCH 121/460] editpage: Fix FormattingHelp link on Discussion pages. In 875d550f1278215e6c87d3b78ff87db24c6d76b3 I for some reason made $page be changed when creating a discussion page, which broke the link on the edit page. Changing page seems unnecessary, so reverted that part of the change. --- IkiWiki/Plugin/editpage.pm | 2 +- debian/changelog | 1 + ...ion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index a5c29a352..54051c58c 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -231,7 +231,7 @@ sub cgi_editpage ($$) { if ! $form->submitted && lc($page) ne $page; } elsif (lc $page eq lc $config{discussionpage}) { - @page_locs=$best_loc=$page="$from/".lc($page); + @page_locs=$best_loc="$from/".lc($page); } else { my $dir=$from."/"; diff --git a/debian/changelog b/debian/changelog index 7f6564d7f..52d9ddf3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low * img: Bugfix to width/height tags for scaled down image when only one dimension was provided. Thanks, Per Carlson. + * editpage: Fix FormattingHelp link on Discussion pages. -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 diff --git a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn index 0eadc5809..8f87329ae 100644 --- a/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn +++ b/doc/bugs/Sub-Discussion_pages_have_a_broken___34__FormattingHelp__34___link.mdwn @@ -1 +1,3 @@ For an example of what I mean, go to [[TourBusStop]]. Click the Discussion link. Click the FormattingHelp link. You'll be sent to [TourBusStop/ikiwiki/formatting](/TourBusStop/ikiwiki/formatting/) which of course doesn't exist. + +> A bug introduced in the last release. [[fixed|done]] --[[Joey]] From daaedf27ef7fe18c7c12b13a7db0ed0dae91bd1e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Nov 2011 13:20:24 -0400 Subject: [PATCH 122/460] I have no branch and must merge. --- doc/bugs/octal_umask_setting_is_unintuitive.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn index f6e5a9a4d..2f00e9b13 100644 --- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -46,3 +46,6 @@ via a symlink attack. So I don't think we need keywords for those. --[[smcv]] + +> I support this change, but your git repository does not seem to have +> that branch (or anything) in it today. --[[Joey]] From 128a63d5f2c0ddf3faae9bcf1fd805f1372ad1ae Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 27 Nov 2011 18:11:23 -0400 Subject: [PATCH 123/460] umask :'-( --- doc/bugs/octal_umask_setting_is_unintuitive.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn index 2f00e9b13..15bea3132 100644 --- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -49,3 +49,5 @@ for those. > I support this change, but your git repository does not seem to have > that branch (or anything) in it today. --[[Joey]] + +>> git pushes have a restrictive umask, ironically... fixed. --[[smcv]] From 3046dc4d3033a751bbdac1925f9b49e837f5d6f7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 27 Nov 2011 18:35:05 -0400 Subject: [PATCH 124/460] The umask setting can now be set to private, group, or public, avoiding the need to enter octal correctly which is particularly difficult in yaml setup files. (smcv) --- debian/changelog | 3 +++ doc/bugs/octal_umask_setting_is_unintuitive.mdwn | 2 ++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 52d9ddf3e..73318b269 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low * img: Bugfix to width/height tags for scaled down image when only one dimension was provided. Thanks, Per Carlson. * editpage: Fix FormattingHelp link on Discussion pages. + * The umask setting can now be set to private, group, or public, + avoiding the need to enter octal correctly which is particularly + difficult in yaml setup files. (smcv) -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 diff --git a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn index 15bea3132..5cdefcf09 100644 --- a/doc/bugs/octal_umask_setting_is_unintuitive.mdwn +++ b/doc/bugs/octal_umask_setting_is_unintuitive.mdwn @@ -51,3 +51,5 @@ for those. > that branch (or anything) in it today. --[[Joey]] >> git pushes have a restrictive umask, ironically... fixed. --[[smcv]] + +>>> [[done]] --[[Joey]] From 67bf45200bdfb373ea37d60380b3746133141899 Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Mon, 28 Nov 2011 05:52:38 -0400 Subject: [PATCH 125/460] Added a comment --- ..._8b988d85cfde123798238d0348764c79._comment | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_4_8b988d85cfde123798238d0348764c79._comment diff --git a/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_4_8b988d85cfde123798238d0348764c79._comment b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_4_8b988d85cfde123798238d0348764c79._comment new file mode 100644 index 000000000..838b13756 --- /dev/null +++ b/doc/forum/ikiwiki_generates_html_files_with_600_permission./comment_4_8b988d85cfde123798238d0348764c79._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 4" + date="2011-11-28T09:52:38Z" + content=""" +Joey merged my branch, so from the next release of ikiwiki you'll be able +to say `umask => 'public'` (or `private` or `group` for the other two +potentially-useful umasks). + +I'm not sure what you mean about mixing modes? The wrapper modes are +something else - the wrapper modes are about who can run the CGI (or the +git commit hook) and whether they're setuid (run as the user who owns +the wiki) or not (run as the web server user or the git push user), +whereas `umask` is about the permissions that ikiwiki will assign to +new files it creates (like the HTML). + +A typical public wiki like this one will have `umask => 'public'`; +the wrapper modes will either be `0755` or `04755` (both octal), +depending on the details of how the web server runs the CGI +and how git pushes are done. +"""]] From 87c3d814add894fa4b1c444593a7830b1507845d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Mon, 28 Nov 2011 15:01:09 -0400 Subject: [PATCH 126/460] --- doc/todo/wmd_editor_live_preview.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/wmd_editor_live_preview.mdwn b/doc/todo/wmd_editor_live_preview.mdwn index 891b8199f..d76fb2ba4 100644 --- a/doc/todo/wmd_editor_live_preview.mdwn +++ b/doc/todo/wmd_editor_live_preview.mdwn @@ -7,3 +7,5 @@ Is it possible to disable the live preview or to replace the live preview with t > There's another page already tracking this UI problem: [[mdwn_preview]] > There is a patch there, but AFAIK nobody has done any more work on > WMD integration with ikiwiki. --[[Joey]] + +>> I tried to apply the patch via git apply, however get an error: fatal: corrupt patch at line 63, any idea? From 9dc1abc71e1a1181c924fe33500aa5b40d02bfaa Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 28 Nov 2011 16:38:27 -0400 Subject: [PATCH 127/460] +users/fil --- doc/users/fil.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/fil.mdwn diff --git a/doc/users/fil.mdwn b/doc/users/fil.mdwn new file mode 100644 index 000000000..b17399383 --- /dev/null +++ b/doc/users/fil.mdwn @@ -0,0 +1 @@ +http://hands.com/~phil From f20230eed5033cf4e06f23a51b92bf758f477955 Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 28 Nov 2011 16:39:23 -0400 Subject: [PATCH 128/460] --- ...multiple_destinations_from_one_source.mdwn | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 doc/todo/Render_multiple_destinations_from_one_source.mdwn diff --git a/doc/todo/Render_multiple_destinations_from_one_source.mdwn b/doc/todo/Render_multiple_destinations_from_one_source.mdwn new file mode 100644 index 000000000..0af5ed172 --- /dev/null +++ b/doc/todo/Render_multiple_destinations_from_one_source.mdwn @@ -0,0 +1,34 @@ +I've set up a couple of sites where the users use ikiwiki in fairly standard mode as a CMS and I then set up another ikiwiki setup file that's got the edit options turned off, but is pointing at the same git repository in the background. I then make the post-update hook for each be post-update-hook.ikiwiki and post-update-hook.ikiwiki-public and have the post-update hook itself be a script like: + + #!/bin/sh + + $0.ikiwiki "$@" + $0.ikiwiki-public "$@" + +obviously this results in duplication of most of the ikiwiki.setup, a spare working directory that (perhaps) isn't needed, and an extra post-update hook plus wrapper script that is really needless extra complication. + +If instead there was a way of specifying additional destdir's, or perhaps more generally a way of specifying that there should be multiple passes through the build process using alternative values for some of the variables, then one could have both the private wiki view, and the public static view generated with minimal additional configuration. + +One idea that occurs to me is an additional_configs list where one would specify files containing just the settings you want to override compared with the main setup file. + +Alternatively, one might invent a new way of specifying alternative settings. i.e.: + + additionalsites: + - public + + destdir: /home/wiki/wiki-view + destdir[public]: /home/wiki/public_html + + disable_plugins: [] + disable_plugins[public]: + - recentchanges + - editpage + + url: https://example.com/editors/ + url[public]: http://www.example.com/ + + ... + +where the existance of the additionalsites list provokes additional runs through using the settings with matching extra bits to be used to override the defaults found in the rest of the file. + +Just brainstorming a bit after [[liw]]'s comment about this being useful on IRC, and thought I'd write the idea up while I was thinking about it. -[[fil]] From 46f1e7994650301c2aa7114f73c24c3245940b01 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Mon, 28 Nov 2011 20:52:49 -0400 Subject: [PATCH 129/460] Added a comment --- ..._d3dd0b97c63d615e3dee22ceacaa5a30._comment | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 doc/forum/Calendar:_listing_multiple_entries_per_day/comment_1_d3dd0b97c63d615e3dee22ceacaa5a30._comment diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_1_d3dd0b97c63d615e3dee22ceacaa5a30._comment b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_1_d3dd0b97c63d615e3dee22ceacaa5a30._comment new file mode 100644 index 000000000..ca287581a --- /dev/null +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_1_d3dd0b97c63d615e3dee22ceacaa5a30._comment @@ -0,0 +1,83 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" + nickname="Matt" + subject="comment 1" + date="2011-11-29T00:52:49Z" + content=""" +So I ported the original patch mentioned to the latest Debian version. Well at least the bits that matter to me. See below. + +In doing so I realized that it does quite work how I imagined it would; instead of generating a dynamic page for a particular day with a list of links it actually fills in the calendar with the details of the posts (making for some ugly formatting). + +I'm hoping the tag generation pages will give me a clue how to alter this into what I want. + +
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index c7d2b7c..c931fe6 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -75,6 +75,8 @@ sub format_month (@) {   
+        my %params=@_;
+
+        my %linkcache;
++    my @list;
++    my $detail = 1;
+        foreach my $p (pagespec_match_list($params{page},
+                                \"creation_year($params{year}) and creation_month($params{month}) and ($params{pages})\",
+                                # add presence dependencies to update
+@@ -88,7 +90,7 @@ sub format_month (@) {   
+                my $mtag  = sprintf(\"%02d\", $month);
+
+                # Only one posting per day is being linked to.
+-               $linkcache{\"$year/$mtag/$mday\"} = $p;
++               $linkcache{\"$year/$mtag/$mday\"}{$p} = $IkiWiki::pagesources{$p};
+        }
+
+        my $pmonth = $params{month} - 1;   
+@@ -219,14 +221,38 @@ EOF
+                                $tag='month-calendar-day-this-day';
+                        }
+                        else {
+-                               $tag='month-calendar-day-link';
++                               if ( $detail == 0 ) {
++                                       $tag='month-calendar-day-link';
++                               }
++                               else{
++                                       $tag='month-calendar-day';
++                               }
+                        }
+                        $calendar.=qq{\t\t};
+-                       $calendar.=htmllink($params{page}, $params{destpage},
+-                               $linkcache{$key},
+-                               noimageinline => 1,
+-                               linktext => $day,
+-                               title => pagetitle(IkiWiki::basename($linkcache{$key})));
++                       if ( $detail == 0 ) {
++                               $calendar.=htmllink($params{page}, $params{destpage},
++                                               $linkcache{$key},
++                                               noimageinline => 1,
++                                               linktext => $day,
++                                               title => pagetitle(IkiWiki::basename($linkcache{$key})));
++                       }
++                       else {
++                               my $day_label = qq{$day};
++                               $calendar.=qq{$day_label\n};
++                               my $srcpage; my $destpage;
++                               while(($srcpage,$destpage) = each(%{$linkcache{$key}})) {
++                                       my $title = IkiWiki::basename(pagename($srcpage));
++                                       if (exists $pagestate{$srcpage}{meta}{title} ) {
++                                               $title = $pagestate{$srcpage}{meta}{title};
++                                       }  
++                                       $calendar.=qq{\t\t
};
++                                       $calendar.=htmllink($params{page}, $params{destpage},
++                                                       pagename($destpage),
++                                                       linktext => $title);
++                                       push @list, pagename($linkcache{$key}{$srcpage});
++                                       $calendar.=qq{\t\t
};
++                               }
++                       }
+                        $calendar.=qq{\n};
+                }
+                else {
+
+
+"""]] From fa9f023deb2d92ed478a0f476043d13d4eec739f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Mon, 28 Nov 2011 20:56:44 -0400 Subject: [PATCH 130/460] --- doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn index 4bc828e6e..e0074eef8 100644 --- a/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn +++ b/doc/todo/Set_arbitrary_date_to_be_used_by_calendar_plugin.mdwn @@ -2,6 +2,8 @@ Here's my next version of the patch - still a work in progress. + Note:I partially updated part of this patch to work on Ikiwiki v3 - see [here](http://ikiwiki.info/forum/Calendar:_listing_multiple_entries_per_day/) -- Matt Ford + It provides the following new features. The features are designed to preserve the behavior of the existing plugin by default. * If you specify an event preprocessor in a post, such as: From d4e5cf9c63f7aca2d28c256a641b217f82a46f21 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Mon, 28 Nov 2011 21:30:09 -0400 Subject: [PATCH 131/460] Added a comment --- ...mment_2_2311b96483bb91dc25d5e3695bbca513._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Calendar:_listing_multiple_entries_per_day/comment_2_2311b96483bb91dc25d5e3695bbca513._comment diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_2_2311b96483bb91dc25d5e3695bbca513._comment b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_2_2311b96483bb91dc25d5e3695bbca513._comment new file mode 100644 index 000000000..ef100b555 --- /dev/null +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_2_2311b96483bb91dc25d5e3695bbca513._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" + nickname="Matt" + subject="comment 2" + date="2011-11-29T01:30:09Z" + content=""" +To revert the changes made above it is necessary not only to switch the detail level back down but to also regenerate the side-bar index.html file + + ikiwiki --setup blog.setup + +should do it. +"""]] From 6c0c4e45d43d9879eb7ad7b815908f95e9e4b83d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 29 Nov 2011 00:52:11 -0400 Subject: [PATCH 132/460] cleanup --- doc/ikiwiki/directive/meta.mdwn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/ikiwiki/directive/meta.mdwn b/doc/ikiwiki/directive/meta.mdwn index 6b381f138..a7e86a7ed 100644 --- a/doc/ikiwiki/directive/meta.mdwn +++ b/doc/ikiwiki/directive/meta.mdwn @@ -162,14 +162,13 @@ Supported fields: * guid - Specifies a globally unique ID for a page. This guid should be a URI - (in particular, it can be `urn:uuid:` followed by a UUID, as per - [[!rfc 4122]]), and it will be used to identify the page's entry in RSS + Specifies a globally unique ID for a page. This guid should be a URI, + and it will be used to identify the page's entry in RSS and Atom feeds. If not given, the default is to use the page's URL as its guid. This is mostly useful when a page has moved, to keep the guids for - pages unchanged and avoid_flooding_aggregators + pages unchanged and avoid flooding aggregators (see [[!iki tips/howto_avoid_flooding_aggregators]]). * updated From f2ba73d362a24ee6968892bed6c840a3ef14a1f2 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Wed, 30 Nov 2011 00:48:58 -0400 Subject: [PATCH 133/460] --- doc/todo/comment_moderation_feed.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/comment_moderation_feed.mdwn b/doc/todo/comment_moderation_feed.mdwn index 267706b1b..720925ce7 100644 --- a/doc/todo/comment_moderation_feed.mdwn +++ b/doc/todo/comment_moderation_feed.mdwn @@ -7,3 +7,7 @@ the author. It would be especially handy if it was generated statically. One way would be to generate internal pages corresponding to each comment that needs moderation; then the feed could be constructed via a usual inline. + +---- + +See [[tips/comments feed]] --liw From 642e59c7298ad8e0fe0a4ebf4f26f25b51c7a0d3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl_wuvPHDhkuMVnEOP5jLrZyd3nnBs8YRw" Date: Wed, 30 Nov 2011 06:40:56 -0400 Subject: [PATCH 134/460] --- doc/recentchanges.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 3383fc703..1e20d65fc 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -5,3 +5,4 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] +[[http://www.hotelsandaccommodation.com.au/victoria/bendigo/ bendigo accommodation]] From 003cb0b7d685026ec9a8961fe697a678dcbe4729 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl_wuvPHDhkuMVnEOP5jLrZyd3nnBs8YRw" Date: Wed, 30 Nov 2011 06:42:14 -0400 Subject: [PATCH 135/460] --- doc/recentchanges.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 1e20d65fc..55d669146 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -5,4 +5,4 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] -[[http://www.hotelsandaccommodation.com.au/victoria/bendigo/ bendigo accommodation]] +http://www.hotelsandaccommodation.com.au/victoria/bendigo/ From 8ad04fcc98a62ef2bcfda5d74f23eadf3a6f5b2f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawl_wuvPHDhkuMVnEOP5jLrZyd3nnBs8YRw" Date: Wed, 30 Nov 2011 06:43:58 -0400 Subject: [PATCH 136/460] --- doc/recentchanges.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 55d669146..9f8dabe4b 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -5,4 +5,4 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] -http://www.hotelsandaccommodation.com.au/victoria/bendigo/ +[[http://www.hotelsandaccommodation.com.au/victoria/bendigo/]] From 9bb6a2de837c4df09c3ff6c8066982e7f2f61168 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 30 Nov 2011 10:57:30 +0000 Subject: [PATCH 137/460] revert spam --- doc/recentchanges.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/recentchanges.mdwn b/doc/recentchanges.mdwn index 9f8dabe4b..3383fc703 100644 --- a/doc/recentchanges.mdwn +++ b/doc/recentchanges.mdwn @@ -5,4 +5,3 @@ Recent changes to this wiki: [[!inline pages="internal(recentchanges/change_*) and !*/Discussion" template=recentchanges show=0]] -[[http://www.hotelsandaccommodation.com.au/victoria/bendigo/]] From 71974c24bbd31e4295b366eeea245131e8a9dc21 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Wed, 30 Nov 2011 09:32:03 -0400 Subject: [PATCH 138/460] Chatter --- doc/bugs/Running_on_an_alternative_port_fails.mdwn | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/doc/bugs/Running_on_an_alternative_port_fails.mdwn b/doc/bugs/Running_on_an_alternative_port_fails.mdwn index 006c27232..942700ba3 100644 --- a/doc/bugs/Running_on_an_alternative_port_fails.mdwn +++ b/doc/bugs/Running_on_an_alternative_port_fails.mdwn @@ -81,5 +81,13 @@ index 73689be..039b7e3 100644 -- fergus +--- + I've gone ahead and filed a bug on CGI.pm too: --[[Joey]] + +--- + +That'll be an interesting discussion as I'd suggest that HTTP_ headers are defined in the CGI specification as client headers and thus what `thttpd` is doing is wrong (i.e. mangling the client's own representation). Whether a CGI client should trust HTTP_ header over the server is probably already settled by convention. + +-- fergus From 25543d98b792a86357fa2cbad11a43707905accd Mon Sep 17 00:00:00 2001 From: "http://jmtd.net/" Date: Wed, 30 Nov 2011 09:39:54 -0400 Subject: [PATCH 139/460] try a map instead of an inline --- doc/users/jon.mdwn | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/doc/users/jon.mdwn b/doc/users/jon.mdwn index eb01821ff..3d5304365 100644 --- a/doc/users/jon.mdwn +++ b/doc/users/jon.mdwn @@ -1,4 +1,7 @@ -[[!meta title="Jon Dowland"]] +[[!meta title="Jon Dowland"]][[!toc levels=2]] + +## intro + I'm looking at ikiwiki both for my personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins. @@ -54,7 +57,9 @@ Penultimately, the following are merely half-formed thoughts: * I'd like to make profiling ikiwiki in action very easy for newcomers. Perhaps even a plugin that created a file /profile or similar on build. +## backlinks + Finally, backlinks (since I have issues with the current backlinks implementation, see [[bugs/backlinks onhover thing can go weird]]): -[[!inline pages="link(users/Jon)" archive="yes" feeds="no"]] +[[!map pages="link(users/Jon)"]] From aadc0c82304638028cbbbfe10dfa44497360708f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Wed, 30 Nov 2011 11:12:25 -0400 Subject: [PATCH 140/460] --- doc/forum/Disable_account_creation_for_new_users.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Disable_account_creation_for_new_users.mdwn diff --git a/doc/forum/Disable_account_creation_for_new_users.mdwn b/doc/forum/Disable_account_creation_for_new_users.mdwn new file mode 100644 index 000000000..4a24323b3 --- /dev/null +++ b/doc/forum/Disable_account_creation_for_new_users.mdwn @@ -0,0 +1,9 @@ +Hi, +I'm planning on abusing ikiwiki as a mini-CMS for a static website and think it's exactly the right system for it. Great stuff btw. + +But I still got a problem that I can't solve at the moment. For the static website (with commenting enabled tho) I want no one else to edit the pages, i.e. I want to turn off the editing function for everyone except me. + +That works with the lockedit plugin so far, and I can also hide the edit and preferences links on the pages. But if someone manually enters the link to the edit page he/she can still create an account (I have disabled openid and plan to use passwordauth only). The account can then not be used to edit pages but still, everyone can create accounts in userdb over and over. Is there a way to solve that? I just don't see it right now. + +Best regards, +Chris From 05cbf0109bef5791893b7d144d18765192bc642d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Wed, 30 Nov 2011 11:15:21 -0400 Subject: [PATCH 141/460] Added a comment: comment on my own question --- .../comment_1_adafddb0aff7c2c1f4574101c4cf9073._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Disable_account_creation_for_new_users/comment_1_adafddb0aff7c2c1f4574101c4cf9073._comment diff --git a/doc/forum/Disable_account_creation_for_new_users/comment_1_adafddb0aff7c2c1f4574101c4cf9073._comment b/doc/forum/Disable_account_creation_for_new_users/comment_1_adafddb0aff7c2c1f4574101c4cf9073._comment new file mode 100644 index 000000000..116b2a592 --- /dev/null +++ b/doc/forum/Disable_account_creation_for_new_users/comment_1_adafddb0aff7c2c1f4574101c4cf9073._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment on my own question" + date="2011-11-30T15:15:21Z" + content=""" +REALLY great was what I wanted to say - all the essentials are there, including commenting and search function. What else can you want <3 +"""]] From 75f538faf434474c522a3ae2e954aa032297033d Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Wed, 30 Nov 2011 12:09:16 -0400 Subject: [PATCH 142/460] Added a comment --- ...mment_2_865591f77966f1657a9a4b2426318c51._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Disable_account_creation_for_new_users/comment_2_865591f77966f1657a9a4b2426318c51._comment diff --git a/doc/forum/Disable_account_creation_for_new_users/comment_2_865591f77966f1657a9a4b2426318c51._comment b/doc/forum/Disable_account_creation_for_new_users/comment_2_865591f77966f1657a9a4b2426318c51._comment new file mode 100644 index 000000000..d04cfb6db --- /dev/null +++ b/doc/forum/Disable_account_creation_for_new_users/comment_2_865591f77966f1657a9a4b2426318c51._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2011-11-30T16:09:16Z" + content=""" +Not currently possible, but you can configure [[plugins/passwordauth]] to + require an `account_creation_password`, and not tell anyone else what +it is; or you could use [[plugins/httpauth]] for authenticated editing. +(My mostly-static ikiwiki sites only allow [[plugins/httpauth]] over +HTTPS.) +"""]] From 9936c3ec32094baa2bbbb6cd57a2e942b6b06f3b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Wed, 30 Nov 2011 14:50:51 -0400 Subject: [PATCH 143/460] Added a comment: thx --- .../comment_3_05193e563682f634f13691ee0a8359db._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Disable_account_creation_for_new_users/comment_3_05193e563682f634f13691ee0a8359db._comment diff --git a/doc/forum/Disable_account_creation_for_new_users/comment_3_05193e563682f634f13691ee0a8359db._comment b/doc/forum/Disable_account_creation_for_new_users/comment_3_05193e563682f634f13691ee0a8359db._comment new file mode 100644 index 000000000..66b521407 --- /dev/null +++ b/doc/forum/Disable_account_creation_for_new_users/comment_3_05193e563682f634f13691ee0a8359db._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="thx" + date="2011-11-30T18:50:50Z" + content=""" +thank you for your quick reply, smcv! +"""]] From 44863ea2346eea32b3bc8b9b700101bf7ea3b32f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 14:40:27 -0400 Subject: [PATCH 144/460] graphviz: Support urls embedded in the graph, by having graphviz generate an imagemap. Also, I let preview mode write real files, rather than using data: uri. Which is ok these days, since ikiwiki tracks files created during previewing, and cleans them up later. --- IkiWiki/Plugin/graphviz.pm | 53 +++++++++++++++++--------------- debian/changelog | 2 ++ doc/ikiwiki/directive/graph.mdwn | 8 ++--- 3 files changed, 33 insertions(+), 30 deletions(-) diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index 4ed8b89f1..f01fdca85 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -26,10 +26,13 @@ my %graphviz_programs = ( "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1 ); +my $graphnum=0; + sub render_graph (\%) { my %params = %{(shift)}; - my $src = "$params{type} g {\n"; + $graphnum++; + my $src = "$params{type} graph$graphnum {\n"; $src .= "charset=\"utf-8\";\n"; $src .= "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n" if defined $params{width} and defined $params{height}; @@ -39,48 +42,50 @@ sub render_graph (\%) { # Use the sha1 of the graphviz code as part of its filename. eval q{use Digest::SHA}; error($@) if $@; - my $dest=$params{page}."/graph-". - IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)). - ".png"; + my $base=$params{page}."/graph-". + IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)); + my $dest=$base.".png"; will_render($params{page}, $dest); - if (! -e "$config{destdir}/$dest") { + # The imagemap data is stored as a separate file. + my $imagemap=$base.".imagemap"; + will_render($params{page}, $imagemap); + + my $map; + if (! -e "$config{destdir}/$dest" || ! -e "$config{destdir}/$imagemap") { + # Use ikiwiki's function to create the image file, this makes + # sure needed subdirs are there and does some sanity checking. + writefile($dest, $config{destdir}, ""); + my $pid; my $sigpipe=0; $SIG{PIPE}=sub { $sigpipe=1 }; - $pid=open2(*IN, *OUT, "$params{prog} -Tpng"); + $pid=open2(*IN, *OUT, "$params{prog} -Tpng -o '$config{destdir}/$dest' -Tcmapx"); # open2 doesn't respect "use open ':utf8'" + binmode (IN, ':utf8'); binmode (OUT, ':utf8'); print OUT $src; close OUT; - my $png; - { - local $/ = undef; - $png = ; - } + local $/ = undef; + $map=; close IN; + writefile($imagemap, $config{destdir}, $map); waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; - error gettext("failed to run graphviz") if $sigpipe; + error gettext("failed to run graphviz") if ($sigpipe || $?); - if (! $params{preview}) { - writefile($dest, $config{destdir}, $png, 1); - } - else { - # in preview mode, embed the image in a data uri - # to avoid temp file clutter - eval q{use MIME::Base64}; - error($@) if $@; - return ""; - } + } + else { + $map=readfile("$config{destdir}/$imagemap"); } - return "\n"; + return "\n". + $map; } sub graph (@) { diff --git a/debian/changelog b/debian/changelog index 73318b269..c77fbbeef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low * The umask setting can now be set to private, group, or public, avoiding the need to enter octal correctly which is particularly difficult in yaml setup files. (smcv) + * graphviz: Support urls embedded in the graph, by having graphviz + generate an imagemap. -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 diff --git a/doc/ikiwiki/directive/graph.mdwn b/doc/ikiwiki/directive/graph.mdwn index 433187268..2828921d7 100644 --- a/doc/ikiwiki/directive/graph.mdwn +++ b/doc/ikiwiki/directive/graph.mdwn @@ -1,14 +1,10 @@ The `graph` directive is supplied by the [[!iki plugins/graphviz desc=graphviz]] plugin. -This directive allows embedding [graphviz](http://www.graphviz.org/) graphs in a -page. Example usage: +This directive allows embedding [graphviz](http://www.graphviz.org/) +graphs in a page. Example usage: \[[!graph src="a -> b -> c; a -> c;"]] -Note that graphs will only show up in previews if your browser has -[[!wikipedia data: URI]] support, or if the same graph already exists on that -page. - The `graph` directive supports the following parameters: - `src` - The graphviz source to render. From 997116f1602e1c1340d9a9839908f3350e2eb1ca Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 15:03:24 -0400 Subject: [PATCH 145/460] store imagemap in %pagestate, rather than a file Using a file was sorta not right. Note that when previewing, %pagestate is not saved, so it has to rebuild the graph every time until that graph is saved; then previews can use the cached data until the next time the graph is changed. Also note that it's stored in the destpage's pagestate. The imagemap could vary between a page and an inlined page if wikilinks were supported. --- IkiWiki/Plugin/graphviz.pm | 50 ++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index f01fdca85..4268f42ed 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -10,6 +10,7 @@ use IPC::Open2; sub import { hook(type => "getsetup", id => "graphviz", call => \&getsetup); + hook(type => "needsbuild", id => "version", call => \&needsbuild); hook(type => "preprocess", id => "graph", call => \&graph); } @@ -26,33 +27,41 @@ my %graphviz_programs = ( "dot" => 1, "neato" => 1, "fdp" => 1, "twopi" => 1, "circo" => 1 ); -my $graphnum=0; +sub needsbuild { + my $needsbuild=shift; + foreach my $page (keys %pagestate) { + if (exists $pagestate{$page}{graph} && + exists $pagesources{$page} && + grep { $_ eq $pagesources{$page} } @$needsbuild) { + # remove state, will be re-added if + # the graph is still there during the rebuild + delete $pagestate{$page}{graph}; + } + } + return $needsbuild; +} sub render_graph (\%) { my %params = %{(shift)}; - - $graphnum++; - my $src = "$params{type} graph$graphnum {\n"; - $src .= "charset=\"utf-8\";\n"; + + my $src = "charset=\"utf-8\";\n"; $src .= "ratio=compress;\nsize=\"".($params{width}+0).", ".($params{height}+0)."\";\n" if defined $params{width} and defined $params{height}; $src .= $params{src}; $src .= "}\n"; - - # Use the sha1 of the graphviz code as part of its filename. + + # Use the sha1 of the graphviz code as part of its filename, + # and as a unique identifier for its imagemap. eval q{use Digest::SHA}; error($@) if $@; - my $base=$params{page}."/graph-". - IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($src)); - my $dest=$base.".png"; + my $sha=IkiWiki::possibly_foolish_untaint(Digest::SHA::sha1_hex($params{type}.$src)); + $src = "$params{type} graph$sha {\n".$src; + + my $dest=$params{page}."/graph-".$sha.".png"; will_render($params{page}, $dest); - # The imagemap data is stored as a separate file. - my $imagemap=$base.".imagemap"; - will_render($params{page}, $imagemap); - - my $map; - if (! -e "$config{destdir}/$dest" || ! -e "$config{destdir}/$imagemap") { + my $map=$pagestate{$params{destpage}}{graph}{$sha}; + if (! -e "$config{destdir}/$dest" || ! defined $map) { # Use ikiwiki's function to create the image file, this makes # sure needed subdirs are there and does some sanity checking. writefile($dest, $config{destdir}, ""); @@ -70,21 +79,16 @@ sub render_graph (\%) { close OUT; local $/ = undef; - $map=; + $map=$pagestate{$params{destpage}}{graph}{$sha}=; close IN; - writefile($imagemap, $config{destdir}, $map); waitpid $pid, 0; $SIG{PIPE}="DEFAULT"; error gettext("failed to run graphviz") if ($sigpipe || $?); - - } - else { - $map=readfile("$config{destdir}/$imagemap"); } return "\n". + "\" usemap=\"#graph$sha\" />\n". $map; } From 4cb343f3482edc3786ea46eea7efb7762d349164 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 15:42:42 -0400 Subject: [PATCH 146/460] graphviz: Support wikilinks embedded in the graph. (Sponsored by The TOVA Company.) --- IkiWiki/Plugin/graphviz.pm | 39 ++++++++++++++++++++++++++++++-- debian/changelog | 2 ++ doc/ikiwiki/directive/graph.mdwn | 13 +++++++++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index 4268f42ed..0889bc9fc 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -11,7 +11,7 @@ use IPC::Open2; sub import { hook(type => "getsetup", id => "graphviz", call => \&getsetup); hook(type => "needsbuild", id => "version", call => \&needsbuild); - hook(type => "preprocess", id => "graph", call => \&graph); + hook(type => "preprocess", id => "graph", call => \&graph, scan => 1); } sub getsetup () { @@ -94,7 +94,42 @@ sub render_graph (\%) { sub graph (@) { my %params=@_; - $params{src} = "" unless defined $params{src}; + + # Support wikilinks in the graph source. + my $src=$params{src}; + $src="" unless defined $src; + $src=IkiWiki::linkify($params{page}, $params{destpage}, $params{src}); + return unless defined wantarray; # scan mode short-circuit + if ($src ne $params{src}) { + # linkify makes html links, but graphviz wants plain + # urls. This is, frankly a hack: Process source as html, + # throw out everything inside tags that is not a href. + my $s; + my $nested=0; + use HTML::Parser; + error $@ if $@; + my $p=HTML::Parser->new(api_version => 3); + $p->handler(start => sub { + my %attrs=%{shift()}; + if (exists $attrs{href}) { + $s.="\"$attrs{href}\""; + } + $nested++; + }, "attr"); + $p->handler(end => sub { + $nested--; + }); + $p->handler(default => sub { + $s.=join("", @_) unless $nested; + }, "text"); + $p->parse($src); + $p->eof; + $params{src}=$s; + } + else { + $params{src}=$src; + } + $params{type} = "digraph" unless defined $params{type}; $params{prog} = "dot" unless defined $params{prog}; error gettext("prog not a valid graphviz program") unless $graphviz_programs{$params{prog}}; diff --git a/debian/changelog b/debian/changelog index c77fbbeef..885ce971b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low difficult in yaml setup files. (smcv) * graphviz: Support urls embedded in the graph, by having graphviz generate an imagemap. + * graphviz: Support wikilinks embedded in the graph. + (Sponsored by The TOVA Company.) -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 diff --git a/doc/ikiwiki/directive/graph.mdwn b/doc/ikiwiki/directive/graph.mdwn index 2828921d7..6584a2178 100644 --- a/doc/ikiwiki/directive/graph.mdwn +++ b/doc/ikiwiki/directive/graph.mdwn @@ -5,6 +5,19 @@ graphs in a page. Example usage: \[[!graph src="a -> b -> c; a -> c;"]] +Nodes on the graph can link to external urls using regular graphviz syntax, +and a clickable imagemap will be created. As a special extension for +ikiwiki, [[WikiLinks|ikiwiki/wikilink]] can also be used. For example: + + \[[!graph src="""" + google [ href="http://google.com/" ] + sandbox [ href=[[SandBox]] ] + help [ href=[[ikiwiki/formatting]] ] + newpage [ href=[[NewPage]] ] + + google -> sandbox -> help -> newpage -> help -> google; + """"]] + The `graph` directive supports the following parameters: - `src` - The graphviz source to render. From bbfd4bebf54003ce9da1279832ab0949d1340910 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 15:53:37 -0400 Subject: [PATCH 147/460] formatting --- doc/ikiwiki/directive/graph.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/ikiwiki/directive/graph.mdwn b/doc/ikiwiki/directive/graph.mdwn index 6584a2178..8b066c2f2 100644 --- a/doc/ikiwiki/directive/graph.mdwn +++ b/doc/ikiwiki/directive/graph.mdwn @@ -11,9 +11,9 @@ ikiwiki, [[WikiLinks|ikiwiki/wikilink]] can also be used. For example: \[[!graph src="""" google [ href="http://google.com/" ] - sandbox [ href=[[SandBox]] ] - help [ href=[[ikiwiki/formatting]] ] - newpage [ href=[[NewPage]] ] + sandbox [ href=\[[SandBox]] ] + help [ href=\[[ikiwiki/formatting]] ] + newpage [ href=\[[NewPage]] ] google -> sandbox -> help -> newpage -> help -> google; """"]] From 0a7264b22717d2e7800ccbe32a636036067b6472 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:00:45 -0400 Subject: [PATCH 148/460] close --- doc/todo/comment_moderation_feed.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/comment_moderation_feed.mdwn b/doc/todo/comment_moderation_feed.mdwn index 720925ce7..996de152d 100644 --- a/doc/todo/comment_moderation_feed.mdwn +++ b/doc/todo/comment_moderation_feed.mdwn @@ -11,3 +11,6 @@ inline. ---- See [[tips/comments feed]] --liw + +> Indeed, and the demo blog comes with a comments page with such feeds +> already set up. [[done]] --[[Joey]] From df8f87770e4e7607dde9544edcb6cc990b625844 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:09:09 -0400 Subject: [PATCH 149/460] thoughts --- ...er_multiple_destinations_from_one_source.mdwn | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/doc/todo/Render_multiple_destinations_from_one_source.mdwn b/doc/todo/Render_multiple_destinations_from_one_source.mdwn index 0af5ed172..5fd787607 100644 --- a/doc/todo/Render_multiple_destinations_from_one_source.mdwn +++ b/doc/todo/Render_multiple_destinations_from_one_source.mdwn @@ -32,3 +32,19 @@ Alternatively, one might invent a new way of specifying alternative settings. i where the existance of the additionalsites list provokes additional runs through using the settings with matching extra bits to be used to override the defaults found in the rest of the file. Just brainstorming a bit after [[liw]]'s comment about this being useful on IRC, and thought I'd write the idea up while I was thinking about it. -[[fil]] + +> I don't think you can avoid ikiwiki needing to store a different +> `.ikiwiki` directory with state for each site. Differences in +> configuration can affect the state it stores in arbitrary ways, +> ranging from which pages are even built to what plugins are enabled and +> store state. This also means that it doesn't make sense to try and +> share state amoung rebuilds of the same site. +> +> There is a hidden, and undocumented configuration setting `wikistatedir` +> that can actually be pointed at a different directory than `.ikiwiki`. +> Then you can rebuild multiple configurations from one working directory. +> +> Another handy trick is to use the old perl-format (not yaml) setup file, +> and parameterize it using `$ENV{FOO}`, then you can build two different +> setups from the same setup file. +> --[[Joey]] From 6cadcacffd76cf60739372029fb73ff333bdd6e5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:25:17 -0400 Subject: [PATCH 150/460] apply Postel's law --- IkiWiki/Plugin/graphviz.pm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/graphviz.pm b/IkiWiki/Plugin/graphviz.pm index 0889bc9fc..b9f997e04 100644 --- a/IkiWiki/Plugin/graphviz.pm +++ b/IkiWiki/Plugin/graphviz.pm @@ -112,7 +112,15 @@ sub graph (@) { $p->handler(start => sub { my %attrs=%{shift()}; if (exists $attrs{href}) { - $s.="\"$attrs{href}\""; + if ($s=~/href\s*=\s*"$/) { + $s.=$attrs{href}; + } + elsif ($s=~/href\s*=\s*$/) { + $s.="\"$attrs{href}\""; + } + else { + $s.="href=\"$attrs{href}\""; + } } $nested++; }, "attr"); From 08615fd3e8cc61111186796e08466ba4d062c301 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" Date: Wed, 30 Nov 2011 16:42:55 -0400 Subject: [PATCH 151/460] Added a comment --- ..._d23f0cedd0b9e937eaf200eef55ac457._comment | 166 ++++++++++++++++++ 1 file changed, 166 insertions(+) create mode 100644 doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment diff --git a/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment new file mode 100644 index 000000000..2433967e5 --- /dev/null +++ b/doc/forum/Calendar:_listing_multiple_entries_per_day/comment_3_d23f0cedd0b9e937eaf200eef55ac457._comment @@ -0,0 +1,166 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnXybLxkPMYpP3yw4b_I6IdC3cKTD-xEdU" + nickname="Matt" + subject="comment 3" + date="2011-11-30T20:42:55Z" + content=""" +I got to grip with things to make a patch to do this. :-) + +Here it is in case of use to anyone. + +
+From f0554c5b61e1915086d5cf071f095ff233c2590d Mon Sep 17 00:00:00 2001
+From: Matt Ford 
+Date: Wed, 30 Nov 2011 19:40:10 +0000
+Subject: [PATCH] Patch to allow daily archival generation and link to them in
+ the calendar
+
+---
+ IkiWiki/Plugin/calendar.pm   |   17 ++++++++++++++++-
+ ikiwiki-calendar.in          |   34 +++++++++++++++++++++++++++++++---
+ templates/calendarday.tmpl   |    5 +++++
+ templates/calendarmonth.tmpl |    2 +-
+ templates/calendaryear.tmpl  |    2 +-
+ 5 files changed, 54 insertions(+), 6 deletions(-)
+ create mode 100644 templates/calendarday.tmpl
+
+diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
+index c7d2b7c..9999c03 100644
+--- a/IkiWiki/Plugin/calendar.pm
++++ b/IkiWiki/Plugin/calendar.pm
+@@ -47,6 +47,13 @@ sub getsetup () {
+ 			safe => 1,
+ 			rebuild => 1,
+ 		},
++		archiveday => {
++			type => \"boolean\",
++			example => 1,
++			description => \"enable archiving on a daily basis (otherwise monthly)\",
++			safe => 1,
++			rebuild => 1,
++		},
+ 		archive_pagespec => {
+ 			type => \"pagespec\",
+ 			example => \"page(posts/*) and !*/Discussion\",
+@@ -222,11 +229,19 @@ EOF
+ 				$tag='month-calendar-day-link';
+ 			}
+ 			$calendar.=qq{\t\t};
+-			$calendar.=htmllink($params{page}, $params{destpage}, 
++			if (exists $pagesources{\"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day)}) {
++				$calendar.=htmllink($params{page}, $params{destpage}, 
++						\"$archivebase/$params{year}/$params{month}/\".sprintf(\"%02d\",$day),
++						noimageinline => 1,
++						linktext => \"$day\",
++						title => \"$key\");
++			}else{
++				$calendar.=htmllink($params{page}, $params{destpage}, 
+ 				$linkcache{$key},
+ 				noimageinline => 1,
+ 				linktext => $day,
+ 				title => pagetitle(IkiWiki::basename($linkcache{$key})));
++			}
+ 			$calendar.=qq{\n};
+ 		}
+ 		else {
+diff --git a/ikiwiki-calendar.in b/ikiwiki-calendar.in
+index 037ef7d..af22bc5 100755
+--- a/ikiwiki-calendar.in
++++ b/ikiwiki-calendar.in
+@@ -30,21 +30,44 @@ IkiWiki::checkconfig();
+ my $archivebase = 'archives';
+ $archivebase = $config{archivebase} if defined $config{archivebase};
+ 
++my $archiveday = 0;
++$archiveday = $config{archiveday} if defined $config{archiveday};
++
+ if (! defined $pagespec) {
+ 	$pagespec=$config{archive_pagespec} || \"*\";
+ }
+ 
+-sub writearchive ($$;$) {
++sub is_leap_year {
++	my $year=shift;
++	return ($year % 4 == 0 && (($year % 100 != 0) || $year % 400 == 0));
++}
++
++sub month_days {
++	my $month=shift;
++        my $year=shift;
++	my $days_in_month = (31,28,31,30,31,30,31,31,30,31,30,31)[$month-1];
++	if ($month == 2 && is_leap_year($year)) {
++		$days_in_month++;
++	}
++	return $days_in_month;
++}
++
++sub writearchive ($$;$;$) {
+ 	my $template=template(shift);
+ 	my $year=shift;
+ 	my $month=shift;
++        my $day=shift;
+ 
+-	my $page=defined $month ? \"$year/$month\" : $year;
++	my $page;
++        if (defined $year)  {$page = \"$year\"};
++        if (defined $month) {$page = \"$year/$month\"};
++        if (defined $day)   {$page = \"$year/$month/$day\"};
+ 
+ 	my $pagefile=newpagefile(\"$archivebase/$page\", $config{default_pageext});
+ 	$template->param(pagespec => $pagespec);
+ 	$template->param(year => $year);
+ 	$template->param(month => $month) if defined $month;
++	$template->param(day => $day) if defined $day;
+ 
+ 	if ($force || ! -e \"$config{srcdir}/$pagefile\") {
+ 		writefile($pagefile, $config{srcdir}, $template->output);
+@@ -54,8 +77,13 @@ sub writearchive ($$;$) {
+ 
+ foreach my $y ($startyear..$endyear) {
+ 	writearchive(\"calendaryear.tmpl\", $y);
+-	foreach my $m (qw{01 02 03 04 05 06 07 08 09 10 11 12}) {
++	foreach my $m (map {sprintf(\"%02d\",$_)} (1..12)) {
+ 		writearchive(\"calendarmonth.tmpl\", $y, $m);
++		if ($archiveday ) {
++			foreach my $d (map {sprintf(\"%02d\",$_)} (1..month_days($m,$y))) {
++				writearchive(\"calendarday.tmpl\", $y, $m, $d);
++			}
++		}
+ 	}
+ }
+ 
+diff --git a/templates/calendarday.tmpl b/templates/calendarday.tmpl
+new file mode 100644
+index 0000000..ac963b9
+--- /dev/null
++++ b/templates/calendarday.tmpl
+@@ -0,0 +1,5 @@
++[[!sidebar content=\"\"\"
++[[!calendar type=month month= year= pages=\"\"]]
++\"\"\"]]
++
++[[!inline pages=\"creation_day() and creation_month() and creation_year() and \" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendarmonth.tmpl b/templates/calendarmonth.tmpl
+index 23cd954..c998c16 100644
+--- a/templates/calendarmonth.tmpl
++++ b/templates/calendarmonth.tmpl
+@@ -2,4 +2,4 @@
+ [[!calendar type=month month= year= pages=\"\"]]
+ \"\"\"]]
+ 
+-[[!inline pages=\"creation_month() and creation_year() and \" show=0 feeds=no reverse=yes]]
++[[!inline pages=\"creation_month() and creation_year() and \" archive=\"yes\" show=0 feeds=no reverse=yes]]
+diff --git a/templates/calendaryear.tmpl b/templates/calendaryear.tmpl
+index 714bd6d..b6e33c5 100644
+--- a/templates/calendaryear.tmpl
++++ b/templates/calendaryear.tmpl
+@@ -1 +1 @@
+-[[!calendar type=year year= pages=\"\"]]
++[[!calendar type=year year= pages=\"\" archive=\"yes\"]]
+-- 
+1.7.7.3
+
+:
+
+
+"""]] From d13e86a6cb9a9aef843a780dadffc9dab7de0ab4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:43:34 -0400 Subject: [PATCH 152/460] add missing license text --- debian/copyright | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/debian/copyright b/debian/copyright index 72074d813..74418281d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -271,3 +271,21 @@ License: GPL-2+ The full text of the GPL is distributed as doc/GPL in ikiwiki's source, and is distributed in /usr/share/common-licenses/GPL-2 on Debian systems. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining a copy of + this software and associated documentation files (the "Software"), to deal in + the Software without restriction, including without limitation the rights to + use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies + of the Software, and to permit persons to whom the Software is furnished to do + so, subject to the following conditions: + . + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. From 3b40790041cc4ed5b53fac92fd2edc393f3c1c45 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:52:30 -0400 Subject: [PATCH 153/460] releasing version 3.20111107 --- debian/changelog | 4 +- ikiwiki.spec | 2 +- po/bg.po | 115 ++++++++++++++++++++++++----------------------- po/cs.po | 115 ++++++++++++++++++++++++----------------------- po/da.po | 115 ++++++++++++++++++++++++----------------------- po/de.po | 115 ++++++++++++++++++++++++----------------------- po/es.po | 115 ++++++++++++++++++++++++----------------------- po/fr.po | 115 ++++++++++++++++++++++++----------------------- po/gu.po | 115 ++++++++++++++++++++++++----------------------- po/ikiwiki.pot | 35 ++++++++------- po/it.po | 115 ++++++++++++++++++++++++----------------------- po/pl.po | 115 ++++++++++++++++++++++++----------------------- po/sv.po | 115 ++++++++++++++++++++++++----------------------- po/tr.po | 115 ++++++++++++++++++++++++----------------------- po/vi.po | 115 ++++++++++++++++++++++++----------------------- 15 files changed, 743 insertions(+), 678 deletions(-) diff --git a/debian/changelog b/debian/changelog index 885ce971b..0c64875f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20111107) UNRELEASED; urgency=low +ikiwiki (3.20111107) unstable; urgency=low * img: Bugfix to width/height tags for scaled down image when only one dimension was provided. Thanks, Per Carlson. @@ -11,7 +11,7 @@ ikiwiki (3.20111107) UNRELEASED; urgency=low * graphviz: Support wikilinks embedded in the graph. (Sponsored by The TOVA Company.) - -- Joey Hess Thu, 17 Nov 2011 18:52:23 -0400 + -- Joey Hess Wed, 30 Nov 2011 16:31:48 -0400 ikiwiki (3.20111106) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index f974e524a..c3da2559e 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20111106 +Version: 3.20111107 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/bg.po b/po/bg.po index e20ec5a35..4963f86be 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-bg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2007-01-12 01:19+0200\n" "Last-Translator: Damyan Ivanov \n" "Language-Team: Bulgarian \n" @@ -52,7 +52,7 @@ msgstr "Предпочитанията са запазени." msgid "You are banned." msgstr "Достъпът ви е забранен." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Грешка" @@ -139,7 +139,7 @@ msgstr "грешка при обработване на шаблона" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "готово" @@ -176,15 +176,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -324,14 +324,14 @@ msgstr "премахване на старата страница „%s”" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "създаване на %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "промяна на %s" @@ -379,55 +379,55 @@ msgstr "грешка при четене на „%s”: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "При използване на приеставката „search” е необходимо е да се укаже %s" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 #, fuzzy msgid "failed to run graphviz" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -452,7 +452,7 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "грешка при запис на файла „%s”: %s" @@ -553,7 +553,7 @@ msgstr "шаблонът „%s” не е намерен" msgid "redir cycle is not allowed" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -667,71 +667,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "крешка при компилиране на файла %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "грешка при запис на файла „%s”: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "приставката „linkmap”: грешка при изпълнение на „dot”" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -864,16 +864,16 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -939,12 +939,12 @@ msgstr "грешка при запис на файла „%s”: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1256,11 +1256,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "обновяване на уики..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "осъвременяване на уики..." @@ -1274,45 +1274,50 @@ msgstr "" "При използване на пареметъра „--cgi” е необходимо да се укаже и " "местоположението на уикито чрез параметъра „--url”" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, fuzzy, perl-format msgid "bad file name %s" msgstr "пропускане на невалидното име на файл „%s”" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "шаблонът „%s” не е намерен" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "непознат вид сортиране „%s”" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "грешка при четене на „%s”: %s" diff --git a/po/cs.po b/po/cs.po index 64ca444b4..5cb42b937 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2009-09-11 20:23+0200\n" "Last-Translator: Miroslav Kure \n" "Language-Team: Czech \n" @@ -52,7 +52,7 @@ msgstr "Nastavení uloženo." msgid "You are banned." msgstr "Jste vyhoštěni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Chyba" @@ -138,7 +138,7 @@ msgstr "nepodařilo se zpracovat:" msgid "deleting bucket.." msgstr "mažu bucket..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "hotovo" @@ -172,16 +172,16 @@ msgstr "zakázáno proměnnou allowed_attachments" msgid "bad attachment filename" msgstr "chybné jméno souboru s přílohou" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "příloha nahrána" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -326,14 +326,14 @@ msgstr "odstraňuji starý náhled %s" msgid "%s is not an editable page" msgstr "%s není editovatelná stránka" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "vytvářím %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "upravuji %s" @@ -377,55 +377,55 @@ msgstr "není stránkou" msgid "%s is an attachment, not a page." msgstr "%s není ani příloha, ani stránka." -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "nemůžete pracovat se souborem s přístupovým oprávněními %s" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "nejste oprávněni měnit přístupová oprávnění souborů" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "nejste oprávněni měnit %s" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "nelze zkompilovat %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s musíte zadat při každém použití modulu %s" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "nepodařilo se spustit graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "program není platným programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight obsahuje neznámý typ souboru „%s“" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Zdrojový kód: %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "varování: perlový modul highlight není dostupný; pokračuji bez něj" @@ -448,7 +448,7 @@ msgstr "nelze číst %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "chybné rozměry „%s“ (formát má být ŠxV)" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "nelze změnit velikost: %s" @@ -539,7 +539,7 @@ msgstr "stránka, na kterou vede přesměrování, nebyla nalezena" msgid "redir cycle is not allowed" msgstr "cykly nejsou v přesměrování povoleny" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 #, fuzzy msgid "sort=meta requires a parameter" msgstr "vyžaduje parametry „from“ a „to“" @@ -655,11 +655,11 @@ msgid "" msgstr "" "po_link_to=negotiated vyžaduje zapnuté usedirs, používám po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "aktualizovány PO soubory" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -667,7 +667,7 @@ msgstr "" "Nemohu odstranit překlad. Nicméně pokud bude odstraněna hlavní stránka, " "budou odstraněny také její překlady." -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -675,56 +675,56 @@ msgstr "" "Nemohu přejmenovat překlad. Nicméně pokud bude přejmenována hlavní stránka, " "budou přejmenovány také její překlady." -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT soubor (%s) neexistuje" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "nepodařilo se zkopírovat PO soubor na %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "nepodařilo se aktualizovat %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "nepodařilo se zkopírovat POT soubor na %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "nepodařilo se přeložit %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "odstraněny zastaralé PO soubory" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "nepodařilo se zapsat %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "překlad se nezdařil" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "neplatná gettext data, pro pokračování v úpravách se vraťte na předchozí " "stránku" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -855,16 +855,16 @@ msgstr "%s není ve zdrojovém adresáři a proto nelze smazat" msgid "%s is not a file" msgstr "%s není souborem" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "potvrďte odstranění %s" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Vyberte prosím přílohy, které se mají odstranit." -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "odstraněno" @@ -929,12 +929,12 @@ msgstr "nepodařilo se přečíst %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "pro indexování %s je potřeba Digest::SHA1" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "hledání" @@ -1245,11 +1245,11 @@ msgstr "použití: --set proměnná=hodnota" msgid "usage: --set-yaml var=value" msgstr "použití: --set proměnná=hodnota" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "znovusestavuji wiki..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "obnovuji wiki..." @@ -1261,45 +1261,50 @@ msgstr "Diskuse" msgid "Must specify url to wiki with --url when using --cgi" msgstr "Při použití --cgi musíte pomocí --url zadat url k wiki" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "nepodporovaný formát stránky %s" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "nelze použít několik rcs modulů" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "nepodařilo se nahrát externí modul vyžadovaný modulem %s: %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Byla rozpoznána smyčka na %s v hloubce %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "chybné jméno souboru %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "šablona %s nebyla nalezena" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "ano" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "neznámý typ řazení %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "nelze vybrat stránky: %s" diff --git a/po/da.po b/po/da.po index 093a471ac..5d612c662 100644 --- a/po/da.po +++ b/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20110430\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2011-05-05 13:30+0200\n" "Last-Translator: Jonas Smedegaard \n" "Language-Team: None\n" @@ -56,7 +56,7 @@ msgstr "Indstillinger gemt" msgid "You are banned." msgstr "Du er banlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Fejl" @@ -141,7 +141,7 @@ msgstr "behandling af skabelon mislykkedes:" msgid "deleting bucket.." msgstr "sletter bundt.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "færdig" @@ -175,16 +175,16 @@ msgstr "forhindret af allowed_attachments" msgid "bad attachment filename" msgstr "dårligt vedhæftningsfilnavn" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "vedhæftningsoplægning" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -326,14 +326,14 @@ msgstr "fjerner gammelt smugkig %s" msgid "%s is not an editable page" msgstr "%s er ikke en redigérbar side" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "opretter %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "redigerer %s" @@ -377,54 +377,54 @@ msgstr "ikke en side" msgid "%s is an attachment, not a page." msgstr "%s er en vedhæftning, ikke en side." -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "Du har ikke lov til at ændre %s" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "du kan ikke påvirke en fil med modus %s" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "du har ikke lov til at ændre modus for filer" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "Du har ikke lov til at tilbageføre en sammenlægning" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, perl-format msgid "Failed to revert commit %s" msgstr "tilbageføring af indlæg %s mislykkedes" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Skal angive %s når udvidelsen %s bruges" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "graphviz-kørsel mislykkedes" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "prog er ikke et gyldigt graphviz-program" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight indeholder ukendt filtype '%s'" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Kildekode: %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -449,7 +449,7 @@ msgstr "læsning af %s mislykkedes: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "forkert størrelsesformat \"%s\" (burde være WxH)" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Ændring af størrelse mislykkedes: %s" @@ -541,7 +541,7 @@ msgstr "henvisningsside ikke fundet" msgid "redir cycle is not allowed" msgstr "ring af henvisninger er ikke tilladt" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "sort=meta kræver en parameter" @@ -658,11 +658,11 @@ msgstr "" "po_link_to=negotiated kræver at usedirs er aktiveret, falder tilbage til " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "opdaterer PO-filer" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -670,7 +670,7 @@ msgstr "" "Kan ikke fjerne en oversættelse. Fjern i stedet hovedsiden, så fjernes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -678,55 +678,55 @@ msgstr "" "Kan ikke omdøbe en oversættelse. Omdøb i stedet hovedsiden, så omdøbes dens " "oversættelser også." -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-filen %s eksisterer ikke" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "kopiering af underlags-PO-fil til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "opdatering af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopiering af POT-filen til %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "oversættelse af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "forældede PO filer fjernet" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "skrivning af %s mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "oversættelse mislykkedes" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "forkert gettext-data, gå tilbage til forrige side og fortsæt redigering" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "%s har forkert syntaks: skal bruge CODE|NAME" @@ -857,16 +857,16 @@ msgstr "%s er ikke i srcdir, så kan ikke blive slettet" msgid "%s is not a file" msgstr "%s er ikke en fil" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "bekræft at %s bliver fjernet" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Vælg vedhæftning der skal slettes." -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "fjernet" @@ -931,12 +931,12 @@ msgstr "afvikling af rsync_command mislykkedes: %s" msgid "rsync_command exited %d" msgstr "rsync_command sluttede (exit code) %d" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "behøver Digest::SHA til indeks %s" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "søg" @@ -1246,11 +1246,11 @@ msgstr "brug: --set var=værdi" msgid "usage: --set-yaml var=value" msgstr "brug: --set-yaml var=værdi" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "genopbygger wiki..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "genopfrisker wiki..." @@ -1262,46 +1262,51 @@ msgstr "Diskussion" msgid "Must specify url to wiki with --url when using --cgi" msgstr "Skal angive url til wiki med --url når der bruges --cgi" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "Ikke-understøttet sideformat %s" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "kan ikke bruge flere samtidige RCS-udvidelser" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" "indlæsning af ekstern udvidelse krævet af udvidelsen %s mislykkedes: %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "forudberegningssløkke fundet på %s ved dybde %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "dårligt filnavn %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "skabelon %s ikke fundet" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, perl-format msgid "invalid sort type %s" msgstr "forkert sorteringstype %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "ukendt sorteringsform %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "kan ikke få sider til at passe sammen: %s" diff --git a/po/de.po b/po/de.po index 368deb19a..9cc9e388b 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.14159\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2010-03-14 16:09+0530\n" "Last-Translator: Sebastian Kuhnert \n" "Language-Team: German \n" @@ -53,7 +53,7 @@ msgstr "Einstellungen gespeichert." msgid "You are banned." msgstr "Sie sind ausgeschlossen worden." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Fehler" @@ -139,7 +139,7 @@ msgstr "Fehler beim Ablauf:" msgid "deleting bucket.." msgstr "lösche Behälter (bucket)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "fertig" @@ -174,16 +174,16 @@ msgstr "durch allowed_attachements verboten" msgid "bad attachment filename" msgstr "fehlerhafter Dateiname für Anhang" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "Anhang hochladen" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -328,14 +328,14 @@ msgstr "entferne alte Vorschau %s" msgid "%s is not an editable page" msgstr "Seite %s kann nicht bearbeitet werden" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "erstelle %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "bearbeite %s" @@ -379,55 +379,55 @@ msgstr "Keine Seite" msgid "%s is an attachment, not a page." msgstr "Seite %s ist ein Anhang und keine Seite." -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Sie können eine Datei mit den Zugriffsrechten %s nicht nutzen" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "Sie dürfen die Zugriffsrechte der Datei nicht ändern" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Sie dürfen %s nicht verändern" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "erzeugen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "%s muss angegeben werden, wenn die %s Erweiterung verwandt wird" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "graphviz konnte nicht ausgeführt werden" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "prog ist kein gültiges graphviz-Programm" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight enteilt unbekannten Dateityp '%s'" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Quellcode: %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -452,7 +452,7 @@ msgstr "Lesen von %s fehlgeschlagen: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "falsches Format in \"%s\" für size (sollte BxH sein)" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Größenänderung fehlgeschlagen: %s" @@ -548,7 +548,7 @@ msgstr "Umleitungsseite nicht gefunden" msgid "redir cycle is not allowed" msgstr "Zyklische Umleitungen sind nicht erlaubt" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 #, fuzzy msgid "sort=meta requires a parameter" msgstr "erfordert die Parameter 'from' und 'to'" @@ -667,11 +667,11 @@ msgstr "" "po_link_to=negotiated benötigt usedirs eingeschaltet, greife zurück auf " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "PO-Dateien aktualisiert" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -679,7 +679,7 @@ msgstr "" "Übersetzung kann nicht entfernt werden. Wenn die Master Seite entfernt wird, " "werden auch ihre Übersetzungen entfernt." -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -687,56 +687,56 @@ msgstr "" "Eine Übersetzung kann nicht umbenannt werden. Wenn die Master Seite " "unbenannt wird, werden auch ihre Übersetzungen unbenannt." -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "POT-Datei (%s) existiert nicht" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "konnte die PO-Datei nicht aus dem Underlay nach %s kopieren" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "aktualisieren von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "kopieren der POT-Datei nach %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "übersetzen von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "überflüssige PO-Dateien wurden entfernt" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "schreiben von %s fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "übersetzen fehlgeschlagen" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "ungültige gettext Datei, gehe zurück zur vorherigen Seite um weiter zu " "arbeiten" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -869,16 +869,16 @@ msgstr "%s ist nicht im srcdir und kann deshalb nicht gelöscht werden" msgid "%s is not a file" msgstr "%s ist keine Datei" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "bestätigen Sie die Entfernung von %s" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Bitte wählen Sie die zu entfernenden Anhänge aus." -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "entfernt" @@ -943,12 +943,12 @@ msgstr "konnte das rsync_command nicht ausführen: %s" msgid "rsync_command exited %d" msgstr "rsync_command gibt Fehler %d zurück" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "benötige Digest::SHA1 um einen Index von %s zu erstellen" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "suchen" @@ -1265,11 +1265,11 @@ msgstr "Aufruf: --set Variable=Wert" msgid "usage: --set-yaml var=value" msgstr "Aufruf: --set Variable=Wert" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "erzeuge Wiki neu.." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "aktualisiere Wiki.." @@ -1283,46 +1283,51 @@ msgstr "" "Es muss eine URL zum Wiki mit --url angegeben werden, wenn --cgi verwandt " "wird" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "nicht unterstütztes Seitenformat %s" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" "Es können nicht mehrere Versionskontrollsystem-Erweiterungen verwandt werden" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Laden der für %s benötigten externen Erweiterung fehlgeschlagen: %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Präprozessorschleife auf %s in Tiefe %i erkannt" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "fehlerhafter Dateiname %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "Vorlage %s nicht gefunden" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "ja" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "Unbekannter Sortierungstyp %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "Kann die Seiten nicht zuordnen: %s" diff --git a/po/es.po b/po/es.po index 0df9b6380..86f49f2c2 100644 --- a/po/es.po +++ b/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2009-06-14 12:32+0200\n" "Last-Translator: Victor Moral \n" "Language-Team: \n" @@ -57,7 +57,7 @@ msgstr "Las preferencias se han guardado." msgid "You are banned." msgstr "Ha sido expulsado." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Error" @@ -144,7 +144,7 @@ msgstr "se ha producido un error fatal mientras procesaba la plantilla:" msgid "deleting bucket.." msgstr "borrando el directorio.." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "completado" @@ -181,16 +181,16 @@ msgstr "prohibido por la claúsula allowed_attachments" msgid "bad attachment filename" msgstr "nombre de archivo adjunto erróneo" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "enviado el adjunto" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -335,14 +335,14 @@ msgstr "eliminando la antigua previsualización %s" msgid "%s is not an editable page" msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "creando página %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "modificando página %s" @@ -387,55 +387,55 @@ msgstr "no encuentro páginas coincidentes: %s" msgid "%s is an attachment, not a page." msgstr "la página %s no es modificable" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "no puede actuar sobre un archivo con permisos %s" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "No puede cambiar los permisos de acceso de un archivo" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "No puede cambiar %s" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Es obligatorio indicar %s cuando se utiliza el complemento de búsqueda" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "no he podido ejecutar el programa graphviz " -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "prog no es un programa graphviz válido " -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "la directiva tohighlight contiene el tipo de archivo desconocido '%s' " -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Código fuente: %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -461,7 +461,7 @@ msgstr "no puedo leer de %s: %s " msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "dimensionamiento fallido: %s" @@ -556,7 +556,7 @@ msgstr "falta la página a donde redirigir" msgid "redir cycle is not allowed" msgstr "ciclo de redirección no permitido" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 #, fuzzy msgid "sort=meta requires a parameter" msgstr "los parámetros 'from' y 'to' son obligatorios" @@ -675,71 +675,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, fuzzy, perl-format msgid "POT file (%s) does not exist" msgstr "No existe la página %s." -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "ha fallado la compilación del programa %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "dimensionamiento fallido: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "no he podido ejecutar el programa dot" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -870,16 +870,16 @@ msgstr "%s no está en el directorio fuente por lo que no puede ser borrada" msgid "%s is not a file" msgstr "%s no es un archivo" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "confirme el borrado de %s" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Por favor seleccione los adjuntos que serán borrados." -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "borrado" @@ -944,12 +944,12 @@ msgstr "no puedo leer de %s: %s " msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "se necesita la instalación de Digest::SHA1 para indexar %s" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "buscar" @@ -1270,11 +1270,11 @@ msgstr "uso: --set variable=valor" msgid "usage: --set-yaml var=value" msgstr "uso: --set variable=valor" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "reconstruyendo el wiki.." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "actualizando el wiki.." @@ -1288,47 +1288,52 @@ msgstr "" "Es obligatorio especificar un url al wiki con el parámetro --url si se " "utiliza el parámetro --cgi" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "formato de página %s no soportado" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "no puedo emplear varios complementos rcs" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "no he podido cargar el complemento externo %s necesario para %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" "se ha detectado en la página %s un bucle de preprocesado en la iteración " "número %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "el nombre de archivo %s es erróneo" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "no he encontrado la plantilla %s" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "si" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "no conozco este tipo de ordenación %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "no encuentro páginas coincidentes: %s" diff --git a/po/fr.po b/po/fr.po index 19036038d..a1fa14f9d 100644 --- a/po/fr.po +++ b/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.141\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2010-10-03 10:42+0200\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -54,7 +54,7 @@ msgstr "Les préférences ont été enregistrées." msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Erreur" @@ -139,7 +139,7 @@ msgstr "Échec du traitementdu modèle :" msgid "deleting bucket.." msgstr "Suppression du compartiment S3 (« bucket »)..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "Terminé" @@ -173,16 +173,16 @@ msgstr "Action interdite par allowed_attachments" msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "Envoi de la pièce jointe" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -324,14 +324,14 @@ msgstr "Suppression de l'ancienne prévisualisation %s" msgid "%s is not an editable page" msgstr "%s n'est pas une page éditable" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "Création de %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "Édition de %s" @@ -375,55 +375,55 @@ msgstr "Ce n'est pas une page." msgid "%s is an attachment, not a page." msgstr "%s est une pièce jointe, pas une page." -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "Vous ne pouvez pas modifier un fichier dont le mode est %s" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "Vous n'êtes pas autorisé à modifier le mode des fichiers" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "Vous n'êtes pas autorisé à modifier %s" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "Échec de la compilation de %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Vous devez indiquer %s lors de l'utilisation du greffon %s." -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "Ce programme n'est pas un programme graphviz valable" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contient un type de fichier inconnu : '%s'" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Code source : %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -448,7 +448,7 @@ msgstr "Échec de la lecture de %s : %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "Format de la taille incorrect \"%s\", (devrait être LxH)" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "Échec du redimensionnement : %s" @@ -542,7 +542,7 @@ msgstr "Page de redirection introuvable" msgid "redir cycle is not allowed" msgstr "Redirection cyclique non autorisée" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "sort=meta demande un paramètre." @@ -664,11 +664,11 @@ msgstr "" "po_link_to=negotiated nécessite que usedirs soit activé, retour à " "po_link_to=default." -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "Fichiers PO mis à jour." -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -676,7 +676,7 @@ msgstr "" "Impossible de supprimer cette traduction. Si la page maître est supprimée, " "alors ses traductions seront supprimées." -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -684,56 +684,56 @@ msgstr "" "Impossible de renommer cette traduction. Si la page maître est renommée, " "alors ses traductions pourront être renommées." -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "Le fichier POT %s n'existe pas." -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "Impossible de copier le fichier PO underlay dans %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "Impossible de mettre à jour %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "Impossible de copier le fichier POT dans %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "N/A" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "Impossible de traduire %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "Fichiers PO obsolètes supprimés." -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "Impossible de modifier %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "Impossible de traduire" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "Données gettext incorrectes, retour à la page précédente pour la poursuite " "des modifications." -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "La syntaxe de %s n'est pas correcte : il faut utiliser CODE|NOM" @@ -866,16 +866,16 @@ msgstr "%s n'est pas dans srcdir et ne peut donc pas être supprimé" msgid "%s is not a file" msgstr "%s n'est pas un fichier" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "Suppression de %s confirmée" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Veuillez choisir la pièce jointe à supprimer" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "supprimé" @@ -940,12 +940,12 @@ msgstr "Impossible d'exécuter la commande rsync : %s" msgid "rsync_command exited %d" msgstr "la commande rsync s'est terminée avec le code : %d" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "Digest::SHA1 est nécessaire pour indexer %s" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "recherche" @@ -1262,11 +1262,11 @@ msgstr "Syntaxe : -- set var=valeur" msgid "usage: --set-yaml var=value" msgstr "Syntaxe : --set-yaml var=valeur" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "Reconstruction du wiki..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "Rafraîchissement du wiki..." @@ -1279,45 +1279,50 @@ msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Vous devez indiquer l'URL du wiki par --url lors de l'utilisation de --cgi" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "Format de page non reconnu %s" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "Impossible d'utiliser plusieurs systèmes de contrôle des versions" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "Impossible de charger le greffon externe nécessaire au greffon %s : %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de prétraitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "Nom de fichier incorrect %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "Modèle de page %s introuvable" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "oui" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, perl-format msgid "invalid sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "Type de tri %s inconnu" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "Impossible de trouver les pages : %s" diff --git a/po/gu.po b/po/gu.po index 5791cf65c..123cadd4a 100644 --- a/po/gu.po +++ b/po/gu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki-gu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2007-01-11 16:05+0530\n" "Last-Translator: Kartik Mistry \n" "Language-Team: Gujarati \n" @@ -51,7 +51,7 @@ msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ." msgid "You are banned." msgstr "તમારા પર પ્રતિબંધ છે." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "ક્ષતિ" @@ -137,7 +137,7 @@ msgstr "ક્રિયા કરવામાં નિષ્ફળ:" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "સંપૂર્ણ" @@ -174,16 +174,16 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -323,14 +323,14 @@ msgstr "જુનાં પાનાં દૂર કરે છે %s" msgid "%s is not an editable page" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "%s બનાવે છે" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "%s સુધારે છે" @@ -378,54 +378,54 @@ msgstr "વાંચી શકાતી નથી %s: %s" msgid "%s is an attachment, not a page." msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "જ્યારે શોધ પ્લગઇન ઉપયોગ કરતા હોવ ત્યારે %s સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "ગ્રાફવિઝ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "કાર્યક્રમએ યોગ્ય ગ્રાફવિઝ કાર્યક્રમ નથી" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -450,7 +450,7 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" @@ -544,7 +544,7 @@ msgstr "ફીડ મળ્યું નહી" msgid "redir cycle is not allowed" msgstr "ફીડ મળ્યું નહી" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -658,71 +658,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "%s કમ્પાઇલ કરવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "માપ બદલવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "%s લખવામાં નિષ્ફળ: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "ડોટ ચલાવવામાં નિષ્ફળ" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -855,16 +855,16 @@ msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે msgid "%s is not a file" msgstr "%s એ સુધારી શકાય તેવું પાનું નથી" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -930,12 +930,12 @@ msgstr "%s વાંચવામાં નિષ્ફળ: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1244,11 +1244,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "વીકી ફરીથી બનાવે છે.." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "વીકીને તાજી કરે છે.." @@ -1260,45 +1260,50 @@ msgstr "ચર્ચા" msgid "Must specify url to wiki with --url when using --cgi" msgstr "જ્યારે --cgi ઉપયોગ કરતાં હોય ત્યારે વીકીનું યુઆરએલ સ્પષ્ટ કરવું જ પડશે" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s પર શોધાયેલ લુપ %s પર ચલાવે છે %i ઉંડાણ પર" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, fuzzy, perl-format msgid "bad file name %s" msgstr "ખરાબ ફાઇલ નામ છોડી દે છે %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "ટેમ્પલેટ %s મળ્યું નહી" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "અજાણ્યો ગોઠવણી પ્રકાર %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "વાંચી શકાતી નથી %s: %s" diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index d96522e64..9308d9ce5 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-06 16:29-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -52,7 +52,7 @@ msgstr "" msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1454 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "" @@ -371,7 +371,7 @@ msgid "%s is an attachment, not a page." msgstr "" #: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 -#: ../IkiWiki.pm:1674 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" @@ -399,11 +399,11 @@ msgstr "" msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "" @@ -440,7 +440,7 @@ msgstr "" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "" @@ -1233,45 +1233,50 @@ msgstr "" msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1436 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1630 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1930 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2180 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2257 +#: ../IkiWiki.pm:2273 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2278 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2414 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/it.po b/po/it.po index 70a33dabf..872a39e62 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: Ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2009-08-16 11:01+0100\n" "Last-Translator: Luca Bruno \n" "Language-Team: Italian TP \n" @@ -50,7 +50,7 @@ msgstr "Preferenze salvate." msgid "You are banned." msgstr "Avete ricevuto un ban." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Errore" @@ -137,7 +137,7 @@ msgstr "errore nell'elaborazione:" msgid "deleting bucket.." msgstr "eliminazione contenitore..." -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "fatto" @@ -171,16 +171,16 @@ msgstr "non permesso da allowed_attachments" msgid "bad attachment filename" msgstr "nome file dell'allegato non valido" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "carica allegato" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -325,14 +325,14 @@ msgstr "rimozione vecchia anteprima %s" msgid "%s is not an editable page" msgstr "%s non è una pagina modificabile" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "creazione %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "modifica %s" @@ -376,55 +376,55 @@ msgstr "non è una pagina" msgid "%s is an attachment, not a page." msgstr "%s è un allegato, non una pagina." -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "non è permesso lavorare su un file in modalità %s" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "non è permesso cambiare la modalità del file" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 #, fuzzy msgid "you are not allowed to revert a merge" msgstr "non è permesso modificare %s" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "errore nel compilare %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Occorre specificare %s quando si usa il plugin %s" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "errore nell'eseguire graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "prog non è un programma graphviz valido" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "tohighlight contiene il tipo di file sconosciuto «%s»" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "Sorgente: %s" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -449,7 +449,7 @@ msgstr "impossibile leggere %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "Formato dimensione «%s» non valido (dovrebbe essere LxA)" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "impossibile ridimensionare: %s" @@ -542,7 +542,7 @@ msgstr "pagina di reindirizzamento non trovata" msgid "redir cycle is not allowed" msgstr "ciclo di reindirizzamento non ammesso" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 #, fuzzy msgid "sort=meta requires a parameter" msgstr "sono richiesti i parametri \"to\" e \"from\"" @@ -664,11 +664,11 @@ msgstr "" "po_link_to=negotiated richiede che venga abilitato usedirs, verrà utilizzato " "po_link_to=default" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "file PO aggiornati" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." @@ -676,7 +676,7 @@ msgstr "" "Impossibile eliminare una traduzione. Tuttavia, se la pagina principale è " "stata eliminata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." @@ -684,56 +684,56 @@ msgstr "" "Impossibile rinominare una traduzione. Tuttavia, se la pagina principale è " "stata rinominata anche le traduzioni lo saranno." -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "Il file POT (%s) non esiste" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "impossibile copiare il file PO di underlay in %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "impossibile aggiornare %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "impossibile copiare il file POT in %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "N/D" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "impossibile tradurre %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "file PO obsoleti rimossi" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "impossibile scrivere %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "impossibile tradurre" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" "dati gettext non validi, tornare alle pagina precedente per continuare le " "modifiche" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -866,16 +866,16 @@ msgstr "%s non è in src, quindi non può essere eliminato" msgid "%s is not a file" msgstr "%s non è un file" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "conferma rimozione di %s" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "Selezionare l'allegato da rimuovere." -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "rimosso" @@ -940,12 +940,12 @@ msgstr "impossibile leggere %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, fuzzy, perl-format msgid "need Digest::SHA to index %s" msgstr "è necessario Digest::SHA1 per l'indice di %s" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "cerca" @@ -1257,11 +1257,11 @@ msgstr "utilizzo: --set var=valore" msgid "usage: --set-yaml var=value" msgstr "utilizzo: --set var=valore" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "ricostruzione wiki..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "aggiornamento wiki..." @@ -1273,45 +1273,50 @@ msgstr "Discussione" msgid "Must specify url to wiki with --url when using --cgi" msgstr "Occorre specificare l'url del wiki tramite --url quando si usa --cgi" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, fuzzy, perl-format +msgid "unsupported umask setting %s" +msgstr "formato pagina %s non supportato" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "impossibile usare più plugin rcs" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "impossibile caricare il plugin esterno per il plugin %s: %s" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "ciclo del preprocessore individuato su %s alla profondità %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "nome file %s scorretto" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "modello %s non trovato" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "sì" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "ordinamento %s sconosciuto" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "impossibile trovare pagine corrispondenti: %s" diff --git a/po/pl.po b/po/pl.po index e7b09df32..902ae8260 100644 --- a/po/pl.po +++ b/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 1.51\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2007-04-27 22:05+0200\n" "Last-Translator: Pawel Tecza \n" "Language-Team: Debian L10n Polish \n" @@ -54,7 +54,7 @@ msgstr "Preferencje zapisane." msgid "You are banned." msgstr "Twój dostęp został zabroniony przez administratora." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Błąd" @@ -141,7 +141,7 @@ msgstr "awaria w trakcie przetwarzania:" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "gotowe" @@ -178,16 +178,16 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 #, fuzzy msgid "this attachment is not yet saved" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -327,14 +327,14 @@ msgstr "usuwanie starej strony %s" msgid "%s is not an editable page" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "tworzenie %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "edycja %s" @@ -382,55 +382,55 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "%s is an attachment, not a page." msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Wtyczka do wyszukiwarka wymaga podania %s" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 #, fuzzy msgid "failed to run graphviz" msgstr "awaria w trakcie uruchamiania wtyczki graphviz" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "prog nie jest poprawnym programem graphviz" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -455,7 +455,7 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" @@ -557,7 +557,7 @@ msgstr "nieznaleziony kanał RSS" msgid "redir cycle is not allowed" msgstr "nieznaleziony kanał RSS" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -671,71 +671,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "awaria w trakcie kompilowania %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "awaria w trakcie zmiany rozmiaru: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "awaria w trakcie zapisu %s: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "awaria w trakcie uruchamiania dot" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -870,16 +870,16 @@ msgstr "" msgid "%s is not a file" msgstr "Strona %s nie może być edytowana" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -945,12 +945,12 @@ msgstr "awaria w trakcie odczytu %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1265,11 +1265,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "przebudowywanie wiki..." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "odświeżanie wiki..." @@ -1283,45 +1283,50 @@ msgstr "" "Użycie parametru --cgi wymaga podania adresu URL do wiki za pomocą parametru " "--url" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "polecenie preprocesora %s wykryte w %s na głębokości %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, fuzzy, perl-format msgid "bad file name %s" msgstr "pomijanie nieprawidłowej nazwy pliku %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "nieznaleziony szablon %s" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "nieznany sposób sortowania %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "awaria w trakcie odczytu %s: %s" diff --git a/po/sv.po b/po/sv.po index 064c3665b..666524d03 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2007-01-10 23:47+0100\n" "Last-Translator: Daniel Nylander \n" "Language-Team: Swedish \n" @@ -51,7 +51,7 @@ msgstr "Inställningar sparades." msgid "You are banned." msgstr "Du är bannlyst." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Fel" @@ -138,7 +138,7 @@ msgstr "misslyckades med att behandla mall:" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "klar" @@ -175,15 +175,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -323,14 +323,14 @@ msgstr "tar bort gammal sida %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "skapar %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "redigerar %s" @@ -378,55 +378,55 @@ msgstr "kan inte läsa %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Måste ange %s när sökinsticket används" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -451,7 +451,7 @@ msgstr "misslyckades med att skriva %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "misslyckades med att skriva %s: %s" @@ -549,7 +549,7 @@ msgstr "mallen %s hittades inte" msgid "redir cycle is not allowed" msgstr "mallen %s hittades inte" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -663,71 +663,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "misslyckades med att kompilera %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "misslyckades med att skriva %s: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "linkmap misslyckades att köra dot" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -859,16 +859,16 @@ msgstr "%s är låst av %s och kan inte redigeras" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -934,12 +934,12 @@ msgstr "misslyckades med att skriva %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1251,11 +1251,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "bygger om wiki.." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "uppdaterar wiki.." @@ -1267,45 +1267,50 @@ msgstr "Diskussion" msgid "Must specify url to wiki with --url when using --cgi" msgstr "Måste ange url till wiki med --url när --cgi används" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "%s förbehandlingsslinga detekterades på %s, djup %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, fuzzy, perl-format msgid "bad file name %s" msgstr "hoppar över felaktigt filnamn %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "mallen %s hittades inte" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "okänd sorteringstyp %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "kan inte läsa %s: %s" diff --git a/po/tr.po b/po/tr.po index 07360da08..ecf76c6ec 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki 3.20091031\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2009-11-08 03:04+0200\n" "Last-Translator: Recai Oktaş \n" "Language-Team: Turkish \n" @@ -48,7 +48,7 @@ msgstr "Tercihler kaydedildi." msgid "You are banned." msgstr "" -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Hata" @@ -133,7 +133,7 @@ msgstr "" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "" @@ -167,15 +167,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -315,14 +315,14 @@ msgstr "" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "" @@ -366,54 +366,54 @@ msgstr "" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, perl-format msgid "Failed to revert commit %s" msgstr "" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, perl-format msgid "Must specify %s when using the %s plugin" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 msgid "failed to run graphviz" msgstr "" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -436,7 +436,7 @@ msgstr "" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, perl-format msgid "failed to resize: %s" msgstr "" @@ -526,7 +526,7 @@ msgstr "" msgid "redir cycle is not allowed" msgstr "" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -638,70 +638,70 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, perl-format msgid "failed to copy underlay PO file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, perl-format msgid "failed to update %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, perl-format msgid "failed to copy the POT file to %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, perl-format msgid "failed to translate %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, perl-format msgid "failed to write %s" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 msgid "failed to translate" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -832,16 +832,16 @@ msgstr "" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -906,12 +906,12 @@ msgstr "" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1215,11 +1215,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "" -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "" @@ -1231,45 +1231,50 @@ msgstr "" msgid "Must specify url to wiki with --url when using --cgi" msgstr "" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, perl-format msgid "bad file name %s" msgstr "" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, perl-format msgid "invalid sort type %s" msgstr "" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, perl-format msgid "cannot match pages: %s" msgstr "" diff --git a/po/vi.po b/po/vi.po index b33475e23..47c34effa 100644 --- a/po/vi.po +++ b/po/vi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: ikiwiki\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-07-11 18:36-0400\n" +"POT-Creation-Date: 2011-11-30 16:33-0400\n" "PO-Revision-Date: 2007-01-13 15:31+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" @@ -52,7 +52,7 @@ msgstr "Tùy thích đã được lưu." msgid "You are banned." msgstr "Bạn bị cấm ra." -#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1453 +#: ../IkiWiki/CGI.pm:464 ../IkiWiki/CGI.pm:465 ../IkiWiki.pm:1470 msgid "Error" msgstr "Lỗi" @@ -139,7 +139,7 @@ msgstr "mẫu không xử lý được:" msgid "deleting bucket.." msgstr "" -#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:226 +#: ../IkiWiki/Plugin/amazon_s3.pm:38 ../ikiwiki.in:227 msgid "done" msgstr "xong" @@ -176,15 +176,15 @@ msgstr "" msgid "bad attachment filename" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:293 +#: ../IkiWiki/Plugin/attachment.pm:295 msgid "attachment upload" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:344 +#: ../IkiWiki/Plugin/attachment.pm:346 msgid "this attachment is not yet saved" msgstr "" -#: ../IkiWiki/Plugin/attachment.pm:361 +#: ../IkiWiki/Plugin/attachment.pm:363 msgid "just uploaded" msgstr "" @@ -323,14 +323,14 @@ msgstr "đang gỡ bỏ trang cũ %s" msgid "%s is not an editable page" msgstr "" -#: ../IkiWiki/Plugin/editpage.pm:305 +#: ../IkiWiki/Plugin/editpage.pm:307 #, perl-format msgid "creating %s" msgstr "đang tạo %s" -#: ../IkiWiki/Plugin/editpage.pm:323 ../IkiWiki/Plugin/editpage.pm:342 -#: ../IkiWiki/Plugin/editpage.pm:353 ../IkiWiki/Plugin/editpage.pm:398 -#: ../IkiWiki/Plugin/editpage.pm:440 +#: ../IkiWiki/Plugin/editpage.pm:325 ../IkiWiki/Plugin/editpage.pm:344 +#: ../IkiWiki/Plugin/editpage.pm:355 ../IkiWiki/Plugin/editpage.pm:400 +#: ../IkiWiki/Plugin/editpage.pm:442 #, perl-format msgid "editing %s" msgstr "đang sửa %s" @@ -378,55 +378,55 @@ msgstr "không thể đọc %s: %s" msgid "%s is an attachment, not a page." msgstr "" -#: ../IkiWiki/Plugin/git.pm:776 ../IkiWiki/Plugin/git.pm:839 -#: ../IkiWiki.pm:1671 +#: ../IkiWiki/Plugin/git.pm:777 ../IkiWiki/Plugin/git.pm:840 +#: ../IkiWiki.pm:1690 #, perl-format msgid "you are not allowed to change %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:798 +#: ../IkiWiki/Plugin/git.pm:799 #, perl-format msgid "you cannot act on a file with mode %s" msgstr "" -#: ../IkiWiki/Plugin/git.pm:802 +#: ../IkiWiki/Plugin/git.pm:803 msgid "you are not allowed to change file modes" msgstr "" -#: ../IkiWiki/Plugin/git.pm:872 +#: ../IkiWiki/Plugin/git.pm:873 msgid "you are not allowed to revert a merge" msgstr "" -#: ../IkiWiki/Plugin/git.pm:891 +#: ../IkiWiki/Plugin/git.pm:892 #, fuzzy, perl-format msgid "Failed to revert commit %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:39 +#: ../IkiWiki/Plugin/google.pm:26 ../IkiWiki/Plugin/search.pm:41 #, fuzzy, perl-format msgid "Must specify %s when using the %s plugin" msgstr "Cần phải xác định %s khi dùng bổ sung tìm kiếm" -#: ../IkiWiki/Plugin/graphviz.pm:68 +#: ../IkiWiki/Plugin/graphviz.pm:87 #, fuzzy msgid "failed to run graphviz" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/graphviz.pm:91 +#: ../IkiWiki/Plugin/graphviz.pm:143 msgid "prog not a valid graphviz program" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:88 +#: ../IkiWiki/Plugin/highlight.pm:83 #, perl-format msgid "tohighlight contains unknown file type '%s'" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:99 +#: ../IkiWiki/Plugin/highlight.pm:94 #, perl-format msgid "Source code: %s" msgstr "" -#: ../IkiWiki/Plugin/highlight.pm:184 +#: ../IkiWiki/Plugin/highlight.pm:179 msgid "" "warning: highlight perl module not available; falling back to pass through" msgstr "" @@ -451,7 +451,7 @@ msgstr "lỗi ghi %s: %s" msgid "wrong size format \"%s\" (should be WxH)" msgstr "" -#: ../IkiWiki/Plugin/img.pm:123 +#: ../IkiWiki/Plugin/img.pm:122 #, fuzzy, perl-format msgid "failed to resize: %s" msgstr "lỗi ghi %s: %s" @@ -549,7 +549,7 @@ msgstr "không tìm thấy mẫu %s" msgid "redir cycle is not allowed" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki/Plugin/meta.pm:425 +#: ../IkiWiki/Plugin/meta.pm:427 msgid "sort=meta requires a parameter" msgstr "" @@ -663,71 +663,71 @@ msgid "" "po_link_to=default" msgstr "" -#: ../IkiWiki/Plugin/po.pm:461 +#: ../IkiWiki/Plugin/po.pm:468 msgid "updated PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:484 +#: ../IkiWiki/Plugin/po.pm:491 msgid "" "Can not remove a translation. If the master page is removed, however, its " "translations will be removed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:504 +#: ../IkiWiki/Plugin/po.pm:511 msgid "" "Can not rename a translation. If the master page is renamed, however, its " "translations will be renamed as well." msgstr "" -#: ../IkiWiki/Plugin/po.pm:950 +#: ../IkiWiki/Plugin/po.pm:957 #, perl-format msgid "POT file (%s) does not exist" msgstr "" -#: ../IkiWiki/Plugin/po.pm:964 +#: ../IkiWiki/Plugin/po.pm:971 #, fuzzy, perl-format msgid "failed to copy underlay PO file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:973 +#: ../IkiWiki/Plugin/po.pm:980 #, fuzzy, perl-format msgid "failed to update %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:979 +#: ../IkiWiki/Plugin/po.pm:986 #, fuzzy, perl-format msgid "failed to copy the POT file to %s" msgstr "lỗi biên dịch %s" -#: ../IkiWiki/Plugin/po.pm:1015 +#: ../IkiWiki/Plugin/po.pm:1022 msgid "N/A" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1026 +#: ../IkiWiki/Plugin/po.pm:1033 #, fuzzy, perl-format msgid "failed to translate %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1105 +#: ../IkiWiki/Plugin/po.pm:1112 msgid "removed obsolete PO files" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1162 ../IkiWiki/Plugin/po.pm:1174 -#: ../IkiWiki/Plugin/po.pm:1213 +#: ../IkiWiki/Plugin/po.pm:1169 ../IkiWiki/Plugin/po.pm:1181 +#: ../IkiWiki/Plugin/po.pm:1220 #, fuzzy, perl-format msgid "failed to write %s" msgstr "lỗi ghi %s: %s" -#: ../IkiWiki/Plugin/po.pm:1172 +#: ../IkiWiki/Plugin/po.pm:1179 #, fuzzy msgid "failed to translate" msgstr "linkmap không chạy dot được" -#: ../IkiWiki/Plugin/po.pm:1225 +#: ../IkiWiki/Plugin/po.pm:1232 msgid "invalid gettext data, go back to previous page to continue edit" msgstr "" -#: ../IkiWiki/Plugin/po.pm:1268 +#: ../IkiWiki/Plugin/po.pm:1275 #, perl-format msgid "%s has invalid syntax: must use CODE|NAME" msgstr "" @@ -859,16 +859,16 @@ msgstr "%s bị %s khoá nên không thể sửa được" msgid "%s is not a file" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:150 +#: ../IkiWiki/Plugin/remove.pm:149 #, perl-format msgid "confirm removal of %s" msgstr "" -#: ../IkiWiki/Plugin/remove.pm:187 +#: ../IkiWiki/Plugin/remove.pm:186 msgid "Please select the attachments to remove." msgstr "" -#: ../IkiWiki/Plugin/remove.pm:231 +#: ../IkiWiki/Plugin/remove.pm:230 msgid "removed" msgstr "" @@ -934,12 +934,12 @@ msgstr "lỗi ghi %s: %s" msgid "rsync_command exited %d" msgstr "" -#: ../IkiWiki/Plugin/search.pm:196 +#: ../IkiWiki/Plugin/search.pm:199 #, perl-format msgid "need Digest::SHA to index %s" msgstr "" -#: ../IkiWiki/Plugin/search.pm:250 +#: ../IkiWiki/Plugin/search.pm:253 msgid "search" msgstr "" @@ -1251,11 +1251,11 @@ msgstr "" msgid "usage: --set-yaml var=value" msgstr "" -#: ../ikiwiki.in:215 +#: ../ikiwiki.in:216 msgid "rebuilding wiki.." msgstr "đang xây dựng lại wiki.." -#: ../ikiwiki.in:218 +#: ../ikiwiki.in:219 msgid "refreshing wiki.." msgstr "đang làm tươi wiki.." @@ -1268,45 +1268,50 @@ msgid "Must specify url to wiki with --url when using --cgi" msgstr "" "Cần phải xác định địa chỉ URL tới wiki với « --url » khi dùng « --cgi »" -#: ../IkiWiki.pm:629 +#: ../IkiWiki.pm:605 +#, perl-format +msgid "unsupported umask setting %s" +msgstr "" + +#: ../IkiWiki.pm:645 msgid "cannot use multiple rcs plugins" msgstr "" -#: ../IkiWiki.pm:659 +#: ../IkiWiki.pm:675 #, perl-format msgid "failed to load external plugin needed for %s plugin: %s" msgstr "" -#: ../IkiWiki.pm:1435 +#: ../IkiWiki.pm:1452 #, fuzzy, perl-format msgid "preprocessing loop detected on %s at depth %i" msgstr "vòng lặp tiền xử lý %s được phát hiện trên %s ở độ sâu %i" -#: ../IkiWiki.pm:1627 +#: ../IkiWiki.pm:1646 #, fuzzy, perl-format msgid "bad file name %s" msgstr "đang bỏ qua tên tập tin sai %s" -#: ../IkiWiki.pm:1927 +#: ../IkiWiki.pm:1946 #, perl-format msgid "template %s not found" msgstr "không tìm thấy mẫu %s" -#: ../IkiWiki.pm:2177 +#: ../IkiWiki.pm:2196 msgid "yes" msgstr "" -#: ../IkiWiki.pm:2254 +#: ../IkiWiki.pm:2273 #, fuzzy, perl-format msgid "invalid sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2275 +#: ../IkiWiki.pm:2294 #, perl-format msgid "unknown sort type %s" msgstr "kiểu sắp xếp không rõ %s" -#: ../IkiWiki.pm:2411 +#: ../IkiWiki.pm:2430 #, fuzzy, perl-format msgid "cannot match pages: %s" msgstr "không thể đọc %s: %s" From 45c8fad7f071b121c5b1641115be6fa596005129 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 30 Nov 2011 16:53:08 -0400 Subject: [PATCH 154/460] add news item for ikiwiki 3.20111107 --- doc/news/version_3.20110711.mdwn | 7 ------- doc/news/version_3.20111107.mdwn | 12 ++++++++++++ 2 files changed, 12 insertions(+), 7 deletions(-) delete mode 100644 doc/news/version_3.20110711.mdwn create mode 100644 doc/news/version_3.20111107.mdwn diff --git a/doc/news/version_3.20110711.mdwn b/doc/news/version_3.20110711.mdwn deleted file mode 100644 index c4006cbe7..000000000 --- a/doc/news/version_3.20110711.mdwn +++ /dev/null @@ -1,7 +0,0 @@ -ikiwiki 3.20110711 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * Add build dep on python-support. Closes: #[633536](http://bugs.debian.org/633536) - * attachment: Bugfix to move upload attachments out of holding area - when saving. - * attachment: Bugfix for trying to attach files to a subpage of the index - page."""]] \ No newline at end of file diff --git a/doc/news/version_3.20111107.mdwn b/doc/news/version_3.20111107.mdwn new file mode 100644 index 000000000..5af8ae647 --- /dev/null +++ b/doc/news/version_3.20111107.mdwn @@ -0,0 +1,12 @@ +ikiwiki 3.20111107 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * img: Bugfix to width/height tags for scaled down image when only + one dimension was provided. Thanks, Per Carlson. + * editpage: Fix FormattingHelp link on Discussion pages. + * The umask setting can now be set to private, group, or public, + avoiding the need to enter octal correctly which is particularly + difficult in yaml setup files. (smcv) + * graphviz: Support urls embedded in the graph, by having graphviz + generate an imagemap. + * graphviz: Support wikilinks embedded in the graph. + (Sponsored by The TOVA Company.)"""]] \ No newline at end of file From 51248225270b555d6dcc5b4dd0f108ec26e50859 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Fri, 2 Dec 2011 01:03:37 -0400 Subject: [PATCH 155/460] --- .../w3mmode___91__Save_Page__93___results_in_403.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn diff --git a/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn b/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn new file mode 100644 index 000000000..6c7a59b62 --- /dev/null +++ b/doc/forum/w3mmode___91__Save_Page__93___results_in_403.mdwn @@ -0,0 +1,9 @@ +My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly. +My doc/index.mdwn just has a line or two of plain text. +When I try to edit that page in w3m, it works fine until I push [Save Page]. +Then I just get a page that only contains "403". + +ikiwiki version is 3.20110715ubuntu1. +w3m is 0.5.3. + +-- [[terry|tjgolubi]] From cd76576d4d439be27420c4e9a90b6dcbe4744f02 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Fri, 2 Dec 2011 14:11:36 -0400 Subject: [PATCH 156/460] --- ...Mode_still_uses_http:__47____47__localhost__63__.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn diff --git a/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn new file mode 100644 index 000000000..270b909a9 --- /dev/null +++ b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn @@ -0,0 +1,9 @@ +My setup matches w3mmode [[w3mmode/ikiwiki.setup]] exactly. +My doc/index.mdwn just has a line or two of plain text. +When I try to edit that page in w3m, it works fine until I push [Save Page]. +Then I just get a page that only contains "403". + +ikiwiki version is 3.20110715ubuntu1. +w3m is 0.5.3. + +-- [[terry|tjgolubi]] From b4d54c155aca64f12673103f7eeae97606d06d28 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Fri, 2 Dec 2011 14:23:07 -0400 Subject: [PATCH 157/460] --- ...e_still_uses_http:__47____47__localhost__63__.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn index 270b909a9..64b6ef2ed 100644 --- a/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn +++ b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn @@ -7,3 +7,14 @@ ikiwiki version is 3.20110715ubuntu1. w3m is 0.5.3. -- [[terry|tjgolubi]] + +I made it work, though probably not completely, by renaming +~/.ikiwiki/wrappers/ikiwiki.cgi to ikiwiki2.cgi and replacing it with: + + #!/bin/bash + /home/tjgolubi/.ikiwiki/wrappers/ikiwiki2.cgi $* | sed -e 's,http://localhost,file://,g' + +I'm afraid that this hack may have bad side-effects, but I hope it points you to the cause/solution. +Of course, the next time I rerun ikiwiki --setup, it will overwrite my wrapper-wrapper. + +-- [[terry|tjgolubi]] From 8bf3e1b284f95db20034a484c9dd904c03fb1342 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlkQOG_UxmAVOjXBQJLpiBmBWXEiTL9PYw" Date: Fri, 2 Dec 2011 14:36:19 -0400 Subject: [PATCH 158/460] --- .../W3MMode_still_uses_http:__47____47__localhost__63__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn index 64b6ef2ed..3c28e379b 100644 --- a/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn +++ b/doc/bugs/W3MMode_still_uses_http:__47____47__localhost__63__.mdwn @@ -18,3 +18,7 @@ I'm afraid that this hack may have bad side-effects, but I hope it points you to Of course, the next time I rerun ikiwiki --setup, it will overwrite my wrapper-wrapper. -- [[terry|tjgolubi]] + +I made a logfile of all the args, env, and stdin/stdout to/from my wrapper. If you're interested, I'll email it to you. I wasn't able to attach it here. + +-- [[terry|tjgolubi]] From 50f1b82eb3757fd053ddc3e4b6f78e9f89e20261 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:16:29 -0400 Subject: [PATCH 159/460] --- ...diting_with_editor_than_with_web-edit.mdwn | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn new file mode 100644 index 000000000..5440ddf73 --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit.mdwn @@ -0,0 +1,24 @@ +Hi, + +today I encountered a strange behaviour of ikiwiki that I'm trying to understand... + +I linked to a subpage using + +\[[somename|/path/from/root/dir/filename]] + +and saved the file. Then I added it to the repo, committed it, and ran + + ikiwiki --setup setupfile.setup + +Afterwards some older links of the same style were displayed correctly, but one new link remained black - i.e. with no question mark to it. I figure that means ikiwiki has recognized the syntax but did not create a link in the html file. + +I messed around a bit, recompiling many times did not work. After a while I opened the file via the web editing formular and saved it from there ("Save Page"). + +After that the link was there. + +I dont know why. My question is - what does ikiwiki do differently when saved from the web form than when saving an editor and then running ikiwiki --setup setupfile.setup. + +Btw. my version is still 3.20100815.7 since I'm on squeeze and like to stick with the repo versions. + +Thanks in advance, +Chris From 3f6bc63aa54643d87950267aae0615a9bf0bf41b Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:17:57 -0400 Subject: [PATCH 160/460] Added a comment --- .../comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment new file mode 100644 index 000000000..91e7d9e7a --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_1_ac6bda46ad00bfe980bc76c4a39aa796._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 1" + date="2011-12-03T17:17:57Z" + content=""" +with \"no question mark to it\" means \"being no link (target exists) AND with no question mark to it\" +thx +"""]] From 0df0d02334971cfe8c8dfa5bba0a4b5a1940f57d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:20:17 -0400 Subject: [PATCH 161/460] Added a comment --- ...mment_2_4f4982835c2bb6510b182c8106476f47._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment new file mode 100644 index 000000000..db9b17e1a --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 2" + date="2011-12-03T17:20:17Z" + content=""" +One more thing: my syntax with the above post is not correct - the linking syntax was/is + +[[somename|path/from/website/root/dir/filename]] + +ie. I got one slash too much above. +"""]] From ee052c528977df4b805d5a9dae53f42514c9ac2a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:20:50 -0400 Subject: [PATCH 162/460] removed --- ...mment_2_4f4982835c2bb6510b182c8106476f47._comment | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment deleted file mode 100644 index db9b17e1a..000000000 --- a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_4f4982835c2bb6510b182c8106476f47._comment +++ /dev/null @@ -1,12 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" - nickname="Christian" - subject="comment 2" - date="2011-12-03T17:20:17Z" - content=""" -One more thing: my syntax with the above post is not correct - the linking syntax was/is - -[[somename|path/from/website/root/dir/filename]] - -ie. I got one slash too much above. -"""]] From c24d8afd15954837c34007aaba8be7bf59963358 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:21:41 -0400 Subject: [PATCH 163/460] Added a comment --- ...ment_2_86a97d3986e9148d4f232ff4697a9f06._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment new file mode 100644 index 000000000..2b6431a56 --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 2" + date="2011-12-03T17:21:41Z" + content=""" +One more thing: my syntax with the above post is not correct - the linking syntax was/is + +\[[somename|path/from/website/root/dir/filename]] + +ie. I got one slash too much above. + +"""]] From 8c03350301ba04cb9daf6c15086a2c4702acbfde Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:21:56 -0400 Subject: [PATCH 164/460] Added a comment --- ...ment_3_db04a256f6ab6383285602bf80f56a2e._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment new file mode 100644 index 000000000..f990b29b7 --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 3" + date="2011-12-03T17:21:56Z" + content=""" +One more thing: my syntax with the above post is not correct - the linking syntax was/is + +\[[somename|path/from/website/root/dir/filename]] + +ie. I got one slash too much above. + +"""]] From 46df230be77e9199280f258eb067050d38151bfe Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:25:06 -0400 Subject: [PATCH 165/460] removed --- ...ment_3_db04a256f6ab6383285602bf80f56a2e._comment | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment deleted file mode 100644 index f990b29b7..000000000 --- a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_db04a256f6ab6383285602bf80f56a2e._comment +++ /dev/null @@ -1,13 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" - nickname="Christian" - subject="comment 3" - date="2011-12-03T17:21:56Z" - content=""" -One more thing: my syntax with the above post is not correct - the linking syntax was/is - -\[[somename|path/from/website/root/dir/filename]] - -ie. I got one slash too much above. - -"""]] From 525377f00166c34c5007a0887731afb31c10dbae Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:25:58 -0400 Subject: [PATCH 166/460] Added a comment --- ...ment_3_10a46f8ee23c8935e20c70842671cee4._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment new file mode 100644 index 000000000..a14752ffe --- /dev/null +++ b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_3_10a46f8ee23c8935e20c70842671cee4._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" + nickname="Christian" + subject="comment 3" + date="2011-12-03T17:25:58Z" + content=""" +One more thing: my syntax with the above post is not correct - the linking syntax was/is + + \[[somename|path/from/website/root/dir/filename]] + +ie. I got one slash too much above. + +"""]] From 0488cb312aecf8f6982d094315fb6f74ce7372f8 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" Date: Sat, 3 Dec 2011 13:26:19 -0400 Subject: [PATCH 167/460] removed --- ...ment_2_86a97d3986e9148d4f232ff4697a9f06._comment | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment diff --git a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment b/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment deleted file mode 100644 index 2b6431a56..000000000 --- a/doc/forum/Different_behaviour_when_editing_with_editor_than_with_web-edit/comment_2_86a97d3986e9148d4f232ff4697a9f06._comment +++ /dev/null @@ -1,13 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnam4a8RtFwaWkKOX2BkA5I7cpGHcFw8E0" - nickname="Christian" - subject="comment 2" - date="2011-12-03T17:21:41Z" - content=""" -One more thing: my syntax with the above post is not correct - the linking syntax was/is - -\[[somename|path/from/website/root/dir/filename]] - -ie. I got one slash too much above. - -"""]] From 95174ba9a324c6df99bec6cc110a39da86136e17 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sat, 3 Dec 2011 14:10:23 -0400 Subject: [PATCH 168/460] --- doc/forum/Split_a_wiki.mdwn | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/forum/Split_a_wiki.mdwn diff --git a/doc/forum/Split_a_wiki.mdwn b/doc/forum/Split_a_wiki.mdwn new file mode 100644 index 000000000..f1c7e50da --- /dev/null +++ b/doc/forum/Split_a_wiki.mdwn @@ -0,0 +1,21 @@ +Is it possible to split an ikiwiki (with git backend) in to two? + +Suppose I have an ikiwiki called myiki + +which contains the pages + +pageA1,pageA2,...,pageB1,pageB2,... + +now I want to have two wikis called myikiA and myikiB + +such that + +myikiA contains pageA1,pageA2,... + +The history of myikiA should contain the whole history of those pages but no history of pageB1,pageB2,... + +and + +myikiB contains pageB1,pageB2,... + +The history of myikiB should contain the whole history of those pages but no history of pageA1,pageA2,... From 0dcb6f6539ad62d78214265e585b2516a3afe588 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sat, 3 Dec 2011 15:45:06 -0400 Subject: [PATCH 169/460] Added a comment --- .../comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment diff --git a/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment b/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment new file mode 100644 index 000000000..66401914a --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_1_1599c26891b2071a2f1ca3fd90627fc4._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2011-12-03T19:45:06Z" + content=""" +The only thing I can think of is to clone the wiki, and for WikiA, delete PageB, and for WikiB, delete PageA. This won't remove the histories of those pages, but it will at least remove those pages. +"""]] From 1b5d460363035ed39a8e4eb805c27b753fd895b5 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Sun, 4 Dec 2011 03:38:47 -0400 Subject: [PATCH 170/460] --- doc/todo/Pagination_next_prev_links.mdwn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/todo/Pagination_next_prev_links.mdwn b/doc/todo/Pagination_next_prev_links.mdwn index e2b56a0cc..eded75690 100644 --- a/doc/todo/Pagination_next_prev_links.mdwn +++ b/doc/todo/Pagination_next_prev_links.mdwn @@ -4,7 +4,12 @@ They don't want to back out of post to an index. They want an easy button to cli -Thank you +[Jekyll](http://jekyllrb.com/)'s implementation looks rather neat: + +* +* + + > This is a perfect use for [[todo/wikitrails]], of which my > [[plugins/contrib/trail]] plugin is an implementation. Code review on that @@ -53,3 +58,5 @@ Thank you >>> Making [[plugins/contrib/album]] require `trail` v3, and trying it out >>> on my blog, are next on the list. >>> --[[smcv]] + +>>>> Sorry thank link doesn't work. I get a forbidden. --[[hendry]] From 90a351d360e37428712bded0aed659e29f8d1e2f Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Sun, 4 Dec 2011 03:40:00 -0400 Subject: [PATCH 171/460] add wishlist tag to hopefully get the attention of Joey --- doc/todo/Pagination_next_prev_links.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/Pagination_next_prev_links.mdwn b/doc/todo/Pagination_next_prev_links.mdwn index eded75690..951b0c222 100644 --- a/doc/todo/Pagination_next_prev_links.mdwn +++ b/doc/todo/Pagination_next_prev_links.mdwn @@ -60,3 +60,6 @@ They don't want to back out of post to an index. They want an easy button to cli >>> --[[smcv]] >>>> Sorry thank link doesn't work. I get a forbidden. --[[hendry]] + + +[[wishlist]] From 13b0361414d9f0319dd9c7d0ad8471277bd80d94 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Sun, 4 Dec 2011 03:44:06 -0400 Subject: [PATCH 172/460] suggest sundown --- doc/todo/Improve_markdown_speed.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/Improve_markdown_speed.mdwn diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn new file mode 100644 index 000000000..590b07592 --- /dev/null +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -0,0 +1,3 @@ +I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). + +[[wishlist]] From 088ac167c5d5b9faa28059c386b75bd5e726d493 Mon Sep 17 00:00:00 2001 From: "http://hendry.iki.fi/" Date: Sun, 4 Dec 2011 04:06:26 -0400 Subject: [PATCH 173/460] --- doc/todo/mdwn_preview/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/mdwn_preview/discussion.mdwn diff --git a/doc/todo/mdwn_preview/discussion.mdwn b/doc/todo/mdwn_preview/discussion.mdwn new file mode 100644 index 000000000..4fb30adf9 --- /dev/null +++ b/doc/todo/mdwn_preview/discussion.mdwn @@ -0,0 +1 @@ ++1, not sure where this feature is going. I'm keen to seen this! From 5c8870aa6a07ac8707994403429f5aa52b6c05af Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Sun, 4 Dec 2011 09:37:27 -0400 Subject: [PATCH 174/460] Added a comment --- ..._1c54d3594f0350340f8dfb3e95c29ffd._comment | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment diff --git a/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment b/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment new file mode 100644 index 000000000..8040ad5e2 --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_2_1c54d3594f0350340f8dfb3e95c29ffd._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 2" + date="2011-12-04T13:37:27Z" + content=""" +If just deleting the unwanted pages is insufficient (e.g. perhaps they +contain information that must not be made public), you can split a git +repository (including ikiwiki repositories) with `git filter-branch` (see +[this stackoverflow question](http://stackoverflow.com/questions/359424/detach-subdirectory-into-separate-git-repository), +for instance). + +This preserves the history of each individual page, but rewrites the +entire history of the repository (it re-does every commit, pretending +that the addition of the omitted pages and every subsequent edit to +them had never happened); it's like `git rebase` but more so. + +As a result, existing branches will no longer be able to push to the +rewritten repository. +"""]] From 6168baf0e081e3d5df25c658d2fc677f4e795883 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 4 Dec 2011 10:03:55 -0400 Subject: [PATCH 175/460] Added a comment --- .../comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment diff --git a/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment b/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment new file mode 100644 index 000000000..e2dbd2546 --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_3_9eac1d1b93df27d849acc574b1f0f26d._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 3" + date="2011-12-04T14:03:55Z" + content=""" +@smcv: Thanks, that looks promising. The example from stackoverflow is with subdirectories. What do I have to change to match a list of single files (pages) instead? +"""]] From 6f8398fbb906ef194f6ce9b9981b80a7b792622b Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 4 Dec 2011 19:30:46 -0400 Subject: [PATCH 176/460] consider alternatives? --- doc/todo/Improve_markdown_speed.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn index 590b07592..5917290c6 100644 --- a/doc/todo/Improve_markdown_speed.mdwn +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -1,3 +1,6 @@ I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). +>> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Markdown::Discount instead, which appears to be a perl module which uses the C library "Discount". Unfortunately, when I tried, I couldn't install it on my system, so the point may be moot. +>> -- [[KathrynAndersen]] + [[wishlist]] From 4b99befd36797a228b993203f0bad312a87921d2 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 4 Dec 2011 19:38:51 -0400 Subject: [PATCH 177/460] a different alternative --- doc/todo/Improve_markdown_speed.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn index 5917290c6..8d7f0e3cb 100644 --- a/doc/todo/Improve_markdown_speed.mdwn +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -1,6 +1,6 @@ I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). ->> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Markdown::Discount instead, which appears to be a perl module which uses the C library "Discount". Unfortunately, when I tried, I couldn't install it on my system, so the point may be moot. +>> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Upskirt instead, which uses the Upskirt library which Sundown appears to be derived from. >> -- [[KathrynAndersen]] [[wishlist]] From aa226bbb6ba913db0ce428641d4fde733b63f0a8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2011 15:17:01 -0400 Subject: [PATCH 178/460] Consume all stdin when rcs_receive short-circuits, to avoid git SIPIPE race. We had a weird problem where, after moving to a new, faster server, "git push" would sometimes fail like this: Unpacking objects: 100% (3/3), done. fatal: The remote end hung up unexpectedly fatal: The remote end hung up unexpectedly What turned out to be going on was that git-receive-pack was dying due to an uncaught SIGPIPE. The SIGPIPE occurred when it tried to write to the pre-receive hook's stdin. The pre-receive hook, in this case, was able to do all the checks it needed to do without the input, and so did exit(0) without consuming it. Apparently that causes a race. Most of the time, git forks the hook, writes output to the hook, and then the hook runs, ignores it, and exits. But sometimes, on our new faster server, git forked the hook, and it ran, and exited, before git got around to writing to it, resulting in the SIGPIPE. write(7, "c9f98c67d70a1cfeba382ec27d87644a"..., 100) = -1 EPIPE (Broken pipe) --- SIGPIPE (Broken pipe) @ 0 (0) --- I think git should ignore SIGPIPE when writing to hooks. Otherwise, hooks may have to go out of their way to consume all input, and as I've seen, the races when they fail to do this can lurk undiscovered. I have written to the git mailing list about this. As a workaround, consume all stdin before exiting. --- IkiWiki/Receive.pm | 9 ++++++++- debian/changelog | 6 ++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index c73adfbbb..5908e09f9 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -35,10 +35,17 @@ EOF } "u != $uid"; } @{$config{untrusted_committers}}). - ") exit(0);\n"; + ") {\n"; $ret.=<<"EOF"; + /* Trusted user. + * Consume all stdin before exiting, as git may + * otherwise be unhappy. */ + char buf[256]; + while (read(0, &buf, 256) != 0) {} + exit(0); + } asprintf(&s, "CALLER_UID=%i", u); newenviron[i++]=s; } diff --git a/debian/changelog b/debian/changelog index 0c64875f1..ccdeb8300 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20111108) UNRELEASED; urgency=low + + * Consume all stdin when rcs_receive short-circuits, to avoid git SIPIPE race. + + -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 + ikiwiki (3.20111107) unstable; urgency=low * img: Bugfix to width/height tags for scaled down image when only From a165790ba7b767d2136377fc612894c19461781a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 5 Dec 2011 15:19:25 -0400 Subject: [PATCH 179/460] typo --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ccdeb8300..5377459a2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low - * Consume all stdin when rcs_receive short-circuits, to avoid git SIPIPE race. + * Consume all stdin when rcs_receive short-circuits, + to avoid git SIGPIPE race. -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 From 8707b9f9d3ed6d9deb3c40a48caac370cc3e6a7a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Dec 2011 13:20:05 -0400 Subject: [PATCH 180/460] clena up the sitemap --- doc/sitemap.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index 5265d6378..ca8e1dc30 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -3,4 +3,4 @@ This map excludes discussion pages, as well as subpages that are in feeds. [[!map pages="* and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* and !sandbox/* and !forum/* and !todo/* and !users/* -and !*.css and !*.ico and !*.png and !*.svgz and !*.gif"]] +and !*.css and !*.ico and !*.png and !*.svgz and !*.svg and !*.gif and !*.js"]] From 30938ee2551cf0b4cb979f7bddeae1cf78cc4baf Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Dec 2011 13:24:25 -0400 Subject: [PATCH 181/460] better pagespec for sitemap, using page(*) to only show pages and not other files --- doc/sitemap.mdwn | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/sitemap.mdwn b/doc/sitemap.mdwn index ca8e1dc30..095ef95df 100644 --- a/doc/sitemap.mdwn +++ b/doc/sitemap.mdwn @@ -1,6 +1,5 @@ This map excludes discussion pages, as well as subpages that are in feeds. -[[!map pages="* and !*/discussion and !recentchanges +[[!map pages="page(*) and !*/discussion and !recentchanges and !bugs/* and !examples/*/* and !news/* and !tips/* and !plugins/* -and !sandbox/* and !forum/* and !todo/* and !users/* -and !*.css and !*.ico and !*.png and !*.svgz and !*.svg and !*.gif and !*.js"]] +and !sandbox/* and !forum/* and !todo/* and !users/*"]] From 5333c113d62acd0b82551e499863abaf749a6a1f Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Nov 2011 15:11:02 +0000 Subject: [PATCH 182/460] Add path and path_natural sort orders (cherry picked from commit 272e0b2f17c33c625b494b07f581da400066a216) --- IkiWiki.pm | 1 + IkiWiki/Plugin/sortnaturally.pm | 5 +++++ doc/ikiwiki/pagespec/sorting.mdwn | 6 +++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 59fefc699..08e242a1f 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2808,6 +2808,7 @@ sub cmp_title { IkiWiki::pagetitle(IkiWiki::basename($b)) } +sub cmp_path { IkiWiki::pagetitle($a) cmp IkiWiki::pagetitle($b) } sub cmp_mtime { $IkiWiki::pagemtime{$b} <=> $IkiWiki::pagemtime{$a} } sub cmp_age { $IkiWiki::pagectime{$b} <=> $IkiWiki::pagectime{$a} } diff --git a/IkiWiki/Plugin/sortnaturally.pm b/IkiWiki/Plugin/sortnaturally.pm index b038b2f9a..108b489f8 100644 --- a/IkiWiki/Plugin/sortnaturally.pm +++ b/IkiWiki/Plugin/sortnaturally.pm @@ -30,4 +30,9 @@ sub cmp_title_natural { IkiWiki::pagetitle(IkiWiki::basename($b))) } +sub cmp_path_natural { + Sort::Naturally::ncmp(IkiWiki::pagetitle($a), + IkiWiki::pagetitle($b)) +} + 1; diff --git a/doc/ikiwiki/pagespec/sorting.mdwn b/doc/ikiwiki/pagespec/sorting.mdwn index ccd7f7eaa..0c6cc74c7 100644 --- a/doc/ikiwiki/pagespec/sorting.mdwn +++ b/doc/ikiwiki/pagespec/sorting.mdwn @@ -7,10 +7,14 @@ orders can be specified. * `mtime` - List pages with the most recently modified first. -* `title` - Order by title (page name). +* `title` - Order by title (page name), e.g. "z/a a/b a/c" + +* `path` - Order by page name including parents, e.g. "a/b a/c z/a" [[!if test="enabled(sortnaturally)" then=""" * `title_natural` - Orders by title, but numbers in the title are treated as such, ("1 2 9 10 20" instead of "1 10 2 20 9") + +* `path_natural` - Like `path`, but numbers in the title are treated as such """]] [[!if test="enabled(meta)" then=""" * `meta(title)` - Order according to the `\[[!meta title="foo" sortas="bar"]]` From ea313b8133e65947d07c1e13b41584f7582d99e1 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sat, 12 Nov 2011 16:02:20 +0000 Subject: [PATCH 183/460] Add path and path_natural sort orders These correspond to title and title_natural, but compare the entire path: a < a/b < a/z < ab < b. (cherry picked from commit 903a5a314f1f5d833dbc208ce128f24195b40e4b) --- t/cmp_path.t | 48 +++++++++++++++++++++++++++++++++++++++++ t/pagespec_match_list.t | 4 ++-- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100755 t/cmp_path.t diff --git a/t/cmp_path.t b/t/cmp_path.t new file mode 100755 index 000000000..9de79f49b --- /dev/null +++ b/t/cmp_path.t @@ -0,0 +1,48 @@ +#!/usr/bin/perl +use warnings; +use strict; +use Test::More tests => 25; + +BEGIN { use_ok("IkiWiki"); } + +%config=IkiWiki::defaultconfig(); +$config{srcdir}=$config{destdir}="/dev/null"; +IkiWiki::checkconfig(); + +sub test { + my ($before, $after) = @_; + + $IkiWiki::SortSpec::a = $before; + $IkiWiki::SortSpec::b = $after; + my $r = IkiWiki::SortSpec::cmp_path(); + + if ($before eq $after) { + is($r, 0); + } + else { + is($r, -1); + } + + $IkiWiki::SortSpec::a = $after; + $IkiWiki::SortSpec::b = $before; + $r = IkiWiki::SortSpec::cmp_path(); + + if ($before eq $after) { + is($r, 0); + } + else { + is($r, 1); + } + + is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $before, $after)], + [$before, $after]); + is_deeply([IkiWiki::SortSpec::sort_pages(\&IkiWiki::SortSpec::cmp_path, $after, $before)], + [$before, $after]); +} + +test("a/b/c", "a/b/c"); +test("a/b", "a/c"); +test("a/z", "z/a"); +test("a", "a/b"); +test("a", "a/b"); +test("a/z", "ab"); diff --git a/t/pagespec_match_list.t b/t/pagespec_match_list.t index 244ad9159..7ff178aad 100755 --- a/t/pagespec_match_list.t +++ b/t/pagespec_match_list.t @@ -12,7 +12,7 @@ IkiWiki::checkconfig(); { package IkiWiki::SortSpec; - sub cmp_path { $a cmp $b } + sub cmp_raw_path { $a cmp $b } } %pagesources=( @@ -53,7 +53,7 @@ is_deeply([pagespec_match_list("foo", "post/*", sort => "title", num => 50, reve is_deeply([pagespec_match_list("foo", "post/*", sort => "title", filter => sub { $_[0] =~ /3/}) ], ["post/1", "post/2"]); -is_deeply([pagespec_match_list("foo", "*", sort => "path", num => 2)], +is_deeply([pagespec_match_list("foo", "*", sort => "raw_path", num => 2)], ["bar", "foo"]); is_deeply([pagespec_match_list("foo", "foo* or bar*", sort => "-age title")], # oldest first, break ties by title From 5bf7ee5deaf01d90b38ff9011fe92b26f0793189 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Dec 2011 14:34:12 -0400 Subject: [PATCH 184/460] done --- debian/changelog | 1 + doc/todo/sorting_by_path.mdwn | 2 ++ 2 files changed, 3 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5377459a2..f604adb75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low * Consume all stdin when rcs_receive short-circuits, to avoid git SIGPIPE race. + * Add path and path_natural sort orders (smcv) -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 diff --git a/doc/todo/sorting_by_path.mdwn b/doc/todo/sorting_by_path.mdwn index b7af9f919..a483c331a 100644 --- a/doc/todo/sorting_by_path.mdwn +++ b/doc/todo/sorting_by_path.mdwn @@ -14,3 +14,5 @@ It's one commit (including a regression test) which can be cherry-picked if you don't want the rest of `trail`. --[[smcv]] + +> [[done]] --[[Joey]] From f6440dd5e64e67ebbdba5a0a7913d9783ef35f3b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 6 Dec 2011 15:03:34 -0400 Subject: [PATCH 185/460] coverage merged --- debian/changelog | 1 + doc/todo/test_coverage.mdwn | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index f604adb75..b8107c9b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low * Consume all stdin when rcs_receive short-circuits, to avoid git SIGPIPE race. * Add path and path_natural sort orders (smcv) + * Test coverage can be checked with `make coverage` (smcv) -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 diff --git a/doc/todo/test_coverage.mdwn b/doc/todo/test_coverage.mdwn index 4c0e9e16c..56e11e01a 100644 --- a/doc/todo/test_coverage.mdwn +++ b/doc/todo/test_coverage.mdwn @@ -11,8 +11,14 @@ Limitations of the current branch, which uses [[!cpan Devel::Cover]]: the two copies of each module; not a problem for [[plugins/contrib/trail]] which only has one test. +> How annoying. I think in at least some cases there is reason to use +> `./blib` -- perhaps everything that users `.` should be changed to use +> it. --[[Joey]] + * The [[plugins/git]] and [[plugins/mercurial]] plugins want to `chdir`, and so does [[!cpan Devel::Cover]], so they fight. For now, those tests are disabled under `make coverage`. --[[smcv]] + +> [[merged|done]] --[[Joey]] From 4d813da44eac80189952af63bcdf6c54a9bbec6e Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:22:59 -0400 Subject: [PATCH 186/460] --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9b7375e45..f96f7f457 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,5 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] +< This is simple enough for now [[sandbocen]] no? From bcc5151576bb8f363eac711959e53cb6cac9cd94 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:23:24 -0400 Subject: [PATCH 187/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index f96f7f457..3b6048a2e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -< + This is simple enough for now [[sandbocen]] no? From 3a9a5a63017d460d4b89569470245f5d14cbc191 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:23:51 -0400 Subject: [PATCH 188/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 3b6048a2e..968c63a0d 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] - +\ This is simple enough for now [[sandbocen]] no? From 277ccb431728edc6dcb3762510182b0eb3345da1 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:24:17 -0400 Subject: [PATCH 189/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 968c63a0d..7ad08a991 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -\ +\<\abc\> This is simple enough for now [[sandbocen]] no? From ba71e372c84c5bac851d55c12ca27ed160651e24 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:24:36 -0400 Subject: [PATCH 190/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 7ad08a991..f4bf848bc 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -\<\abc\> +\< abc\> This is simple enough for now [[sandbocen]] no? From ed7407928428e93d5ecda98e63b9d3988319a95a Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:24:57 -0400 Subject: [PATCH 191/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index f4bf848bc..032687413 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -\< abc\> +< abc\> This is simple enough for now [[sandbocen]] no? From 4c45ea0370d26d0a235c82ee3daabb75321acc8f Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:25:19 -0400 Subject: [PATCH 192/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 032687413..888da3ea6 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -< abc\> +< abc> This is simple enough for now [[sandbocen]] no? From 76085331a135a0f3cd3c204c279f11b2d6c0b57d Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:25:34 -0400 Subject: [PATCH 193/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 888da3ea6..3b6048a2e 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -< abc> + This is simple enough for now [[sandbocen]] no? From 8efb36dfb85fae7f921ec2007493226b67eef334 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:25:52 -0400 Subject: [PATCH 194/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 3b6048a2e..1eccadca2 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] - +\<abc> This is simple enough for now [[sandbocen]] no? From 01e10d16c9d4a02a477c0e80a1b99f20f847a8de Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:27:02 -0400 Subject: [PATCH 195/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 1eccadca2..c43fac35d 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -\<abc> +< abc > This is simple enough for now [[sandbocen]] no? From 1ce0d17dc758c4025d2e2eea79a691a8dbb90414 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:28:21 -0400 Subject: [PATCH 196/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index c43fac35d..a80fdac92 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -< abc > +
This is simple enough for now [[sandbocen]] no? From 0656e11acf4eb9414310f70416427d99ff44bab5 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:37:13 -0400 Subject: [PATCH 197/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index a80fdac92..aaa253765 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -
+<> This is simple enough for now [[sandbocen]] no? From 4d4c14b25abd7de1e37b15d87f9073bf715078ee Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:37:39 -0400 Subject: [PATCH 198/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index aaa253765..439c31edf 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -<> +<\asd> This is simple enough for now [[sandbocen]] no? From f62d93d85cc4a8cc825dec8c5ba6f322ad37625a Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:40:27 -0400 Subject: [PATCH 199/460] --- doc/sandbox.mdwn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 439c31edf..1d54f96ee 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,7 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -<\asd> + + This is simple enough for now [[sandbocen]] no? From ef7f9b5b51a456def94ed80779d1310c9154ccdb Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:42:20 -0400 Subject: [PATCH 200/460] --- doc/sandbox.mdwn | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 1d54f96ee..af2842249 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,7 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] - - +| This is simple enough for now [[sandbocen]] no? From 97b2345f8cb2ee013a5ecee259cd897f210aa9c1 Mon Sep 17 00:00:00 2001 From: ioaoue Date: Wed, 7 Dec 2011 01:45:50 -0400 Subject: [PATCH 201/460] --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index af2842249..2f173677b 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -168,6 +168,6 @@ module vc_Mux2 #( parameter W = 1 ) endmodule """]] -| +# This is simple enough for now [[sandbocen]] no? From 3c10ca6a2c8f8be93a1be6c509d538d4ed64efe2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Dec 2011 12:42:09 -0400 Subject: [PATCH 202/460] remove vcs-browser not a fan of this field, and it changed again --- debian/control | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/control b/debian/control index ee59c8515..69cef5671 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,6 @@ Uploaders: Josh Triplett Standards-Version: 3.9.2 Homepage: http://ikiwiki.info/ Vcs-Git: git://git.ikiwiki.info/ -Vcs-Browser: http://git.ikiwiki.info/?p=ikiwiki Package: ikiwiki Architecture: all From d9214e7e975efb8ebeb5dbe35e2844e9ebd35a9f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Dec 2011 13:24:59 -0400 Subject: [PATCH 203/460] remove some links to gitweb these are a pain to keep working, and not needed --- doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn | 6 +++--- doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn | 3 +-- doc/bugs/attachment:_failed_to_get_filehandle.mdwn | 4 ++-- doc/bugs/bzr-update-syntax-error.mdwn | 2 +- ..._40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn | 2 +- doc/bugs/img_vs_align.mdwn | 2 +- doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn | 2 +- .../Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn | 3 --- doc/shortcuts/discussion.mdwn | 6 +++++- doc/todo/Pagination_next_prev_links.mdwn | 3 +++ doc/todo/natural_sorting.mdwn | 2 +- doc/todo/wikitrails.mdwn | 2 ++ doc/usage.mdwn | 2 +- 13 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn diff --git a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn index fed6cd026..902e4086f 100644 --- a/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn +++ b/doc/bugs/Broken_access_to_Ikiwiki_gitweb.mdwn @@ -1,5 +1,5 @@ I can't check the last changes in Ikiwiki using -[gitweb](http://git.ikiwiki.info/?p=ikiwiki). It looks like XML +gitweb. It looks like XML validation problem with HTML entity. When I click a appropriate link on a [[git]] page, then I can only @@ -12,8 +12,8 @@ see the following error message. --[[Paweł|ptecza]] > as the diff links in RecentChanges, both seem to be working. --[[Joey]] >> Hm. It's strange. I really could see the error message like above ->> when I sent my report. It seems that ->> URL works now. So, we should be happy that it was self-fixed bug ;) +>> when I sent my report. It seems that +>> works now. So, we should be happy that it was self-fixed bug ;) >> --[[Paweł|ptecza]] >>> If it happens again, maybe take a full dump of the page? [[done]] diff --git a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn index aeeb9e21b..eb95e9992 100644 --- a/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn +++ b/doc/bugs/RecentChanges_contains_invalid_XHTML.mdwn @@ -1,4 +1,4 @@ -The final `` in [`recentchanges.tmpl`][tmpl] gets wrapped in a +The final `` in `recentchanges.tmpl` gets wrapped in a `

` tag for some reason, resulting in the following invalid XHTML at the end of the [[RecentChanges]] page @@ -17,7 +17,6 @@ plugin should be disabled on [[RecentChanges]]? See the [validator output][validate] for more details. - [tmpl]: http://git.ikiwiki.info/?p=ikiwiki;a=blob_plain;f=templates/recentchanges.tmpl;hb=HEAD [validate]: http://validator.w3.org/check?uri=http://ikiwiki.info/recentchanges/ - - - diff --git a/doc/bugs/attachment:_failed_to_get_filehandle.mdwn b/doc/bugs/attachment:_failed_to_get_filehandle.mdwn index 54f31a925..acfc60078 100644 --- a/doc/bugs/attachment:_failed_to_get_filehandle.mdwn +++ b/doc/bugs/attachment:_failed_to_get_filehandle.mdwn @@ -44,7 +44,7 @@ the error message like below: >>>>>> $CGI::VERSION='3.15'; >>>>> I've just checked in a fix that should work, can you test it? ->>>>> [diff](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=71f10579c00a8ddc20ada1a1efd33aac25a3da7e) --[[Joey]] +>>>>> 71f10579c00a8ddc20ada1a1efd33aac25a3da7e --[[Joey]] >>>>>> I've patched `attachment.pm` module, but the bug still occurs. >>>>>> However I can see a little progress. I changed invoking `error()` @@ -63,7 +63,7 @@ the error message like below: >>>>>>> though. I've checked in a second try at dealing with things, can >>>>>>> you try it? --[[Joey]] ->>>>>>>> Do you mean that [diff](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=66f35e30dcea03c631a293e2341771277543b4ae)? +>>>>>>>> Do you mean that 66f35e30dcea03c631a293e2341771277543b4ae? >>>>>>>> If so, then it causes "Internal Server Error" for me: >>>>>>>> Can't use string ("test.txt") as a symbol ref while "strict refs" in use at /usr/share/perl5/IkiWiki/Plugin/attachment.pm line 144. diff --git a/doc/bugs/bzr-update-syntax-error.mdwn b/doc/bugs/bzr-update-syntax-error.mdwn index 800e5ebb2..bf715a29e 100644 --- a/doc/bugs/bzr-update-syntax-error.mdwn +++ b/doc/bugs/bzr-update-syntax-error.mdwn @@ -1,4 +1,4 @@ -On [Line #46 of the `bzr` plugin](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Rcs/bzr.pm;h=526036bf36e0ce5ec6fab47cb8a46991d2ebe0b2;hb=HEAD#l46) there's a mistalke. Instead of: +On Line #46 of the `bzr` plugin there's a mistalke. Instead of: my @cmdline = ("bzr", $config{srcdir}, "update"); diff --git a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn index 364fae394..780e695c2 100644 --- a/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn +++ b/doc/bugs/complex_wiki-code___40__braces__41___in_wikilink-text_breaks_wikilinks.mdwn @@ -1,4 +1,4 @@ -Example (from [here](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/todo/matching_different_kinds_of_links.mdwn;h=26c5a072bf3cb205b238a4e6fd0882583a0b7609;hp=1d7c78d9065d78307b43a1f58a53300cde4015fa;hb=9b4c83127fdef0ceb682c104db9bfb321b17022e;hpb=df4cc4c16ca230ee99b80c80043ba54fb95f6e71)): +Example: 

 [[`\[[!taglink TAG\]\]`|plugins/tag]]
diff --git a/doc/bugs/img_vs_align.mdwn b/doc/bugs/img_vs_align.mdwn index c78465a37..5eb4489b0 100644 --- a/doc/bugs/img_vs_align.mdwn +++ b/doc/bugs/img_vs_align.mdwn @@ -5,7 +5,7 @@ embedded as `

`. That's at least what I see on hand, CSS is supposed to be used instead, I guess. (But how... I forgot almost of my CSS foo again ;-) it seems.) --[[tschwinge]] -> [[!img logo/ikiwiki.png align=right]]The [img tag doesn't create P tags](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=IkiWiki/Plugin/img.pm;h=32023fa97af8ba8e63192cacaff10a4677d20654;hb=HEAD), but if you have surrounded the img directive with newlines, they will result in paragraph tags. +> [[!img logo/ikiwiki.png align=right]]The img tag doesn't create P tags, but if you have surrounded the img directive with newlines, they will result in paragraph tags. > > I've edited the URL you provided to demonstrate this -- hope you don't mind! I've also added an inline, right-aligned image to this page.[[!tag done]] > -- [[Jon]] diff --git a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn index e89545955..df941af37 100644 --- a/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn +++ b/doc/bugs/pagespec_error_on_refresh_but_not_rebuild.mdwn @@ -20,7 +20,7 @@ But there is no error if I use `ikiwiki --rebuild` to regenerate the whole thing > or give any information to reproduce the bug. > > My guess: A version older than 3.20100403, which included -> [this bugfix](http://git.ikiwiki.info/?p=ikiwiki;a=commitdiff;h=799b93d258bad917262ac160df74136f05d4a451), +> 799b93d258bad917262ac160df74136f05d4a451, > which could lead to incorrect "syntax error in pagespec" > that only happened some of the time. > diff --git a/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn b/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn deleted file mode 100644 index 35940cf33..000000000 --- a/doc/forum/Let__39__s_just_rely_on_backlinks_for_this__63__.mdwn +++ /dev/null @@ -1,3 +0,0 @@ -Re [Let's just rely on backlinks for this?](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/pagespec/discussion.mdwn;h=4eed3722ccc744595fc8380e68e69dc9e1ad6450;hp=f4fdd764ed61c34c09af9df046a1a134b7d0ffe6;hb=a4ce0468f6f562ad4ec749f156528aa5b3f2fe39;hpb=23a4ee6d15dbd9b8e8c6588a829dd30a26a8de32) and [2](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/ikiwiki/wikilink/discussion.mdwn;h=0677ff7ded6a86be7d010dfd97affdb6b266832a;hp=274c8aaf1d075adbf3b76496e1945348aefe836a;hb=4f4666c4ae5cdf5e04ac42cc52a97d90e978adb0;hpb=a4ce0468f6f562ad4ec749f156528aa5b3f2fe39): - -I simply didn't notice there is an "add a new bug" form at [[bugs]], so I used the obvious way to create a page through the web-interface: to put first a wikilink pointing at the new page. --Ivan Z. diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index aac98457e..2cb7d3814 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -10,4 +10,8 @@ Do you have a suggestion on how to make that shortcut also be used to point to a Thanks. --[[PaulePanter]] -> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by [this edit by Paul Panter](http://git.ikiwiki.info/?p=ikiwiki;a=blobdiff;f=doc/shortcuts.mdwn;h=cafe3f573ef5cfd4811bee9688afa1675302aca9;hp=54dd0fdb1eadfac386b31b2dd2f014349a54184a;hb=704038db298c0f3a8039dcfe8d3a801c26fadf15;hpb=2a1077f8869ca65b49e09d99a76b595d90b28499). Personally, I think they should be separate shortcut keys. Most of my google/WP usage is such that I would prefer it over HTTP (faster, less resource usage at client side). However, I never use the shortcuts feature in ikiwiki anyway... -- [[Jon]] +> Does anyone have an opinion on the shortcuts for google/wikipedia pointing at the HTTPS services? Introduced by an edit by Paul Panter. +> Personally, I think they should be separate shortcut keys. Most of my +> google/WP usage is such that I would prefer it over HTTP (faster, less +> resource usage at client side). However, I never use the shortcuts feature +> in ikiwiki anyway... -- [[Jon]] diff --git a/doc/todo/Pagination_next_prev_links.mdwn b/doc/todo/Pagination_next_prev_links.mdwn index 951b0c222..8474c9c27 100644 --- a/doc/todo/Pagination_next_prev_links.mdwn +++ b/doc/todo/Pagination_next_prev_links.mdwn @@ -15,6 +15,9 @@ They don't want to back out of post to an index. They want an easy button to cli > [[plugins/contrib/trail]] plugin is an implementation. Code review on that > plugin would be welcome; it might even get merged one day. > +>> The trail plugin is very likely to be merged soon, and is already +>> available. So, closing this bug report [[done]] --[[Joey]] +> > Unfortunately, IkiWiki blogs use a [[ikiwiki/PageSpec]] to define the set of > "posts" in the blog (through which the next/prev trail should range), and > the current implementation of [[plugins/contrib/trail]] in terms of typed diff --git a/doc/todo/natural_sorting.mdwn b/doc/todo/natural_sorting.mdwn index 5df17e95b..3c42a4f94 100644 --- a/doc/todo/natural_sorting.mdwn +++ b/doc/todo/natural_sorting.mdwn @@ -7,7 +7,7 @@ page titles if they have numeric components. the provides an algorithm for that. there is a -[patch](http://git.ikiwiki.info/?p=ikiwiki;a=commit;h=55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed) +patch 55b83cb7bd1cd7c60bb45dc22c3745dd80a63fed attached that makes the [[plugins/inline]] plugin use Sort::Naturally if sort is set to "title_natural". diff --git a/doc/todo/wikitrails.mdwn b/doc/todo/wikitrails.mdwn index 616857966..f2f87ac82 100644 --- a/doc/todo/wikitrails.mdwn +++ b/doc/todo/wikitrails.mdwn @@ -5,6 +5,8 @@ at times it is useful to have a guided tour or trail through a subset of the pag ... is the out-of-tree [[plugins/contrib/trail]] plugin, see there for details. +> And will be the one landing in ikiwiki. So, I'm closing this bug report. [[done]] --[[Joey]] + ### chrysn's implementation i'm working on a python xmlrpc plugin for ikiwiki to support wikitrails, both as a navigation feature (have "forward" and "back" links based on a sequence) and a modified inline that includes all pages in the trail with appropriate modifications (suitable for printing if necessary). diff --git a/doc/usage.mdwn b/doc/usage.mdwn index b9516d740..44d32a01d 100644 --- a/doc/usage.mdwn +++ b/doc/usage.mdwn @@ -384,4 +384,4 @@ also be configured using a setup file. Joey Hess -Warning: this page is automatically made into ikiwiki's man page via [mdwn2man](http://git.ikiwiki.info/?p=ikiwiki;a=blob;f=mdwn2man;hb=HEAD). Edit with care +Warning: Automatically converted into a man page by mdwn2man. Edit with care From 4ff23d3712dcda0ecfd23c7c22dc6a35de1e39d8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Dec 2011 13:26:41 -0400 Subject: [PATCH 204/460] comment --- doc/shortcuts/discussion.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/shortcuts/discussion.mdwn b/doc/shortcuts/discussion.mdwn index 2cb7d3814..11903a127 100644 --- a/doc/shortcuts/discussion.mdwn +++ b/doc/shortcuts/discussion.mdwn @@ -15,3 +15,7 @@ Thanks. --[[PaulePanter]] > google/WP usage is such that I would prefer it over HTTP (faster, less > resource usage at client side). However, I never use the shortcuts feature > in ikiwiki anyway... -- [[Jon]] + +>> I have been trying to decide what to do about that Jon. https links are +>> painful for me (dialup). This really needs to be fixed at a lower level +>> in the web than ikiwiki though, and I understand the push for https. --[[Joey]] From a545009b63bdfd75cfa2c23f9cab3d9694c2e074 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Fri, 9 Dec 2011 05:21:05 -0400 Subject: [PATCH 205/460] Added a comment --- .../comment_4_e193ba447c0188f72ba589180b5d529e._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment diff --git a/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment b/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment new file mode 100644 index 000000000..450529697 --- /dev/null +++ b/doc/forum/Split_a_wiki/comment_4_e193ba447c0188f72ba589180b5d529e._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 4" + date="2011-12-09T09:21:05Z" + content=""" +I have put the question on stackoverflow: http://stackoverflow.com/questions/8443372/split-an-ikiwiki +"""]] From ed8df876a97d5a912844a36bd39ea005241e5feb Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sat, 10 Dec 2011 16:14:06 -0400 Subject: [PATCH 206/460] --- doc/tips/laptop_wiki_with_git/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/tips/laptop_wiki_with_git/discussion.mdwn b/doc/tips/laptop_wiki_with_git/discussion.mdwn index 6ce72ae7b..297a2a6a7 100644 --- a/doc/tips/laptop_wiki_with_git/discussion.mdwn +++ b/doc/tips/laptop_wiki_with_git/discussion.mdwn @@ -10,3 +10,6 @@ Or, was this last remark about rebuilding after pulling meant to apply to rebuil > Of course you don't need a web server on the laptop. It is useful for > previewing pages before publishing them though. --[[Joey]] + +I have followed this idea too, however after pushing to the server running gitk in the scrdir shows that the remotes/origin/master branch is newer than the master. Is this normal? Have I reset the master branch to remotes/origin/master then every time when someone pushed something (and run ikiwiki -setup afterwards?) +[[Micheal]] From 6d707f6bafc09908c14cb9d986fc6e9e951e642a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkq11bTnmln5O-k-utYZYK8N9TzG3T1THk" Date: Sat, 10 Dec 2011 21:24:18 -0400 Subject: [PATCH 207/460] --- doc/plugins/contrib/pandoc.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/pandoc.mdwn b/doc/plugins/contrib/pandoc.mdwn index c8e2e9a94..264aafd95 100644 --- a/doc/plugins/contrib/pandoc.mdwn +++ b/doc/plugins/contrib/pandoc.mdwn @@ -2,5 +2,5 @@ This plugin enables Markdown processing using [Pandoc](http://johnmacfarlane.net/pandoc/). You can configure it for Pandoc to take over processing of all .mkdn files, or only files with a different extension. 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. -This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . +This is an expanded and updated version of [[Jason Blevin|users/jasonblevins]]'s pandoc plugin. Get it and see further details at . From c3f86eaf97e6138626731a82c869e392a8f7f38b Mon Sep 17 00:00:00 2001 From: "https://mukund.startssl.com/" Date: Sat, 10 Dec 2011 21:29:48 -0400 Subject: [PATCH 208/460] Remove Banu (as it no longer uses Ikiwiki) --- doc/ikiwikiusers.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 977641b40..342d1494d 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -69,7 +69,6 @@ Projects & Organizations * [Serialist](http://serialist.net/)'s static pages (documentation, blog). We actually have ikiwiki generate its static content as HTML fragments using a modified page.tmpl template, and then the FastCGI powering our site grabs those fragments and embeds them in the standard dynamic site template. * [Apua IT](http://apua.se/) * [PDFpirate Community](http://community.pdfpirate.org/) -* [Banu](https://banu.com/) uses Ikiwiki for its website, to convert static Markdown pages into PHP scripts which are served along with non-Ikiwiki PHP generated contents. The static contents benefit from use of Ikiwiki's plugins. Ikiwiki is purely used as a CMS and no wiki or web-based editing is allowed. Ikiwiki is run offline, and the resulting scripts are uploaded using rsync to the website. * [Software in the Public Interest](http://spi-inc.org/) * [NXT Improved Firmware](http://nxt-firmware.ni.fr.eu.org/) * [The FreedomBox Foundation](http://www.freedomboxfoundation.org/) From a2f201309af3be29fdb6c1814012173068639ae9 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Sun, 11 Dec 2011 06:32:11 -0400 Subject: [PATCH 209/460] --- doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn new file mode 100644 index 000000000..0c328a9f1 --- /dev/null +++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar.mdwn @@ -0,0 +1 @@ +Is it possible to display the recent changes on the main site of the wiki or on a sidebar? From 2fc77c6aa552a46f2c271ae4d727a633c51ce6c3 Mon Sep 17 00:00:00 2001 From: "http://liw.fi/" Date: Sun, 11 Dec 2011 07:42:21 -0400 Subject: [PATCH 210/460] --- doc/todo/websetup_should_link_to_plugin_descriptions.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/todo/websetup_should_link_to_plugin_descriptions.mdwn diff --git a/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn b/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn new file mode 100644 index 000000000..8b15fb7d0 --- /dev/null +++ b/doc/todo/websetup_should_link_to_plugin_descriptions.mdwn @@ -0,0 +1,3 @@ +A [[wishlist]] item. + +It would be nice if the websetup plugin could link to plugin descriptions. When it refers to a plugin by name, the name could be a link to (or other suitable location). --liw From d7f7ae730aef794a71fc09b6f5083486884a36e7 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 11 Dec 2011 15:24:36 +0100 Subject: [PATCH 211/460] CREATED BY WEB --- doc/users/jak.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/users/jak.mdwn diff --git a/doc/users/jak.mdwn b/doc/users/jak.mdwn new file mode 100644 index 000000000..a6516a624 --- /dev/null +++ b/doc/users/jak.mdwn @@ -0,0 +1 @@ +Hello, I am Julian. From 2348c22a4461973bb4e37ae83d46d6b9d9c8704e Mon Sep 17 00:00:00 2001 From: jak Date: Sun, 11 Dec 2011 10:25:21 -0400 Subject: [PATCH 212/460] xxx --- doc/sandbox.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 2f173677b..52140925f 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,6 @@ # Sandbox +Test [[!pagestats pages="/tags/*"]] [[!sidebar content="dfdsfsf"" From dfc7c9d63a005849b00175bd42a0bc12828d2b77 Mon Sep 17 00:00:00 2001 From: jak Date: Sun, 11 Dec 2011 10:34:55 -0400 Subject: [PATCH 213/460] Drop test from sanbox --- doc/sandbox.mdwn | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 52140925f..2f173677b 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,6 +1,5 @@ # Sandbox -Test [[!pagestats pages="/tags/*"]] [[!sidebar content="dfdsfsf"" From 28b732e15daaf76b6e3912a10516a9c75d2ad265 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sun, 11 Dec 2011 15:38:15 +0100 Subject: [PATCH 214/460] Delete doc/users/jak.mdwn again This was an accident and not supposed to be here. --- doc/users/jak.mdwn | 1 - 1 file changed, 1 deletion(-) delete mode 100644 doc/users/jak.mdwn diff --git a/doc/users/jak.mdwn b/doc/users/jak.mdwn deleted file mode 100644 index a6516a624..000000000 --- a/doc/users/jak.mdwn +++ /dev/null @@ -1 +0,0 @@ -Hello, I am Julian. From 74deaeffc19f37e3bf24d64169abf4ec1763c9e6 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUumnAo2mLy-vFPwwaDIXsnm1kNhYBVa8" Date: Sun, 11 Dec 2011 19:08:26 -0400 Subject: [PATCH 215/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index ddf1ecd84..280eae1d2 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -14,7 +14,7 @@ with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for discussions. -All wikis are supposed to have a [[SandBox]], so this one does too. +All wikis are supposed to have a bet365, so this one does too. This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. From 0c60457be436b2b03de951f38bf048e5a5b8a019 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Sun, 11 Dec 2011 19:11:42 -0400 Subject: [PATCH 216/460] remove spam --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 280eae1d2..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -14,7 +14,7 @@ with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for discussions. -All wikis are supposed to have a bet365, so this one does too. +All wikis are supposed to have a [[sandbox]], so this one does too. This site generally runs the latest release of ikiwiki; currently, it runs ikiwiki [[!version ]]. From 03d0c64f526a687ac93a8b084ec2784045b7509c Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlUumnAo2mLy-vFPwwaDIXsnm1kNhYBVa8" Date: Mon, 12 Dec 2011 08:56:17 -0400 Subject: [PATCH 217/460] --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index 4c22ce0e0..f9f0de80d 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -11,7 +11,7 @@ There are many other [[features]], including support for [[Setup]] has a tutorial for setting up ikiwiki, or you can read the [[man_page|usage]]. There are some [[examples]] of things you can do with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins -and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for +and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for discussions. All wikis are supposed to have a [[sandbox]], so this one does too. From 299c82705884133b29c508ce65bd3df2f25128cf Mon Sep 17 00:00:00 2001 From: "http://jmtd.net/" Date: Mon, 12 Dec 2011 09:34:07 -0400 Subject: [PATCH 218/460] rm spam This reverts commit 03d0c64f526a687ac93a8b084ec2784045b7509c --- doc/index.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/index.mdwn b/doc/index.mdwn index f9f0de80d..4c22ce0e0 100644 --- a/doc/index.mdwn +++ b/doc/index.mdwn @@ -11,7 +11,7 @@ There are many other [[features]], including support for [[Setup]] has a tutorial for setting up ikiwiki, or you can read the [[man_page|usage]]. There are some [[examples]] of things you can do with ikiwiki, and some [[tips]]. Basic documentation for ikiwiki plugins -and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for +and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for discussions. All wikis are supposed to have a [[sandbox]], so this one does too. From 8c21227bb645e3cfd0ff73000bfe2183ea88d4fc Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 12 Dec 2011 19:33:58 -0400 Subject: [PATCH 219/460] --- doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn diff --git a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn new file mode 100644 index 000000000..abe0bd098 --- /dev/null +++ b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn @@ -0,0 +1,4 @@ +This is possibly/probably due to my weird setup, which is that I have apache behind nginx, with the result that apache sees the client's IPv4 address as having been mapped to IPv6. i.e. ::ffff:10.11.12.13. That being the case, I currently need to specify that (with the ::ffff: prepended) if I want to whitelist (or more importantly blacklist) and IPv4 address. + +It strikes me that this is liable to become more of a problem as people finally start using IPv6, so it might be worth ensuring that the code that compares IP addresses be able to treat the two formats (with and without the ffff's) as equivalent. + From bf127ccb24c44a0bac9f70fd644dbe2a7376e32c Mon Sep 17 00:00:00 2001 From: "http://hands.com/~phil/" Date: Mon, 12 Dec 2011 19:38:24 -0400 Subject: [PATCH 220/460] --- doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn index abe0bd098..f3a39c02b 100644 --- a/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn +++ b/doc/bugs/blogspam__95__options_whitelist_vs._IPv6__63__.mdwn @@ -1,4 +1,4 @@ This is possibly/probably due to my weird setup, which is that I have apache behind nginx, with the result that apache sees the client's IPv4 address as having been mapped to IPv6. i.e. ::ffff:10.11.12.13. That being the case, I currently need to specify that (with the ::ffff: prepended) if I want to whitelist (or more importantly blacklist) and IPv4 address. -It strikes me that this is liable to become more of a problem as people finally start using IPv6, so it might be worth ensuring that the code that compares IP addresses be able to treat the two formats (with and without the ffff's) as equivalent. +It strikes me that this is liable to become more of a problem as people finally start using IPv6, so it might be worth ensuring that the code that compares IP addresses be able to treat the two formats (with and without the ffff's) as equivalent. --[[fil]] From cdce61c48317980cd2c3a08b93512156caaca289 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 15 Dec 2011 11:24:32 -0400 Subject: [PATCH 221/460] --- doc/todo/themes_should_ship_with_templates.mdwn | 1 + 1 file changed, 1 insertion(+) create mode 100644 doc/todo/themes_should_ship_with_templates.mdwn diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn new file mode 100644 index 000000000..912a99ed8 --- /dev/null +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -0,0 +1 @@ +if i understand [[todo/multiple_template_directories]] correctly, i read it as templates directories being separate from themes. shouldn't a themer be able to ship more than just a CSS and instead override the (say) page.tmpl page? -- [[anarcat]] From e4bd49818bd8936c56ace4a710c76a17c4fc4447 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 15 Dec 2011 14:07:17 -0400 Subject: [PATCH 222/460] response --- doc/todo/themes_should_ship_with_templates.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn index 912a99ed8..4f47262af 100644 --- a/doc/todo/themes_should_ship_with_templates.mdwn +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -1 +1,7 @@ if i understand [[todo/multiple_template_directories]] correctly, i read it as templates directories being separate from themes. shouldn't a themer be able to ship more than just a CSS and instead override the (say) page.tmpl page? -- [[anarcat]] + +> A theme can ship any files it wants to, including templates (in the +> template/ directory). +> +> So far none of them do; I'd much rather have one version of page.tmpl to +> maintain than one per theme.. --[[Joey]] From 0a2b8d3ea3e07144925f15607b2c76c24dc9a6ee Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 9 Dec 2011 10:15:35 -0500 Subject: [PATCH 223/460] Move wtk's blog from physics.drexel.edu to tremily.us. --- doc/todo/configurable_tidy_command_for_htmltidy.mdwn | 2 +- doc/todo/inline_raw_files.mdwn | 2 +- doc/todo/mdwn_itex.mdwn | 2 +- doc/todo/org_mode.mdwn | 2 +- doc/users/wtk.mdwn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn index e317184b5..2a7ebce0a 100644 --- a/doc/todo/configurable_tidy_command_for_htmltidy.mdwn +++ b/doc/todo/configurable_tidy_command_for_htmltidy.mdwn @@ -3,6 +3,6 @@ I was trying to get htmltidy to [play nicely with MathML][play]. Unfortunately, I couldn't construct a command line that I was happy with, but along the way I altered htmltidy to allow a configurable command line. This seemed like a generally useful thing, so I've published my [patch][] as a Git branch. [play]: http://lists.w3.org/Archives/Public/html-tidy/2006JanMar/0052.html -[patch]: http://www.physics.drexel.edu/~wking/code/git/git.php?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 +[patch]: http://git.tremily.us/?p=ikiwiki.git&a=commitdiff&h=408ee89fd7c1dc70510385a7cf263a05862dda97&hb=e65ce4f0937eaf622846c02a9d39fa7aebe4af12 > Thanks, [[done]] --[[Joey]] diff --git a/doc/todo/inline_raw_files.mdwn b/doc/todo/inline_raw_files.mdwn index 8228186f9..52a4be726 100644 --- a/doc/todo/inline_raw_files.mdwn +++ b/doc/todo/inline_raw_files.mdwn @@ -9,7 +9,7 @@ Also raise an error in `IkiWiki::pagetype($file)` if `$file` is blank, which avo I'm using the new code in my [blog][]. -[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/yacc2dot/ +[blog]: http://blog.tremily.us/posts/yacc2dot/ usage ===== diff --git a/doc/todo/mdwn_itex.mdwn b/doc/todo/mdwn_itex.mdwn index 3e304fa76..ae9a8f37a 100644 --- a/doc/todo/mdwn_itex.mdwn +++ b/doc/todo/mdwn_itex.mdwn @@ -19,4 +19,4 @@ MathML. [itex]: http://golem.ph.utexas.edu/~distler/blog/itex2MMLcommands.html [itex2MML]: http://golem.ph.utexas.edu/~distler/blog/itex2MML.html -[example]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/mdwn_itex/ +[example]: http://blog.tremily.us/posts/mdwn_itex/ diff --git a/doc/todo/org_mode.mdwn b/doc/todo/org_mode.mdwn index 3e9d95376..bd24eda5e 100644 --- a/doc/todo/org_mode.mdwn +++ b/doc/todo/org_mode.mdwn @@ -20,5 +20,5 @@ inserted HTML depending on which plugins will be used during the [org-mode]: http://orgmode.org/ [MS]: http://www.golden-gryphon.com/blog/manoj/blog/2008/06/08/Using_org-mode_with_Ikiwiki/ -[example]: http://www.physics.drexel.edu/~wking/unfolding-disasters/posts/Git/notes/ +[example]: http://blog.tremily.us/posts/Git/notes/ [raw]: http://orgmode.org/manual/Quoting-HTML-tags.html diff --git a/doc/users/wtk.mdwn b/doc/users/wtk.mdwn index a34473577..d00911a76 100644 --- a/doc/users/wtk.mdwn +++ b/doc/users/wtk.mdwn @@ -3,4 +3,4 @@ * Git branch: `wtk`. * [Ikiwiki-based blog][blog] -[blog]: http://www.physics.drexel.edu/~wking/unfolding-disasters/ +[blog]: http://blog.tremily.us/ From f588010ef2c340d860777b0e7863c4e8ac842032 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Thu, 15 Dec 2011 22:47:09 -0400 Subject: [PATCH 224/460] thanks and next challenge: doc --- doc/todo/themes_should_ship_with_templates.mdwn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn index 4f47262af..0c3f1f1d7 100644 --- a/doc/todo/themes_should_ship_with_templates.mdwn +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -1,7 +1,15 @@ if i understand [[todo/multiple_template_directories]] correctly, i read it as templates directories being separate from themes. shouldn't a themer be able to ship more than just a CSS and instead override the (say) page.tmpl page? -- [[anarcat]] > A theme can ship any files it wants to, including templates (in the -> template/ directory). +> templates/ directory). > > So far none of them do; I'd much rather have one version of page.tmpl to > maintain than one per theme.. --[[Joey]] + +> > that, dear author, is amazingly simple, intuitive and useful. why didn't i try this before! :) thank you very much! +> > +> > i do agree that having a completely different template file is tricky, but I think it's important for themes to be able to modify those files, otherwise making themes is *really* hard. besides the burden of maintenance falls on the theme maintainer, and as long as it's not in ikiwiki core, you have nothing to worry about... right? ;) +> > +> > i have just ported the [night_city theme](http://www.openwebdesign.org/viewdesign.phtml?id=3318) to ikiwiki, and it was a nightmare when i wasn't modifying the page.tmpl... but now it's done! i'll try to publish my changes somewhere when i finish figuring out how to share small things like that easily. ;) (suggestions?) +> > +> > i guess the only thing to be done here is to update the documentation so that this is clearer - where do you suggest I do that? --[[anarcat]] From cce59e456d7b05103a61191a9acff652ff3fc4ff Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 00:56:42 -0400 Subject: [PATCH 225/460] --- doc/todo/submodule_support.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/todo/submodule_support.mdwn diff --git a/doc/todo/submodule_support.mdwn b/doc/todo/submodule_support.mdwn new file mode 100644 index 000000000..c495c0ce1 --- /dev/null +++ b/doc/todo/submodule_support.mdwn @@ -0,0 +1,6 @@ +I would love to be able to publish my theme in my personnal wiki. The theme is in a separate git repository, and i feel it would be pretty awesome if it was rendered within my main ikiwiki site. I have tried the following: + + git submodule add /usr/share/ikiwiki/themes/night_city/ + git commit -m"add the theme to my site" ; git push + +But this made really weird things on the other side. The files from the theme end up flat in the parent directory. Now I have reverted the above change and ikiwiki *still* generates those files. Not sure what is going on. Other people had experience with this? Or other suggestions on how to publish repositories within my site? -- [[anarcat]] From 486cb66d9980ca5005786d2575e1cf09e8c60876 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 00:57:24 -0400 Subject: [PATCH 226/460] link to submodule support question --- doc/todo/themes_should_ship_with_templates.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn index 0c3f1f1d7..e2c03bddf 100644 --- a/doc/todo/themes_should_ship_with_templates.mdwn +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -10,6 +10,6 @@ if i understand [[todo/multiple_template_directories]] correctly, i read it as t > > > > i do agree that having a completely different template file is tricky, but I think it's important for themes to be able to modify those files, otherwise making themes is *really* hard. besides the burden of maintenance falls on the theme maintainer, and as long as it's not in ikiwiki core, you have nothing to worry about... right? ;) > > -> > i have just ported the [night_city theme](http://www.openwebdesign.org/viewdesign.phtml?id=3318) to ikiwiki, and it was a nightmare when i wasn't modifying the page.tmpl... but now it's done! i'll try to publish my changes somewhere when i finish figuring out how to share small things like that easily. ;) (suggestions?) +> > i have just ported the [night_city theme](http://www.openwebdesign.org/viewdesign.phtml?id=3318) to ikiwiki, and it was a nightmare when i wasn't modifying the page.tmpl... but now it's done! i'll try to publish my changes somewhere when i finish figuring out how to share small things like that easily. ;) ([[suggestions|submodule_support]]?) > > > > i guess the only thing to be done here is to update the documentation so that this is clearer - where do you suggest I do that? --[[anarcat]] From 04c74a45983ad2368eaa1f8ab0afb2a16108ac19 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 00:59:02 -0400 Subject: [PATCH 227/460] --- doc/todo/submodule_support.mdwn | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/todo/submodule_support.mdwn b/doc/todo/submodule_support.mdwn index c495c0ce1..c10e3ff02 100644 --- a/doc/todo/submodule_support.mdwn +++ b/doc/todo/submodule_support.mdwn @@ -3,4 +3,8 @@ I would love to be able to publish my theme in my personnal wiki. The theme is i git submodule add /usr/share/ikiwiki/themes/night_city/ git commit -m"add the theme to my site" ; git push -But this made really weird things on the other side. The files from the theme end up flat in the parent directory. Now I have reverted the above change and ikiwiki *still* generates those files. Not sure what is going on. Other people had experience with this? Or other suggestions on how to publish repositories within my site? -- [[anarcat]] +But this made really weird things on the other side. The files from the theme end up flat in the parent directory. Now I have reverted the above change and ikiwiki *still* generates those files. Not sure what is going on. + +To be really clear here: this is an arbitrary source code repository that I want to include, I do not mean to enable the theme with this, this could very well be presentation material, C source code or whatever else... In fact, I think this would be a powerful way to do syntax highlightning for source code published on your website... + +Other people had experience with this? Or other suggestions on how to publish repositories within my site? -- [[anarcat]] From 4f0fd6dbe14ab3d439ba7a09b4abb157db9ec953 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 02:37:03 -0400 Subject: [PATCH 228/460] link to the themes page --- doc/examples.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/examples.mdwn b/doc/examples.mdwn index e24973b69..19631ad47 100644 --- a/doc/examples.mdwn +++ b/doc/examples.mdwn @@ -9,4 +9,4 @@ Each example is contained in its own subdirectory; just copy the source files into your wiki to start using one of the examples. The [[tips]] page has some other ideas for ways to use ikiwiki, and the -[[css_market]] has some example stylesheets to change ikiwiki's look. +[[css_market]] and [[theme market|themes]] has some example stylesheets to change ikiwiki's look. From 7ef8f1700b86b8127db401b1a6dbd1f78283894d Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 02:38:09 -0400 Subject: [PATCH 229/460] propose a theme market --- doc/themes/discussion.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/themes/discussion.mdwn b/doc/themes/discussion.mdwn index 87333b535..f2fc8cadf 100644 --- a/doc/themes/discussion.mdwn +++ b/doc/themes/discussion.mdwn @@ -4,3 +4,4 @@ I would like to contribute a theme I created and posted on github: For an example of the theme in action, see: [[https://antportal.com/wiki/]] +> Shouldn't we just make people post their themes in the [[themes]] page? Or maybe we should make a [[theme market]]? --[[anarcat]] From c43f5308ff5b27fd9174f880f50fa2eb5ff7d150 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 02:40:00 -0400 Subject: [PATCH 230/460] some hints for people building themes --- doc/plugins/theme.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index ebbb0be8e..58ac9c593 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -9,3 +9,12 @@ of the themes included in ikiwiki. You can set the theme via the **theme** option in your config file (after enabling the plugin). Refresh the wiki after changing it to see the changes. + +Hints for theme builders +------------------------ + + * Start from an existing [[CSS file|css]], see also the [[css market]] for examples + * You can override the [[templates]] files by dropping them in a `templates` subdirectory + * Try to stick with modifying the CSS however, maintaining custom templates is harder + * If you *do* override a template, note that you will need to rebuild the wiki for it to be applied... + * ...it may therefore be preferable to load the template directly in your browser to develop it From 073f5b4e793fcbb81968e89427001720316a83c7 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 16 Dec 2011 02:41:43 -0400 Subject: [PATCH 231/460] done! --- doc/todo/themes_should_ship_with_templates.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn index e2c03bddf..8399624e1 100644 --- a/doc/todo/themes_should_ship_with_templates.mdwn +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -13,3 +13,5 @@ if i understand [[todo/multiple_template_directories]] correctly, i read it as t > > i have just ported the [night_city theme](http://www.openwebdesign.org/viewdesign.phtml?id=3318) to ikiwiki, and it was a nightmare when i wasn't modifying the page.tmpl... but now it's done! i'll try to publish my changes somewhere when i finish figuring out how to share small things like that easily. ;) ([[suggestions|submodule_support]]?) > > > > i guess the only thing to be done here is to update the documentation so that this is clearer - where do you suggest I do that? --[[anarcat]] +> > +> > > i have updated the [[plugins/theme]] documentation, hopefully that was the right place. so i think this is [[done]] --[[anarcat]] From efe26dd1d3cdda465420eabab919945c72f7213a Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" Date: Fri, 16 Dec 2011 04:10:04 -0400 Subject: [PATCH 232/460] --- .../Xapian_search:_empty_postlist_table.mdwn | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 doc/forum/Xapian_search:_empty_postlist_table.mdwn diff --git a/doc/forum/Xapian_search:_empty_postlist_table.mdwn b/doc/forum/Xapian_search:_empty_postlist_table.mdwn new file mode 100644 index 000000000..704f017ca --- /dev/null +++ b/doc/forum/Xapian_search:_empty_postlist_table.mdwn @@ -0,0 +1,34 @@ +Hi, + +I'm trying to set up a personal wiki and I'm having trouble getting +search to work. All my searches give zero results. I eventually +figured out that the Xapian database that's being created has an empty +postlist table. The position and termlist tables are all fine, and +when I add new content to the wiki I can see the database is updated +and the search terms are in the position table in plaintext. But I +can't query for them, even using Xapian's command line tools. + +
+mexon:~/Test/.ikiwiki/xapian/default$ ls -l
+total 76
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:56 flintlock
+-rw-rw-r-- 1 mexon mexon    28 Dec 16 15:55 iamchert
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 position.baseA
+-rw-rw-r-- 1 mexon mexon 49152 Dec 16 15:55 position.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 postlist.baseA
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:55 postlist.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 record.baseA
+-rw-rw-r-- 1 mexon mexon     0 Dec 16 15:55 record.DB
+-rw-rw-r-- 1 mexon mexon    13 Dec 16 15:55 termlist.baseA
+-rw-rw-r-- 1 mexon mexon 16384 Dec 16 15:55 termlist.DB
+mexon:~/Test/.ikiwiki/xapian/default$ delve -a .
+All terms in database:
+mexon:~/Test/.ikiwiki/xapian/default$ 
+
+ +I don't know how to debug from here. Clearly ikiwiki is doing +something right when it's building the database, but one of the tables +is missing. Can anyone guess what's wrong, or tell me where to start +troubleshooting? + +I'm using Centos 5. Xapian is version 1.2.5. Ikiwiki version 3.20111107. From 4ad4752747ad5105d8f2fc57cca49926da71eb1c Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" Date: Fri, 16 Dec 2011 09:00:52 -0400 Subject: [PATCH 233/460] Added a comment --- ...ment_8_de197c62e0b800dbfe5c2812a5b3f108._comment | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment diff --git a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment new file mode 100644 index 000000000..de57a85fd --- /dev/null +++ b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" + nickname="shobo" + subject="comment 8" + date="2011-12-16T13:00:51Z" + content=""" +URLs containing /ikiwiki.cgi/ are dynamically-generated pages; everything else is static. + +How is this possible? Where can I find more about this? + +Shobo, Junior Software Developer at bet365 + +"""]] From 65d3212cf76fc3dd887fedaf9f90885f5989b270 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" Date: Fri, 16 Dec 2011 09:18:02 -0400 Subject: [PATCH 234/460] removed --- ...ment_8_de197c62e0b800dbfe5c2812a5b3f108._comment | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment diff --git a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment deleted file mode 100644 index de57a85fd..000000000 --- a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_de197c62e0b800dbfe5c2812a5b3f108._comment +++ /dev/null @@ -1,13 +0,0 @@ -[[!comment format=mdwn - username="https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" - nickname="shobo" - subject="comment 8" - date="2011-12-16T13:00:51Z" - content=""" -URLs containing /ikiwiki.cgi/ are dynamically-generated pages; everything else is static. - -How is this possible? Where can I find more about this? - -Shobo, Junior Software Developer at bet365 - -"""]] From 71495f31b29b94090eba4e76a1160c02299e78b6 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" Date: Fri, 16 Dec 2011 09:21:57 -0400 Subject: [PATCH 235/460] Added a comment --- ...mment_8_054ff10998857bbb69d15ff17e6e9756._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment diff --git a/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment new file mode 100644 index 000000000..ee0c46fbd --- /dev/null +++ b/doc/forum/TMPL__95__VAR_IS__95__ADMIN/comment_8_054ff10998857bbb69d15ff17e6e9756._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/dh6LXMw6hZydhHOqgWKiORWXspNyeW9n1nk-#9ce8d" + nickname="shobo" + subject="comment 8" + date="2011-12-16T13:21:57Z" + content=""" +URLs containing /ikiwiki.cgi/ are dynamically-generated pages; everything else is static. + +How is this possible? Where can I find more about this? + +Shobo, Junior Software Developer +"""]] From 65de762da95071f1b85af5ca465bdbcbc2b3e991 Mon Sep 17 00:00:00 2001 From: "http://cgray.myopenid.com/" Date: Fri, 16 Dec 2011 14:41:45 -0400 Subject: [PATCH 236/460] Mention my new plugin --- doc/todo/org_mode.mdwn | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc/todo/org_mode.mdwn b/doc/todo/org_mode.mdwn index bd24eda5e..ef7f4dbaf 100644 --- a/doc/todo/org_mode.mdwn +++ b/doc/todo/org_mode.mdwn @@ -18,7 +18,18 @@ but Ikiwiki currently (as far as I know) lacks a method to escape inserted HTML depending on which plugins will be used during the [[htmlize phase|plugins/write#index11h3]]. +new plugin +========== + +A complete rewrite of the plugin can be found +[here][chrismgray-rewrite]. It is an [[external|plugins/write/external]] plugin using a +dedicated emacs instance to parse the org-mode files. Thus, it should +be a bit faster than the older plugin, as well as properly handling +[[wikilinks|ikiwiki/wikilink]] and images, two features not present in the older +plugin. + [org-mode]: http://orgmode.org/ [MS]: http://www.golden-gryphon.com/blog/manoj/blog/2008/06/08/Using_org-mode_with_Ikiwiki/ [example]: http://blog.tremily.us/posts/Git/notes/ [raw]: http://orgmode.org/manual/Quoting-HTML-tags.html +[chrismgray-rewrite]: https://github.com/chrismgray/ikiwiki-org-plugin From 2198b5d4e5864df4719f1f6da7afcafcfdd5dc18 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Fri, 16 Dec 2011 14:51:16 -0400 Subject: [PATCH 237/460] Added a comment --- .../comment_1_de9a7c94beec2707eda0924ca58be9df._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment diff --git a/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment b/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment new file mode 100644 index 000000000..23e539f06 --- /dev/null +++ b/doc/forum/Xapian_search:_empty_postlist_table/comment_1_de9a7c94beec2707eda0924ca58be9df._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-16T18:51:16Z" + content=""" +Perhaps you should try a current verison of xapian, 1.2.7 works here. You don't say what version of the xapian perl module you have; 1.2.7.0 is working here. The \"postlist\" is an internal part of xapian AFAICS, not something that has to be explicitly set up, and it gets populated here. +"""]] From 5db9caa9d0110a2a4d8ffbdcc14e39c087fd027d Mon Sep 17 00:00:00 2001 From: "http://lkcl.net/" Date: Fri, 16 Dec 2011 17:42:10 -0400 Subject: [PATCH 238/460] --- ...lm__44___obviously_that_fails_when_domain_is_different.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn diff --git a/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn b/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn new file mode 100644 index 000000000..3388675fc --- /dev/null +++ b/doc/bugs/branchable_openid_site_uses_fixed-site_openid_realm__44___obviously_that_fails_when_domain_is_different.mdwn @@ -0,0 +1,3 @@ +phil hands is kindly hosting rhombus-tech.net on an h-branchable ikiwiki. openid has been enabled, for convenience. unfortunately... :/etc/ikiwiki-hosting/ikiwiki-hosting.conf has an openid realm of "http://*.hands.com" which is kinda important (i assume) for security reasons. however this conflicts with what openid requires. openid logins are now specifying the realm of http://*.hands.com which of course doesn't match with http://rhombus-tech.net - it all goes pear-shaped from there. + +any ideas? thanks folks. From df264b2d34d1dd2d8c6b2e50da205788083b7f78 Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" Date: Sat, 17 Dec 2011 05:10:38 -0400 Subject: [PATCH 239/460] Added a comment --- ...nt_2_55f191e4b1306a318a30319f01802229._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment diff --git a/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment b/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment new file mode 100644 index 000000000..41cdf3d4a --- /dev/null +++ b/doc/forum/Xapian_search:_empty_postlist_table/comment_2_55f191e4b1306a318a30319f01802229._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" + nickname="Matthew" + subject="comment 2" + date="2011-12-17T09:10:38Z" + content=""" +I'm using RPMs to install Xapian packages, xapian-omega and xapian-bindings-perl, and they're all 1.2.5. I originally tried building and installing Xapian 1.2.7 from source, but found that ikiwiki failed like this: + +
+Use of inherited AUTOLOAD for non-method Search::Xapian::DB_CREATE_OR_OPEN() is deprecated at /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/search.pm line 220.
+Can't locate auto/Search/Xapian/DB_CREATE_O.al in @INC (@INC contains: /home/mat/.ikiwiki /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/i386-linux-thread-multi /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8 /home/mexon/system/perl5lib /usr/lib/perl5/site_perl/5.8.8/i386-linux-thread-multi /usr/lib/perl5/site_perl/5.8.8 /usr/lib/perl5/site_perl /usr/lib/perl5/vendor_perl/5.8.8/i386-linux-thread-multi /usr/lib/perl5/vendor_perl/5.8.8 /usr/lib/perl5/vendor_perl /usr/lib/perl5/5.8.8/i386-linux-thread-multi /usr/lib/perl5/5.8.8 .) at /home/mexon/system/Linux//lib/perl5/site_perl/5.8.8/IkiWiki/Plugin/search.pm line 220
+
+ +Much fruitless googling later I found that there were these 1.2.5 RPMs lying around so I switched to those. If you know a solution to the DB_CREATE_O problem I could give 1.2.7 another go. +"""]] From 74f928d51fac543594ba863fb3a7d90a5a5787ab Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawleAEFV6kDlYbyCJLPHAOAsHGriOoQMYRo" Date: Mon, 19 Dec 2011 02:16:34 -0400 Subject: [PATCH 240/460] --- doc/todo/themes_should_ship_with_templates.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/themes_should_ship_with_templates.mdwn b/doc/todo/themes_should_ship_with_templates.mdwn index 8399624e1..875e5ce89 100644 --- a/doc/todo/themes_should_ship_with_templates.mdwn +++ b/doc/todo/themes_should_ship_with_templates.mdwn @@ -15,3 +15,5 @@ if i understand [[todo/multiple_template_directories]] correctly, i read it as t > > i guess the only thing to be done here is to update the documentation so that this is clearer - where do you suggest I do that? --[[anarcat]] > > > > > i have updated the [[plugins/theme]] documentation, hopefully that was the right place. so i think this is [[done]] --[[anarcat]] + +>>>> I would love it it you would share your theme! Thanks, Adam. :-) From 5a7fc575e553ba0c1c2071a8c5e7546ec950ad6f Mon Sep 17 00:00:00 2001 From: "https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" Date: Mon, 19 Dec 2011 02:18:56 -0400 Subject: [PATCH 241/460] Added a comment --- ..._0bd424a89c3a52ff393a1e7e00c806be._comment | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment diff --git a/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment b/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment new file mode 100644 index 000000000..05f9c874e --- /dev/null +++ b/doc/forum/Xapian_search:_empty_postlist_table/comment_3_0bd424a89c3a52ff393a1e7e00c806be._comment @@ -0,0 +1,24 @@ +[[!comment format=mdwn + username="https://me.yahoo.com/a/2d7oNP9wlop3PaHlGlGS1J2ppVqXf4zQAw--#17b9b" + nickname="Matthew" + subject="comment 3" + date="2011-12-19T06:18:56Z" + content=""" +I had another go, this time with Xapian 1.2.8.0, and I finally got it working. The errors I was seeing earlier were because Xapian installs itself in /usr/local, but the default CentOS environment doesn't have /usr/local/lib in the LD_LIBRARY_PATH. As usual, the problem and solution are very duh, it's the error messages that make everything hard. It's a lot more clear if you do a \"make test\" while building Search::Xapian: + +
+mexon:~/ikiwiki-temp/Search-Xapian-1.2.8.0$ make test
+PERL_DL_NONLAZY=1 /usr/bin/perl \"-MExtUtils::Command::MM\" \"-e\" \"test_harness(0, 'blib/lib', 'blib/arch')\" t/*.t
+t/01use...............
+#   Failed test 'use Search::Xapian;'
+#   in t/01use.t at line 3.
+#     Tried to use 'Search::Xapian'.
+#     Error:  Can't load '/home/mexon/ikiwiki-temp/Search-Xapian-1.2.8.0/blib/arch/auto/Search/Xapian/Xapian.so' for module Search::Xapian: libxapian.so.22: cannot open shared object file: No such file or directory at /usr/lib/perl5/5.8.8/i386-linux-thread-multi/DynaLoader.pm line 230.
+#  at (eval 3) line 2
+# Compilation failed in require at (eval 3) line 2.
+# BEGIN failed--compilation aborted at t/01use.t line 3.
+# Looks like you failed 1 test of 3.
+
+ +So yeah. Worth noting that Xapian 1.2.5 is apparently broken with ikiwiki. Maybe some kind of warning? +"""]] From da5b4fc5bb07dbd0aa16b16188e1ebd6fbc22465 Mon Sep 17 00:00:00 2001 From: jean_magnan Date: Mon, 19 Dec 2011 06:21:00 -0400 Subject: [PATCH 242/460] Added a comment --- ...omment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment new file mode 100644 index 000000000..1bc0cc509 --- /dev/null +++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_1_018b977ff7ee59fc53838e0c20c3a9a7._comment @@ -0,0 +1,11 @@ +[[!comment format=mdwn + username="jean_magnan" + ip="81.56.145.104" + subject="comment 1" + date="2011-12-19T10:20:59Z" + content=""" +Hi, +I have this line in the sidebar file, it says to show the titles and dates of the last 5 pages: + +[[!inline pages=\"*\" archive=\"yes\" show=\"5\"]] +"""]] From 5afb2cea85731776365c6e0054aecf145c8a0acf Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 00:55:00 -0400 Subject: [PATCH 243/460] --- .../How_to_configure_po_plugin__63__.mdwn | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 doc/forum/How_to_configure_po_plugin__63__.mdwn diff --git a/doc/forum/How_to_configure_po_plugin__63__.mdwn b/doc/forum/How_to_configure_po_plugin__63__.mdwn new file mode 100644 index 000000000..a03358ddd --- /dev/null +++ b/doc/forum/How_to_configure_po_plugin__63__.mdwn @@ -0,0 +1,21 @@ +I put + + # po plugin + po_master_language => 'en|English', + + po_slave_languages => [ 'zh|Chinese'] + + +in page.setup. And did + + $ikiwiki --setup ./page.setup + +but get errors: + + Can't use string ("en|English") as a HASH ref while "strict refs" in use at /usr/share/perl5/IkiWiki/Plugin/po.pm line 162. + +Line 162 of the file reads + + delete $config{po_slave_languages}{$config{po_master_language}{code}};; + +What's wrong? How to fix it? From b7099a29ba7d3e9a5f0a3b68fa6f921a22507580 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 02:50:49 -0400 Subject: [PATCH 244/460] --- doc/forum/Broken_after_upgrading_Ikiwiki.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Broken_after_upgrading_Ikiwiki.mdwn diff --git a/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn b/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn new file mode 100644 index 000000000..aea5fdbd9 --- /dev/null +++ b/doc/forum/Broken_after_upgrading_Ikiwiki.mdwn @@ -0,0 +1,10 @@ +I upgraded my Debian server from 5 to 6, then I updated ikiwiki. Now I can't rebuild my Ikiwiki instance: + + $ ikiwiki --setup ./pages.setup + Failed to load plugin IkiWiki::Plugin::scrubber: Can't locate IkiWiki/Plugin/scrubber.pm in @INC (@INC contains: /home/xyzfoobar/devel/ikiwiki/lib /etc/perl /usr/local/lib/perl/5.10.1 /usr/local/share/perl/5.10.1 /usr/lib/perl5 /usr/share/perl5 /usr/lib/perl/5.10 /usr/share/perl/5.10 /usr/local/lib/site_perl .) at (eval 77) line 2. + BEGIN failed--compilation aborted at (eval 77) line 2. + + $ ikiwiki --version + ikiwiki version 3.20100815.7 + +What's the proper way to fix this? From e53daf9fcf6cc6a4fc0f48afcfc73474ccc0558a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 03:21:19 -0400 Subject: [PATCH 245/460] Added a comment --- ...ent_1_3d0588a845c58b3aedc35970e8dcc811._comment | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment diff --git a/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment new file mode 100644 index 000000000..93360d167 --- /dev/null +++ b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_1_3d0588a845c58b3aedc35970e8dcc811._comment @@ -0,0 +1,14 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 1" + date="2011-12-20T07:21:19Z" + content=""" +If I try to create new setup file + + $ ikiwiki --dumpsetup newpages.setup + Traceback (most recent call last): + File \"/usr/lib/ikiwiki/plugins/rst\", line 18, in + from docutils.core import publish_parts; + ImportError: No module named docutils.core +"""]] From 4e1d1e33e6e0a97301a643aa0efb5f36b70b629c Mon Sep 17 00:00:00 2001 From: intrigeri Date: Tue, 20 Dec 2011 05:34:56 -0400 Subject: [PATCH 246/460] Added a comment: Please upgrade --- .../comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment diff --git a/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment b/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment new file mode 100644 index 000000000..fc194b3e6 --- /dev/null +++ b/doc/forum/How_to_configure_po_plugin__63__/comment_1_5e0cc4cdfd126f2f4af64104f02102d6._comment @@ -0,0 +1,9 @@ +[[!comment format=mdwn + username="intrigeri" + ip="88.80.28.70" + subject="Please upgrade" + date="2011-12-20T09:34:56Z" + content=""" +You seem to be using an older version of ikiwiki. Either use a hash ref (see [old documentation](http://source.ikiwiki.branchable.com/?p=source.git;a=blobdiff;f=doc/plugins/po.mdwn;h=c36414c8e85f5bb11e2c3a7c3bd41e829abe15a6;hp=53327c1dae94ef5896119cc874133a9a3c1a9b4e;hb=862fc7c1ab1f7d709561bcb02fc8ede57b90a51b;hpb=e50df5ea7601b6a1fc03994650ddff728aba7b57)) or upgrade. + +"""]] From 7f7f8acb620ee0005f9d3022f75138896ce69dae Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 10:41:51 -0400 Subject: [PATCH 247/460] Added a comment --- ...nt_2_fdce65903b953ddd6c7c2d30bf516010._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment diff --git a/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment b/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment new file mode 100644 index 000000000..7d673742a --- /dev/null +++ b/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 2" + date="2011-12-20T14:41:50Z" + content=""" +My Ikiwiki is + + $ ikiwiki --version + ikiwiki version 3.20100815.7 + +Is it not updated enough? + +Or did you mean my Ikiwiki instance? +"""]] From d1326404142a77ce98420fdf81171e6c80376bb1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 10:42:41 -0400 Subject: [PATCH 248/460] removed --- ...nt_2_fdce65903b953ddd6c7c2d30bf516010._comment | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment diff --git a/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment b/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment deleted file mode 100644 index 7d673742a..000000000 --- a/doc/forum/How_to_configure_po_plugin__63__/comment_2_fdce65903b953ddd6c7c2d30bf516010._comment +++ /dev/null @@ -1,15 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" - nickname="Meng" - subject="comment 2" - date="2011-12-20T14:41:50Z" - content=""" -My Ikiwiki is - - $ ikiwiki --version - ikiwiki version 3.20100815.7 - -Is it not updated enough? - -Or did you mean my Ikiwiki instance? -"""]] From bd2d9c9f95a6e339bb9346c20cd1bb0c13adea4f Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Tue, 20 Dec 2011 11:13:48 -0400 Subject: [PATCH 249/460] Added a comment --- .../comment_2_927c11f18315baa39f08ca4982ed2ab1._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment diff --git a/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment new file mode 100644 index 000000000..2b6237bc4 --- /dev/null +++ b/doc/forum/Recent_changes_on_main_site_or_on_a_sidebar/comment_2_927c11f18315baa39f08ca4982ed2ab1._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-20T15:13:48Z" + content=""" +The [[RecentChanges]] page is a regular wiki page that inlines a few special pages with a special template. That content can be copied anywhere else in the wiki to get the same effect. +"""]] From d84e6684578f41beebd01319e1866ffb5f61e991 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Tue, 20 Dec 2011 11:16:23 -0400 Subject: [PATCH 250/460] Added a comment --- ...comment_2_fd65d4b87a735b67543bb0cf4053b652._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment diff --git a/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment new file mode 100644 index 000000000..47fa4ae7b --- /dev/null +++ b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_2_fd65d4b87a735b67543bb0cf4053b652._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-20T15:16:23Z" + content=""" +Your setup file seems to refer to a \"scrubber\" plugin, which has never existed in ikiwiki. Perhaps a typo of \"htmlscrubber\"? + +3.20100815.7 is an old version of ikiwiki. The current version avoids the rst docutils breakage. Installing python-docutils on Debian can work around that problem as well. +"""]] From 4483b2017b1975d9d8f6a4cbbac6e6563cfff9d4 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 12:58:24 -0400 Subject: [PATCH 251/460] Added a comment --- .../comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment diff --git a/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment new file mode 100644 index 000000000..72d38e76c --- /dev/null +++ b/doc/forum/Broken_after_upgrading_Ikiwiki/comment_3_7c8b46eabdb25cbc01c56c7b53ed3b91._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 3" + date="2011-12-20T16:58:23Z" + content=""" +Thanks. That was exactly the issue. When editing my setup file, I accidentally splitted `htmlscrubber` to `html` and `scrubber`. +"""]] From ce7e052eab243b7a29f8ff4b8185d20f23948ea2 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 17:41:52 -0400 Subject: [PATCH 252/460] Added a comment: Error message gone; but how to start using po? --- ...t_2_47f740c023a52d35b9bd685a533ec13c._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment diff --git a/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment b/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment new file mode 100644 index 000000000..7db57011b --- /dev/null +++ b/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="Error message gone; but how to start using po?" + date="2011-12-20T21:41:52Z" + content=""" +Thanks for reply. I've fixed the installation issue by upgrading. + +Now, how do I actually use it? + +1) I have existing pages that's in English. I do I add translated versions of some of those pages in the slave language? + +2) How do I add new pages with the primary language version and alternative versions in slave languages? + +I tried to do these by following instructions at page [po](http://ikiwiki.info/plugins/po), but didn't have much luck. +"""]] From ebc9472cd2496c75d2624aefa87c3699214be36d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 17:42:44 -0400 Subject: [PATCH 253/460] removed --- ...t_2_47f740c023a52d35b9bd685a533ec13c._comment | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment diff --git a/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment b/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment deleted file mode 100644 index 7db57011b..000000000 --- a/doc/forum/How_to_configure_po_plugin__63__/comment_2_47f740c023a52d35b9bd685a533ec13c._comment +++ /dev/null @@ -1,16 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" - nickname="Meng" - subject="Error message gone; but how to start using po?" - date="2011-12-20T21:41:52Z" - content=""" -Thanks for reply. I've fixed the installation issue by upgrading. - -Now, how do I actually use it? - -1) I have existing pages that's in English. I do I add translated versions of some of those pages in the slave language? - -2) How do I add new pages with the primary language version and alternative versions in slave languages? - -I tried to do these by following instructions at page [po](http://ikiwiki.info/plugins/po), but didn't have much luck. -"""]] From 172c6866006b6f960f5b89a5bf4d320257764dfb Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Tue, 20 Dec 2011 20:48:48 -0400 Subject: [PATCH 254/460] --- ..._po_plugin_for_creating_pages_in_multiple_languages.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn diff --git a/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn b/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn new file mode 100644 index 000000000..5e4e56fde --- /dev/null +++ b/doc/forum/Need_some_help_on_starting_to_use_po_plugin_for_creating_pages_in_multiple_languages.mdwn @@ -0,0 +1,6 @@ +I've installed the po plugin. I'm still trying to figure out how to use it. + +I have a Ikiwiki instance with multiple existing pages in English. + +How do I use po to create alternative pages in slave languages for these existing pages? + From bb01e7ebc69a32b1662f0681d9f766f835f167bb Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Thu, 22 Dec 2011 01:34:29 -0400 Subject: [PATCH 255/460] --- ..._in_.ikiwiki_be_committed_and_pushed__63__.mdwn | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn diff --git a/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn new file mode 100644 index 000000000..58f455d0e --- /dev/null +++ b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn @@ -0,0 +1,14 @@ +In my local working copy, I get + + $ git status + # On branch master + # Changes to be committed: + # (use "git reset HEAD ..." to unstage) + # + # new file: .ikiwiki/commitlock + # new file: .ikiwiki/indexdb + # new file: .ikiwiki/lockfile + # new file: .ikiwiki/transient/recentchanges/change_0326ad7c7aa2c40b8db5d59033ecda7ed4d61295._change + + +Should these be committed and pushed? From 162921ab8caf2bc84832e97465a9b6d59ff6d836 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Thu, 22 Dec 2011 01:44:56 -0400 Subject: [PATCH 256/460] --- .../Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn index 58f455d0e..f5b1d58d1 100644 --- a/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn +++ b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__.mdwn @@ -1,4 +1,4 @@ -In my local working copy, I get +In my local working copy, I discovered a .ikiwiki directory with files and subdirectories. What are they for in a working copy? Should them be committed to central repository (origin) on remote server? $ git status # On branch master From 0283e30fdf5cea44c69c09c6b3bd3f5913bbbb83 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Thu, 22 Dec 2011 10:16:37 -0400 Subject: [PATCH 257/460] --- ...ogle__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn diff --git a/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn b/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn new file mode 100644 index 000000000..11d8c23a8 --- /dev/null +++ b/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login.mdwn @@ -0,0 +1,5 @@ +I find that users can't login my Ikiwiki instance using Google, or openID, but can use Ikiwiki user name and password to login. + +Using the two formers get error + + Error: ... is locked and cannot be edited From 48a163259df8fdaf6b7b0115ef9116ed7ac5626a Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Thu, 22 Dec 2011 12:12:42 -0400 Subject: [PATCH 258/460] Added a comment --- ...comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment diff --git a/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment new file mode 100644 index 000000000..43e7a0068 --- /dev/null +++ b/doc/forum/Should_files_in_.ikiwiki_be_committed_and_pushed__63__/comment_1_8e65d7d8298e3c31d2a16446a71c8049._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-22T16:12:42Z" + content=""" +Absolutely not. If you use ikiwiki-makerepo to set up ikiwiki, it makes a `.gitignore` containing `/.ikiwiki` + +The `.ikiwiki` directory is where ikiwiki stores all the state it needs to track about a given build of a wiki. +"""]] From c0f85e9ffffa4a7f3046c150bfbad6d5aec66f8d Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Thu, 22 Dec 2011 12:15:34 -0400 Subject: [PATCH 259/460] Added a comment --- ...comment_1_79127e3c09a1d798146088dee5a67708._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment diff --git a/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment b/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment new file mode 100644 index 000000000..41ff2fc36 --- /dev/null +++ b/doc/forum/Can__39__t_login_using_Google__44___or_openID__44___but_can_use_Ikiwiki_login/comment_1_79127e3c09a1d798146088dee5a67708._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-22T16:15:34Z" + content=""" +That error message means that the user has logged in, but the lockedit plugin has been configured, via `locked_pages` to not let some pages be edited by them. + +Inability to log in with openid is a separate problem, I can only guess as you didn't say how it fails when you try to log in by openid, but perhaps you need to install the Net::OpenID::Consumer perl module from cpan. +"""]] From eedf5cb34f21efbc82eade1962c4bd07ddcfbd39 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Fri, 23 Dec 2011 09:49:55 -0400 Subject: [PATCH 260/460] Added a comment: When is ikiwiki --setup run? --- .../comment_1_e5ce524c5d34b1d4218172296bd99100._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment new file mode 100644 index 000000000..78703bc27 --- /dev/null +++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_1_e5ce524c5d34b1d4218172296bd99100._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="When is ikiwiki --setup run?" + date="2011-12-23T13:49:54Z" + content=""" +Am I to run ikiwiki --setup after all the three steps? +"""]] From d15d20adede29932c2505fd3accf82a357028e7e Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Fri, 23 Dec 2011 12:41:47 -0400 Subject: [PATCH 261/460] Asking for help --- ..._to_new_host._Web_page_is_not_updated.mdwn | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn diff --git a/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn new file mode 100644 index 000000000..b659212b6 --- /dev/null +++ b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated.mdwn @@ -0,0 +1,27 @@ +I copied ikiwiki from old host to new. Old is Debian GNU/Linux version 5.0.7, with ikiwiki 3.1415926~bpo50+1 +New host is 5.0.8 with ikiwiki 3.20100815~bpo50+1 + +I have ikiwiki.setup and both GIT repos from old host, src and src.git, the latter is bare repo. + +I suspect I have messed up things in the old host, since the src directory tree is much larger than the src.git. +tale@tugelbend:~/wiki$ du -sh src src.git/ +8,3M src +2,6M src.git/ + +If I clone the src.git to the new host, I get after ikiwiki --setup web pages from year 2009. So I did the migration like this: + +Copy the src directory to the new host to temp dir; git clone --bare /tmp/Foo/src ~/wiki/wiki.git +cd ~/wiki +git clone wiki.git wiki.src +cd .. +ikiwiki --setup ikiwiki.setup + +I believe I have modified the ikiwiki.setup file correctly, I get no error messages and it makes the web page with the +same content as on old host. But when I git clone wiki.git a working copy for myself, and edit it, git commit -a ; git push +I am sad to see the web page is not updated. + +How can I see what is wrong? The hook seems OK: +taleman@porixi:~/wiki$ ls -lh wiki.git/hooks/post-update +-rwsr-sr-x 1 taleman taleman 14K 23.12. 17:42 wiki.git/hooks/post-update + +ikiwiki --setup created that and did not claim any errors. From f8f53b7e5758b4a48e19e57cb678491ec18c4871 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Sat, 24 Dec 2011 15:25:50 -0400 Subject: [PATCH 262/460] --- ...warning_encountered_at_upgrading_ikiwiki__63__.mdwn | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn diff --git a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn new file mode 100644 index 000000000..23dcb34ad --- /dev/null +++ b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn @@ -0,0 +1,10 @@ +---> Computing dependencies for ikiwiki +---> Activating ikiwiki @3.20110608_1 +Error: Target org.macports.activate returned: Image error: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists and does not belong to a registered port. Unable to activate port ikiwiki. Use 'port -f activate ikiwiki' to force the activation. +Log for ikiwiki is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_ikiwiki/ikiwiki/main.log +Error: Status 1 encountered during processing. +To report a bug, see +x4430:WorkSpace-X4430 lumeng$ sudo port -f activate ikiwiki +---> Computing dependencies for ikiwiki +---> Activating ikiwiki @3.20110608_1 +Warning: File /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists. Moving to: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod.mp_1324459906. From 8f94a7160b8874bd7bd970d178de42b39b438099 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Sat, 24 Dec 2011 15:27:16 -0400 Subject: [PATCH 263/460] Added a comment --- ..._348bbc82a3bae74ad12e4e0bff83afb0._comment | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment diff --git a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment new file mode 100644 index 000000000..4e32264fd --- /dev/null +++ b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment @@ -0,0 +1,20 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" + nickname="Meng" + subject="comment 1" + date="2011-12-24T19:27:16Z" + content=""" + $ sudo port install ikiwiki + Password: + ---> Computing dependencies for ikiwiki + ---> Activating ikiwiki @3.20110608_1 + Error: Target org.macports.activate returned: Image error: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists and does not belong to a registered port. Unable to activate port ikiwiki. Use 'port -f activate ikiwiki' to force the activation. + Log for ikiwiki is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_ikiwiki/ikiwiki/main.log + Error: Status 1 encountered during processing. + To report a bug, see + $ sudo port -f activate ikiwiki + ---> Computing dependencies for ikiwiki + ---> Activating ikiwiki @3.20110608_1 + Warning: File /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists. Moving to: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod.mp_1324459906. + ---> Cleaning ikiwiki +"""]] From a50153d49a80ae08dc7461355059c18487c4a08e Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Sat, 24 Dec 2011 15:28:51 -0400 Subject: [PATCH 264/460] removed --- ..._348bbc82a3bae74ad12e4e0bff83afb0._comment | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment diff --git a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment deleted file mode 100644 index 4e32264fd..000000000 --- a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__/comment_1_348bbc82a3bae74ad12e4e0bff83afb0._comment +++ /dev/null @@ -1,20 +0,0 @@ -[[!comment format=mdwn - username="https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" - nickname="Meng" - subject="comment 1" - date="2011-12-24T19:27:16Z" - content=""" - $ sudo port install ikiwiki - Password: - ---> Computing dependencies for ikiwiki - ---> Activating ikiwiki @3.20110608_1 - Error: Target org.macports.activate returned: Image error: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists and does not belong to a registered port. Unable to activate port ikiwiki. Use 'port -f activate ikiwiki' to force the activation. - Log for ikiwiki is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_ikiwiki/ikiwiki/main.log - Error: Status 1 encountered during processing. - To report a bug, see - $ sudo port -f activate ikiwiki - ---> Computing dependencies for ikiwiki - ---> Activating ikiwiki @3.20110608_1 - Warning: File /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists. Moving to: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod.mp_1324459906. - ---> Cleaning ikiwiki -"""]] From 90aefedc7c568d6c0c01186ab4d4485d7a173788 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Dec 2011 14:52:06 -0400 Subject: [PATCH 265/460] remove 2 questionable sentances For the first, ikiwiki automatically rebuilds as needed when a template is changes. I don't entirely understand what the second is trying to say. --- doc/plugins/theme.mdwn | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn index 58ac9c593..d2c62062b 100644 --- a/doc/plugins/theme.mdwn +++ b/doc/plugins/theme.mdwn @@ -16,5 +16,3 @@ Hints for theme builders * Start from an existing [[CSS file|css]], see also the [[css market]] for examples * You can override the [[templates]] files by dropping them in a `templates` subdirectory * Try to stick with modifying the CSS however, maintaining custom templates is harder - * If you *do* override a template, note that you will need to rebuild the wiki for it to be applied... - * ...it may therefore be preferable to load the template directly in your browser to develop it From 767c58d7a5c5f2944b30b8eb2c68c6c1238f43fa Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 16 Dec 2011 14:58:28 -0400 Subject: [PATCH 266/460] response --- doc/todo/submodule_support.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/submodule_support.mdwn b/doc/todo/submodule_support.mdwn index c10e3ff02..56a11ce0b 100644 --- a/doc/todo/submodule_support.mdwn +++ b/doc/todo/submodule_support.mdwn @@ -8,3 +8,8 @@ But this made really weird things on the other side. The files from the theme en To be really clear here: this is an arbitrary source code repository that I want to include, I do not mean to enable the theme with this, this could very well be presentation material, C source code or whatever else... In fact, I think this would be a powerful way to do syntax highlightning for source code published on your website... Other people had experience with this? Or other suggestions on how to publish repositories within my site? -- [[anarcat]] + +> Ikiwiki does not support git submodules. +> +> You can use the [[ikiwiki/plugin/underlay]] plugin to merge the +> contents of other directories into your wiki's source. --[[Joey]] From 855d3a52d4026ddda162d897965d5604a8b8acd4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 22 Dec 2011 12:10:57 -0400 Subject: [PATCH 267/460] remove /recentchanges from .gitignore recentchanges cruft is now stored under .ikiwiki --- ikiwiki-makerepo | 1 - 1 file changed, 1 deletion(-) diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo index 6951ca0de..c3a13c214 100755 --- a/ikiwiki-makerepo +++ b/ikiwiki-makerepo @@ -86,7 +86,6 @@ git) cd "$srcdir" git init echo /.ikiwiki > .gitignore - echo /recentchanges >> .gitignore git add . git commit -m "initial commit" git remote add origin "$repository" From 7411d1a6ce1dcb5d9f343a4a7a6633d3c30eecbf Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Sat, 24 Dec 2011 00:54:59 +0100 Subject: [PATCH 268/460] tag plugin: encode categories using numeric values This ensures that RSS/Atom feeds produced are valid XML. --- IkiWiki/Plugin/tag.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index 096c92616..605f41599 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -201,7 +201,7 @@ sub pagetemplate (@) { if (defined $tags && %$tags) { eval q{use HTML::Entities}; $template->param(categories => - [map { category => HTML::Entities::encode_entities(tagname($_)) }, + [map { category => HTML::Entities::encode_entities_numeric(tagname($_)) }, sort keys %$tags]); } } From bbf255276b22a35350a68338403cf657697e257b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Dec 2011 19:39:27 -0400 Subject: [PATCH 269/460] changelog --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index b8107c9b0..21eb7c71f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low to avoid git SIGPIPE race. * Add path and path_natural sort orders (smcv) * Test coverage can be checked with `make coverage` (smcv) + * tag: encode categories using numeric values. (tango) -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 From e89952e559a7b6f5f7afc2c6e89d5b252f9cb70a Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sat, 24 Dec 2011 20:07:29 -0400 Subject: [PATCH 270/460] Added a comment --- ...comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment new file mode 100644 index 000000000..576d11f0b --- /dev/null +++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 2" + date="2011-12-25T00:07:28Z" + content=""" +Try running the post-update hook by hand and see if it pulls the changes into ~/wiki/wiki.src and see if it updates the site. + +Make sure `gitorigin_branch` is set in the setup file. +"""]] From 2b59dc7cc9a3249d5aacda57165498bc7b9ed693 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Sat, 24 Dec 2011 20:08:22 -0400 Subject: [PATCH 271/460] Added a comment --- .../comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment new file mode 100644 index 000000000..a9bb2791a --- /dev/null +++ b/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_3_65c4a4895f6541ff0ff2d094ff447bba._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 3" + date="2011-12-25T00:08:22Z" + content=""" +You run ikiwiki -setup when you have all the files in place for ikiwiki and would like it to rebuild the site and generate the wrappers. +"""]] From a9c422a9537ad03cba7e57615d3cf1f41c7230ec Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Dec 2011 20:11:15 -0400 Subject: [PATCH 272/460] move comment to right post --- .../comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/forum/{Migrating_old_repository_to_new_ikiwiki_system__63__ => Migrated_ikiwiki_to_new_host._Web_page_is_not_updated}/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment (100%) diff --git a/doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment similarity index 100% rename from doc/forum/Migrating_old_repository_to_new_ikiwiki_system__63__/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment rename to doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_2_b44a492c7f10395a31f3c0830ef33f0c._comment From ffdf8e08f9ae2a6c6c2e1723cf51b60e54e12b7d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 24 Dec 2011 22:01:46 -0400 Subject: [PATCH 273/460] remove at poster's request --- ...warning_encountered_at_upgrading_ikiwiki__63__.mdwn | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn diff --git a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn b/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn deleted file mode 100644 index 23dcb34ad..000000000 --- a/doc/forum/Should_I_be_concerned_with_this_warning_encountered_at_upgrading_ikiwiki__63__.mdwn +++ /dev/null @@ -1,10 +0,0 @@ ----> Computing dependencies for ikiwiki ----> Activating ikiwiki @3.20110608_1 -Error: Target org.macports.activate returned: Image error: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists and does not belong to a registered port. Unable to activate port ikiwiki. Use 'port -f activate ikiwiki' to force the activation. -Log for ikiwiki is at: /opt/local/var/macports/logs/_opt_local_var_macports_sources_rsync.macports.org_release_tarballs_ports_www_ikiwiki/ikiwiki/main.log -Error: Status 1 encountered during processing. -To report a bug, see -x4430:WorkSpace-X4430 lumeng$ sudo port -f activate ikiwiki ----> Computing dependencies for ikiwiki ----> Activating ikiwiki @3.20110608_1 -Warning: File /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod already exists. Moving to: /opt/local/lib/perl5/5.12.3/darwin-multi-2level/perllocal.pod.mp_1324459906. 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 274/460] 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 275/460] 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 276/460] 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 b8bf318b91d4fc4c79a16ba2f3265b4620412d51 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 27 Dec 2011 11:37:28 -0400 Subject: [PATCH 277/460] remove x bit from comments.pm how did that get set? --- IkiWiki/Plugin/comments.pm | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 IkiWiki/Plugin/comments.pm diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm old mode 100755 new mode 100644 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 278/460] 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. +"""]] From d236c55c87a9480ca8c15dd25c06a3464a87bc22 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Tue, 27 Dec 2011 14:47:17 -0400 Subject: [PATCH 279/460] Added a comment: Editing via browser works --- ...nt_3_c3c5c41a4c220793c6d16f3fd6132272._comment | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment diff --git a/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment new file mode 100644 index 000000000..f845f130f --- /dev/null +++ b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_3_c3c5c41a4c220793c6d16f3fd6132272._comment @@ -0,0 +1,15 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="Editing via browser works" + date="2011-12-27T18:47:16Z" + content=""" +I now set up virtual host in apache2 and fudged the ipnumber to correspond to hostnames the ikiwiki uses. I do not want to update DNS before I have checked the site works. + +Now I can log in using OpenID and edit the wiki via browser. This time the web pages are updated and the changes I made appear in the wiki. + +I cheched the gitorigin_branch setting was empty string even in 2009 when I got this wiki. I begin to suspect editing the wiki using a git checkout would not work even in the host the ikiwiki is currently running on, and maybe did not work in the host it was running on in 2009. + +It looks to me like ikiwiki is working on this new host except git configuration is somehow messed up. It is possible I never did use git checkout on the old host. + +"""]] From 2d68b3dc9946f9a03a7c33dfa5d4e43581cf7030 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Tue, 27 Dec 2011 14:59:38 -0400 Subject: [PATCH 280/460] Added a comment: Checked old host, git messed up there, too --- ...t_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment diff --git a/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment new file mode 100644 index 000000000..1a5a91466 --- /dev/null +++ b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_4_1f6f9e3939a454c1eb8d2fb29bd519de._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="Checked old host, git messed up there, too" + date="2011-12-27T18:59:38Z" + content=""" +I did + git clone src.git +on the host ikiwiki is currently running on, and got an old version of the wiki, not the one that is diplayed on the web page. + +So even there editing via browser works, but git checks out an old version and the changes I make do not get shown on the web page after git push. + +This new host I set up is thus no worse, actually slighty better now because git clone at least gets me the sources the web pages are generated from. + +How to figure out what is wrong with ikiwiki setup in the using git part? +"""]] From 427aa60393a3b4115be3a28a992f88b72a02dac6 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Tue, 27 Dec 2011 23:22:57 -0400 Subject: [PATCH 281/460] Added a comment: branch = master, still no luck --- ..._8611fc62797e70a0d2a61d94fcb03170._comment | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment diff --git a/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment new file mode 100644 index 000000000..137c198cc --- /dev/null +++ b/doc/forum/Migrated_ikiwiki_to_new_host._Web_page_is_not_updated/comment_5_8611fc62797e70a0d2a61d94fcb03170._comment @@ -0,0 +1,22 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="branch = master, still no luck" + date="2011-12-28T03:22:57Z" + content=""" +I learned from docs setting gitorigin_branch to empty string disables git pushing and pulling. So guessing + +gitorigin_branch => 'master', + +seemed a good idea. + +However, now ikiwiki -setup gives: + + taleman@porixi:~$ ikiwiki -setup ikiwiki.setup + successfully generated /var/www/ikiwiki/debian.fi/ikiwiki.cgi + successfully generated /home/taleman/wiki/wiki.git/hooks/post-update + fatal: 'master': unable to chdir or not a git archive + fatal: The remote end hung up unexpectedly + 'git pull master' failed: at /usr/share/perl5/IkiWiki/Plugin/git.pm line 195. + taleman@porixi:~$ +"""]] From 1d79b80fb18844b1fb7dcbedd19970b67070d58d Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Wed, 28 Dec 2011 12:54:45 -0400 Subject: [PATCH 282/460] --- ...iki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn diff --git a/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn new file mode 100644 index 000000000..c6af80ab1 --- /dev/null +++ b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_.mdwn @@ -0,0 +1,5 @@ +I installed a new wiki on my local machine. When I click on edit, I get the following error: + +`Error: cannot write to /home/user/myiki2/.ikiwiki/lockfile: Permission denied` + +I checked the permissions of that file and assured that they are the same as in my other working ikiwiki, but it doesn't help. Any idea? From b4d2ec335b1c3ffcac393aa1e797964b8d06e152 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 16:28:54 +0000 Subject: [PATCH 283/460] reply to Kathryn --- doc/todo/pagespec_aliases.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index 209ec5435..855cde1fb 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -162,3 +162,4 @@ Unfortunately I haven't figured out how to do the dependencies - I'd really appr >>>>> I'm a bit confused by your statement "having the aliases/subsets/"things" work in any pagespec (inside map, or inline) is a deal-breaker for me". >>>>> Do you mean that you want them to work in any pagespec, or that you *don't* want them to work in any pagespec? -- [[KathrynAndersen]] +>>>>>> I mean I would want them to work in any pagespec. — [[Jon]] From ca9ef01c9304a40715417388c5ffda585bda98fc Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 16:30:04 +0000 Subject: [PATCH 284/460] reply to Joey --- doc/todo/pagespec_aliases.mdwn | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/todo/pagespec_aliases.mdwn b/doc/todo/pagespec_aliases.mdwn index 855cde1fb..748444a2f 100644 --- a/doc/todo/pagespec_aliases.mdwn +++ b/doc/todo/pagespec_aliases.mdwn @@ -100,6 +100,10 @@ however, to add ' or internal()' to `boring`, for some reason. >>>> for this patch. I personally like special pages like Kathryn is doing >>>> more than complex setup files. --[[Joey]] +>>>>> I've ran out of time to keep working on this, so I'm just going to +>>>>> submit it as a 'contrib' plugin and leave things at that for now. +>>>>> — [[Jon]] + --------------------------- Based on the above, I have written an experimental plugin called "subset". From 728441b49ed6c60d6df5b5f06b34712e82807c63 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 16:36:38 +0000 Subject: [PATCH 285/460] contrib plugin: pagespecalias --- doc/plugins/contrib/pagespec_alias.mdwn | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/plugins/contrib/pagespec_alias.mdwn diff --git a/doc/plugins/contrib/pagespec_alias.mdwn b/doc/plugins/contrib/pagespec_alias.mdwn new file mode 100644 index 000000000..1d7889050 --- /dev/null +++ b/doc/plugins/contrib/pagespec_alias.mdwn @@ -0,0 +1,28 @@ +[[!template id=plugin name=pagespec_alias author="[[Jon]]"]] +[[!tag type/meta]] + +The pagespec_alias plugin allows the administrator(s) of a wiki to define +[[PageSpec]] aliases: short names for PageSpecs to ease re-use. + +Within the setup file, the `pagespec_aliases` value is treated as a list +of key/value pairs. The keys define alias names, the values the pagespecs +to which they refer. + +For example: + + pagespec_aliases: + image: "*.png or *.jpg or *.jpeg or *.gif or *.ico" + helper: "*.css or *.js" + boring: "image() or helper() or internal(*)" + +With the above, you could use the pagespec aliases such as + + \[[!map pages="!boring()"]] + +To define a site map which excluded various page names which might be +uninteresting to include in a site map. + + +## Download + + * From 3f5d4e54522970abd89b46cafb3d530a4134491b Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 16:48:36 +0000 Subject: [PATCH 286/460] update link to plugin --- doc/plugins/contrib/pagespec_alias.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/plugins/contrib/pagespec_alias.mdwn b/doc/plugins/contrib/pagespec_alias.mdwn index 1d7889050..62f048d0d 100644 --- a/doc/plugins/contrib/pagespec_alias.mdwn +++ b/doc/plugins/contrib/pagespec_alias.mdwn @@ -25,4 +25,4 @@ uninteresting to include in a site map. ## Download - * + * From 44fc7daf9c72b6c3b7a635008c0ec78884a6ef91 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 17:11:57 +0000 Subject: [PATCH 287/460] fix link --- doc/plugins/contrib/pagespec_alias.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/plugins/contrib/pagespec_alias.mdwn b/doc/plugins/contrib/pagespec_alias.mdwn index 62f048d0d..cb642ad33 100644 --- a/doc/plugins/contrib/pagespec_alias.mdwn +++ b/doc/plugins/contrib/pagespec_alias.mdwn @@ -24,5 +24,5 @@ uninteresting to include in a site map. ## Download - - * + + * From df5fc61629f3e89809d2080065bf34fd71595346 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 28 Dec 2011 18:13:52 +0000 Subject: [PATCH 288/460] parking this for the time being --- doc/todo/allow_site-wide_meta_definitions.mdwn | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/todo/allow_site-wide_meta_definitions.mdwn b/doc/todo/allow_site-wide_meta_definitions.mdwn index 38c30c23f..f548f1a5b 100644 --- a/doc/todo/allow_site-wide_meta_definitions.mdwn +++ b/doc/todo/allow_site-wide_meta_definitions.mdwn @@ -161,3 +161,9 @@ definitions essentially. >>>>>>> No pity required — but whoops, yes, that was a bit of a mistake >>>>>>> ☺ I guess I'll have to split the current `preprocess` in half. >>>>>>> — [[Jon]] + +>>>>>>>> I've been taking another look at this today, as I'm very keen to +>>>>>>>> close various open loops of mine in IkiWiki to move on and do some +>>>>>>>> other stuff. However, I'm not actually *using* this at the moment, +>>>>>>>> so whilst I think it's a good idea, I can't really motivate myself +>>>>>>>> to fix it anymore. I guess for now, this should just rot. — [[Jon]] From e71b299f0b03a95f5e72da78028f3e5be73dc9a1 Mon Sep 17 00:00:00 2001 From: "https://launchpad.net/~tale" Date: Wed, 28 Dec 2011 15:35:26 -0400 Subject: [PATCH 289/460] Added a comment: What are the permissions? --- ...comment_1_64146f306ec8c10614521359b6de4f82._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment diff --git a/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment new file mode 100644 index 000000000..02f70860d --- /dev/null +++ b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_1_64146f306ec8c10614521359b6de4f82._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://launchpad.net/~tale" + nickname="tale" + subject="What are the permissions?" + date="2011-12-28T19:35:25Z" + content=""" +What exactly are the permissions for the lockfile and the directory it is in? + +What user is the ikiwiki running as? +"""]] From 1254e72d680e6d259abf35897560fa573d0d1c35 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" Date: Wed, 28 Dec 2011 19:06:06 -0400 Subject: [PATCH 290/460] Added a comment --- ..._ed2b4b8f7122b42bbde1189fbd2969dd._comment | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment diff --git a/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment new file mode 100644 index 000000000..cc1a30adb --- /dev/null +++ b/doc/forum/Error:_cannot_write_to___47__home__47__user__47__myiki2__47__.ikiwiki__47__lockfile:_Permission_denied_/comment_2_ed2b4b8f7122b42bbde1189fbd2969dd._comment @@ -0,0 +1,23 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawk_MMtLPS7osC5MjX00q2ATjvvXPWqm0ik" + nickname="micheal" + subject="comment 2" + date="2011-12-28T23:06:06Z" + content=""" + +stat -c '%A %a %U %G %n' myiki2 myiki1 +drwxr-xr-x 755 user user myiki2 +drwxr-xr-x 755 user user myiki1 + +stat -c '%A %a %U %G %n' myiki2/.ikiwiki myiki1/.ikiwiki +drwxr-xr-x 755 user user myiki2/.ikiwiki +drwxr-xr-x 755 user user myiki1/.ikiwiki + +stat -c '%A %a %U %G %n' myiki2/.ikiwiki/lockfile myiki1/.ikiwiki/lockfile +-rw-r--r-- 644 user user myiki2/.ikiwiki/lockfile +-rw-r--r-- 644 user user myiki1/.ikiwiki/lockfile + + +As you see, myiki2 has the same permissions as myiki1, but myiki1 works. + +"""]] From caf453fc2a9f87b1c8a4b064c05d45f06bf8596a Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlqWSY9PNYRysA9vrU-JiQh7-s7q6SOcIE" Date: Thu, 29 Dec 2011 11:35:41 -0400 Subject: [PATCH 291/460] Pendantic grammer change --- doc/plugins/htmlscrubber.mdwn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/plugins/htmlscrubber.mdwn b/doc/plugins/htmlscrubber.mdwn index 98933d99e..08c81212b 100644 --- a/doc/plugins/htmlscrubber.mdwn +++ b/doc/plugins/htmlscrubber.mdwn @@ -10,9 +10,9 @@ Parser, documented at . Notably it strips `style` and `link` tags, and the `style` attribute. -All attributes that can be used to specify an url are checked to make sure -that the url is in a known, safe scheme, and to block embedded javascript -in such urls. +Any attributes that could be used to specify a URL are checked to ensure +that they are known, safe schemes. It will also block embedded javascript +in such URLs. It uses the [[!cpan HTML::Scrubber]] perl module to perform its html sanitisation, and this perl module also deals with various entity encoding From 5e3e3290636fd451f4bd6448b44a917f9706ca75 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Dec 2011 12:08:59 -0400 Subject: [PATCH 292/460] releasing version 3.20111229 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- po/ikiwiki.pot | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 21eb7c71f..6cd19d7c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20111108) UNRELEASED; urgency=low +ikiwiki (3.20111229) unstable; urgency=low * Consume all stdin when rcs_receive short-circuits, to avoid git SIGPIPE race. @@ -6,7 +6,7 @@ ikiwiki (3.20111108) UNRELEASED; urgency=low * Test coverage can be checked with `make coverage` (smcv) * tag: encode categories using numeric values. (tango) - -- Joey Hess Mon, 05 Dec 2011 15:14:48 -0400 + -- Joey Hess Thu, 29 Dec 2011 12:00:53 -0400 ikiwiki (3.20111107) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index c3da2559e..675d29864 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20111107 +Version: 3.20111229 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 9308d9ce5..047371251 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-30 16:33-0400\n" +"POT-Creation-Date: 2011-12-29 12:03-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" From db77e97e031561d583a837e13474c36bbf9220f4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 29 Dec 2011 12:09:13 -0400 Subject: [PATCH 293/460] add news item for ikiwiki 3.20111229 --- doc/news/version_3.20110712.mdwn | 6 ------ doc/news/version_3.20111229.mdwn | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 doc/news/version_3.20110712.mdwn create mode 100644 doc/news/version_3.20111229.mdwn diff --git a/doc/news/version_3.20110712.mdwn b/doc/news/version_3.20110712.mdwn deleted file mode 100644 index 8744d688d..000000000 --- a/doc/news/version_3.20110712.mdwn +++ /dev/null @@ -1,6 +0,0 @@ -ikiwiki 3.20110712 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * attachment: Bugfix to create directory when moving attachment out of - holding area. - * Display attachment manipulation links always, since attachments can be - uploaded via javascript."""]] \ No newline at end of file diff --git a/doc/news/version_3.20111229.mdwn b/doc/news/version_3.20111229.mdwn new file mode 100644 index 000000000..18c4f8d12 --- /dev/null +++ b/doc/news/version_3.20111229.mdwn @@ -0,0 +1,7 @@ +ikiwiki 3.20111229 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * Consume all stdin when rcs\_receive short-circuits, + to avoid git SIGPIPE race. + * Add path and path\_natural sort orders (smcv) + * Test coverage can be checked with `make coverage` (smcv) + * tag: encode categories using numeric values. (tango)"""]] \ No newline at end of file From de43c9024996bc12fc7a5227fc24c4d92d6ca6f3 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawnZ0g2UAijV7RGrKtWPljCCAYHBJ3pwPvM" Date: Fri, 30 Dec 2011 13:23:43 -0400 Subject: [PATCH 294/460] --- ...git_or_accidentally_committed_jiberish__63__.mdwn | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__.mdwn diff --git a/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__.mdwn b/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__.mdwn new file mode 100644 index 000000000..ec9980c30 --- /dev/null +++ b/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__.mdwn @@ -0,0 +1,12 @@ +When rebuilding, I see + + building recentchanges/change_63476fba3a519d42ee56c7611250ada41111356d._change, which depends on templates/page.tmpl + building recentchanges/change_bd07c4308d5eea2cd27ad067a502318dc0e9c8bb._change, which depends on templates/page.tmpl + building recentchanges/change_6c2a66b022276951d79f29c1221d22fe1592f67f._change, which depends on templates/page.tmpl + building recentchanges/change_f08669f128d618d0da460234b2cee555b0818584._change, which depends on templates/page.tmpl + building recentchanges/change_b0347df66da5c515dc0d1d612ecdfbe203a0a674._change, which depends on templates/page.tmpl + building recentchanges/change_0bb246c481e9ede8686f6caa4de40b9e94642e40._change, which depends on templates/page.tmpl + building recentchanges/change_511846ca75fb2e87fb90582ead282d104a5e13fc._change, which depends on templates/page.tmpl + ... + +Are these accidentally committed gibberish? If so, how to remove them properly? From 28e66cd34a157f31012e6b0be4afa2457a0c9f08 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Fri, 30 Dec 2011 14:13:19 -0400 Subject: [PATCH 295/460] Added a comment --- ...comment_1_b425823f800fba82ad2aaaa0dbe6686a._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__/comment_1_b425823f800fba82ad2aaaa0dbe6686a._comment diff --git a/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__/comment_1_b425823f800fba82ad2aaaa0dbe6686a._comment b/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__/comment_1_b425823f800fba82ad2aaaa0dbe6686a._comment new file mode 100644 index 000000000..9326f73d5 --- /dev/null +++ b/doc/forum/Are_these_revisions_legit_or_accidentally_committed_jiberish__63__/comment_1_b425823f800fba82ad2aaaa0dbe6686a._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2011-12-30T18:13:18Z" + content=""" +They are little per-change pages that are inlined together to produce your RecentChanges page. + +(They're not committed to git, only stored internally.) +"""]] From 9dce803faf4dac9ee9249a108e9054e296e1f741 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2012 16:56:32 -0400 Subject: [PATCH 296/460] discount support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mdwn: Can use the discount markdown library, via the Text::Markdown::Discount perl module. This is preferred if available since it's the fastest currently supported markdown library, speeding up markdown rendering by a factor of 40. That is to say, when only rendering a lot of markdown, discount is 40x faster. When building a ikiwiki site, ikiwiki's other overhead gets in the way, but I still see significant speedups. Building the ikiwiki docwiki dropped from 62 to 45 seconds, for example. However, when multimarkdown is enabled, Text::Markdown::Multimarkdown is still used. While discount contains some nonstandard markdown extensions, including tables and footnotes, AFAICS most of them are not enabled by default in the perl bindings. I consider sticking to non-extended markdown a desirable thing, since this is probably not the last markdown engine. In particular, sundown is waiting in the wings to get packaged and get a perl binding. ---- Reviewing all the showdown extensions, here are the ones that are enabled: centered paragraphs: ->centered<- image sizes: [dust mite](http://dust.mite =150x150) blocks are eaten. The perl binding does not provide access to the gathered CSS. This is not legal html anyway, so unlikely to cause breakage. --- IkiWiki/Plugin/mdwn.pm | 6 ++++++ debian/changelog | 11 +++++++++++ doc/plugins/mdwn.mdwn | 9 ++++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index b892eabee..0dc0cc336 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -50,6 +50,12 @@ sub htmlize (@) { } } } + if (! defined $markdown_sub) { + eval q{use Text::Markdown::Discount}; + if (! $@) { + $markdown_sub=\&Text::Markdown::Discount::markdown; + } + } if (! defined $markdown_sub) { eval q{use Text::Markdown}; if (! $@) { diff --git a/debian/changelog b/debian/changelog index 6cd19d7c2..a33b3d1b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +ikiwiki (3.20111230) UNRELEASED; urgency=low + + * mdwn: Can use the discount markdown library, via the + Text::Markdown::Discount perl module. This is preferred if available + since it's the fastest currently supported markdown library, speeding up + ikiwiki's rendering by a factor of 40. + (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown + is still used.) + + -- Joey Hess Sun, 01 Jan 2012 16:22:24 -0400 + ikiwiki (3.20111229) unstable; urgency=low * Consume all stdin when rcs_receive short-circuits, diff --git a/doc/plugins/mdwn.mdwn b/doc/plugins/mdwn.mdwn index ce1b6097a..8a7308305 100644 --- a/doc/plugins/mdwn.mdwn +++ b/doc/plugins/mdwn.mdwn @@ -8,9 +8,12 @@ This is the standard markup language used by ikiwiki, although some others are also available in other plugins. There are several implementations of markdown support that can be used by -this plugin. The [original version of -markdown](http://daringfireball.net/projects/markdown/) can be used, or the -[[!cpan Text::Markdown]] perl module. +this plugin. In order of preference: + +* [Discount](http://www.pell.portland.or.us/~orc/Code/discount/), + via the [[!cpan Text::Markdown::Discount]] perl module. +* The [[!cpan Text::Markdown]] perl module. +* The [original version of markdown](http://daringfireball.net/projects/markdown/). [[!cpan Text::MultiMarkdown]] can be used in order to use tables, footnotes, and other new features from the markdown variant called From 37f7f125f910b66ff7f43136ba08d3c849b139e8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2012 17:11:56 -0400 Subject: [PATCH 297/460] fix test suite to work with discount In the first test, discount returns the html attributes in a different order, which broke the test. Test only for the important text, not the exact html output. In the second test, discount does some encoding of its own of the partially encoded url, again resulting in different output. --- t/htmlize.t | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/t/htmlize.t b/t/htmlize.t index a436748f9..1569c8dcf 100755 --- a/t/htmlize.t +++ b/t/htmlize.t @@ -1,7 +1,7 @@ #!/usr/bin/perl use warnings; use strict; -use Test::More tests => 32; +use Test::More tests => 31; use Encode; BEGIN { use_ok("IkiWiki"); } @@ -14,9 +14,8 @@ IkiWiki::checkconfig(); is(IkiWiki::htmlize("foo", "foo", "mdwn", "foo\n\nbar\n"), "

foo

\n\n

bar

\n", "basic"); -is(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test1.mdwn")), - Encode::decode_utf8(qq{

o\nóóóóó

\n}), - "utf8; bug #373203"); +my $val=Encode::encode_utf8(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test1.mdwn"))); +ok($val =~/ó/ && $val =~/óóóóó/, "utf8; bug #373203"); ok(IkiWiki::htmlize("foo", "foo", "mdwn", readfile("t/test2.mdwn")), "this file crashes markdown if it's fed in as decoded utf-8"); @@ -26,8 +25,6 @@ sub gotcha { } ok(!gotcha(q{click me}), "javascript url"); -ok(!gotcha(q{click me}), - "partially encoded javascript url"); ok(!gotcha(q{click me}), "jscript url"); ok(!gotcha(q{click me}), From 12f86df239e8a6c1d554d86b5c56e2b8713f6cd8 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2012 17:24:21 -0400 Subject: [PATCH 298/460] workaround a bug in the discount perl binding Empty input, or input consisting soley of whitespace caused an uninitialized value warning. --- IkiWiki/Plugin/mdwn.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Plugin/mdwn.pm b/IkiWiki/Plugin/mdwn.pm index 0dc0cc336..b10d08517 100644 --- a/IkiWiki/Plugin/mdwn.pm +++ b/IkiWiki/Plugin/mdwn.pm @@ -53,7 +53,12 @@ sub htmlize (@) { if (! defined $markdown_sub) { eval q{use Text::Markdown::Discount}; if (! $@) { - $markdown_sub=\&Text::Markdown::Discount::markdown; + $markdown_sub=sub { + # Workaround for discount binding bug + # https://rt.cpan.org/Ticket/Display.html?id=73657 + return "" if $_[0]=~/^\s*$/; + Text::Markdown::Discount::markdown(@_); + } } } if (! defined $markdown_sub) { From aa2ba8ad9a92d0c8fc59201675b789d6d302f4d7 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2012 17:37:49 -0400 Subject: [PATCH 299/460] update --- doc/todo/Improve_markdown_speed.mdwn | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn index 8d7f0e3cb..5d5647e9b 100644 --- a/doc/todo/Improve_markdown_speed.mdwn +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -1,6 +1,28 @@ -I'm not sure where the bottleneck is for running ikiwiki over a site like my blog [Natalian](http://source.natalian-org.branchable.com/?p=source.git;), though I like to think the markdown processing could be speeded up by the support of the C implementation of Markdown called [Sundown](https://github.com/tanoku/sundown). +I'm not sure where the bottleneck is for running ikiwiki over a site like +my blog +[Natalian](http://source.natalian-org.branchable.com/?p=source.git;), +though I like to think the markdown processing could be speeded up by the +support of the C implementation of Markdown called +[Sundown](https://github.com/tanoku/sundown). ->> Sundown doesn't appear to have Perl bindings, so the cost of calling a separate process could wipe out some or all of the speed gain. It might be worth looking into Text::Upskirt instead, which uses the Upskirt library which Sundown appears to be derived from. ->> -- [[KathrynAndersen]] +>> Sundown doesn't appear to have Perl bindings, so the cost of calling a +>> separate process could wipe out some or all of the speed gain. It might +>> be worth looking into Text::Upskirt instead, which uses the Upskirt +>> library which Sundown appears to be derived from. -- [[KathrynAndersen]] + +>>> It would be fairly easy to write a perl binding for sundown. For that +>>> matter, Text::Upskirt could be adapted to it. I am waiting for any of +>>> upskirt, sundown and perl bindings to get into Debian, then I will +>>> see about making ikiwiki use them. +>>> +>>> For now, I have added discount support to ikiwiki. This does speed up +>>> markdown rendering by up to 40x, although when building a site ikiwiki +>>> in practice does other work, so the gains are less impressive. Building +>>> the ikiwiki doc wiki went from 62 to 45 seconds. The lack of a Debian +>>> package of Text::Markdown::Discount means this is not used by default +>>> yet. +>>> +>>> (Upskirt, discount... Who comes up with these names? Discount also +>>> features a "NOPANTS" option.) --[[Joey]] [[wishlist]] From 335ffd06763dffa7de733f0e45304edcc7249f87 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 1 Jan 2012 17:40:50 -0400 Subject: [PATCH 300/460] switch bundle to discount, and mention it in install --- Bundle/IkiWiki.pm | 2 +- doc/install.mdwn | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Bundle/IkiWiki.pm b/Bundle/IkiWiki.pm index a82362317..a0bd60e46 100644 --- a/Bundle/IkiWiki.pm +++ b/Bundle/IkiWiki.pm @@ -16,7 +16,7 @@ perl -MCPAN -e 'install Bundle::IkiWiki' =head1 CONTENTS -Text::Markdown +Text::Markdown::Discount HTML::Scrubber HTML::Template HTML::Parser diff --git a/doc/install.mdwn b/doc/install.mdwn index f38ae2aab..9c5d5939b 100644 --- a/doc/install.mdwn +++ b/doc/install.mdwn @@ -11,7 +11,8 @@ Ikiwiki is a perl program, and needs a recent version of perl such as It's recommended you have a C compiler, as ikiwiki uses one to build wrappers. -Ikiwiki requires the [[!cpan Text::Markdown]], [[!cpan URI]], +Ikiwiki requires the [[!cpan Text::Markdown::Discount]] (or +[[!cpan Text::Markdown]]), [[!cpan URI]], [[!cpan HTML::Parser]], [[!cpan HTML::Template]], and [[!cpan HTML::Scrubber]] perl modules be installed. It can also use a lot of other perl modules, if they are available. From bd2056ee95fb1bc623fa4eadd23b420ea1e4fd4e Mon Sep 17 00:00:00 2001 From: dave Date: Mon, 2 Jan 2012 23:51:35 -0400 Subject: [PATCH 301/460] --- ...doing_it_wrong_-_tracking_non-post_files_in_a_blog.mdwn | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog.mdwn diff --git a/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog.mdwn b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog.mdwn new file mode 100644 index 000000000..383ae17cc --- /dev/null +++ b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog.mdwn @@ -0,0 +1,7 @@ +I've been searching on this topic for a while and haven't found a solution, so I'd like to ask here. + +I have a blog which I mostly use as a tech-note reminder system for myself (how did I setup my server, etc). Occasionally I find it useful to include files which are not posts, and links to those files. + +Right now, I scp the files to the server to get them in a place accessible by the web server, then use a relative link within the post. This works, but it strikes me that the files are as much a part of the post as the post itself, and therefore should be tracked. The problem with tracking the files is the inline directive gives those files their own entries as posts in the blog. I do not want them to have their own entries, but I *do* want them co-located with the file containing the post from which they are referenced. + +So, is there a way to have *only* `*.mdwn` files be picked up as posts by the inline directive (I tried using a PageSpec of `*.mdwn`, but that didn't work)? Or, conversely, to exclude other files from being picked up as posts? Or am I not seeing another way to go about this task? From 02e9be83c6d32a000a4f9cf6114bd49519436e3a Mon Sep 17 00:00:00 2001 From: "http://smcv.pseudorandom.co.uk/" Date: Tue, 3 Jan 2012 07:29:59 -0400 Subject: [PATCH 302/460] Added a comment --- ...1_45ecaf6efa2065837fa54a42737f0a66._comment | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_1_45ecaf6efa2065837fa54a42737f0a66._comment diff --git a/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_1_45ecaf6efa2065837fa54a42737f0a66._comment b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_1_45ecaf6efa2065837fa54a42737f0a66._comment new file mode 100644 index 000000000..4d2c93238 --- /dev/null +++ b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_1_45ecaf6efa2065837fa54a42737f0a66._comment @@ -0,0 +1,18 @@ +[[!comment format=mdwn + username="http://smcv.pseudorandom.co.uk/" + nickname="smcv" + subject="comment 1" + date="2012-01-03T11:29:59Z" + content=""" +Change the [[ikiwiki/pagespec]] in the `inline`, for instance from +`posts/*` to `page(posts/*)`. + +`page(*)` only matches \"pages\" (things that get rendered to HTML, which is just +`.mdwn` files in a default ikiwiki, but can include other things with the right +plugins). + +On my blog I use \"`2* and copyright(*)`\", which is a bit of a hack: it matches +files in the directories I use for posts (which are year-based), but only if +they have an explicit copyright statement - which my blog posts do, but +\"structural\" pages (like a list of all posts from 2011) don't. +"""]] From 8ed142afc9483c3c3d88319df54e4772f585b507 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 3 Jan 2012 14:55:40 -0400 Subject: [PATCH 303/460] On Debian, depend on libtext-markdown-discount. --- debian/changelog | 1 + debian/control | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a33b3d1b7..c9ab41ebd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,7 @@ ikiwiki (3.20111230) UNRELEASED; urgency=low ikiwiki's rendering by a factor of 40. (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown is still used.) + * On Debian, depend on libtext-markdown-discount. -- Joey Hess Sun, 01 Jan 2012 16:22:24 -0400 diff --git a/debian/control b/debian/control index 69cef5671..922fe3c77 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: web Priority: optional Build-Depends: perl, debhelper (>= 7.0.50) Build-Depends-Indep: dpkg-dev (>= 1.9.0), libxml-simple-perl, - libtext-markdown-perl | markdown, + libtext-markdown-discount-perl, libtimedate-perl, libhtml-template-perl, libhtml-scrubber-perl, wdg-html-validator, libhtml-parser-perl, liburi-perl (>= 1.36), perlmagick, po4a (>= 0.34), @@ -17,7 +17,7 @@ Vcs-Git: git://git.ikiwiki.info/ Package: ikiwiki Architecture: all Depends: ${misc:Depends}, ${perl:Depends}, ${python:Depends}, - libtext-markdown-perl | markdown, + libtext-markdown-discount-perl, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl (>= 1.36), libyaml-perl, libjson-perl Recommends: gcc | c-compiler, From e0db503b9b3d9fc9a08929d2c1aa1304181edaa1 Mon Sep 17 00:00:00 2001 From: dave Date: Wed, 4 Jan 2012 00:01:54 -0400 Subject: [PATCH 304/460] Added a comment --- ...mment_2_45ca7ef4190c281d703c8c7ca6979298._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_2_45ca7ef4190c281d703c8c7ca6979298._comment diff --git a/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_2_45ca7ef4190c281d703c8c7ca6979298._comment b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_2_45ca7ef4190c281d703c8c7ca6979298._comment new file mode 100644 index 000000000..ecb6f5df9 --- /dev/null +++ b/doc/forum/Perhaps_I__39__m_doing_it_wrong_-_tracking_non-post_files_in_a_blog/comment_2_45ca7ef4190c281d703c8c7ca6979298._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="dave" + ip="24.209.97.191" + subject="comment 2" + date="2012-01-04T04:01:54Z" + content=""" +Thank you sir, that was exactly what I needed! + +Don't know why I didn't think to try page - apparently I have a special blindness which applies to looking at the pagespec help page. ;) + +Anyway, thanks again, that fixed it. +"""]] From c1a0fec9d772cf41c915c24e15629ff98f3deb88 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 4 Jan 2012 13:43:37 -0400 Subject: [PATCH 305/460] correction --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c9ab41ebd..57a27d82f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ ikiwiki (3.20111230) UNRELEASED; urgency=low * mdwn: Can use the discount markdown library, via the Text::Markdown::Discount perl module. This is preferred if available since it's the fastest currently supported markdown library, speeding up - ikiwiki's rendering by a factor of 40. + ikiwiki's markdown rendering by a factor of 40. (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown is still used.) * On Debian, depend on libtext-markdown-discount. From ff9c9b82b4d3483504d547fe770bb24174b36e04 Mon Sep 17 00:00:00 2001 From: sajolida Date: Wed, 4 Jan 2012 16:46:58 -0400 Subject: [PATCH 306/460] --- doc/todo/sortbylastcomment_plugin.mdwn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/todo/sortbylastcomment_plugin.mdwn b/doc/todo/sortbylastcomment_plugin.mdwn index 71dfb67c8..84cf86e21 100644 --- a/doc/todo/sortbylastcomment_plugin.mdwn +++ b/doc/todo/sortbylastcomment_plugin.mdwn @@ -9,3 +9,5 @@ You'll find it in this repository, in the 'sortbylastcomment' branch: [[!tag wishlist patch]] > Reviewed, tested: looks good to me. We need it for the [Tails forum](https://tails.boum.org/forum/). --[[intrigeri]] + +>> Hi, is there a chance of seeing this plugin getting included in a release at any point soon? --sajolida From 48122cb825f87e469d4363916d56f36eb2f67066 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 6 Jan 2012 11:29:17 -0400 Subject: [PATCH 307/460] fix urls --- doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn index 4a7163eae..f1b0598ee 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn @@ -6,7 +6,7 @@ ---- -I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 +I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: git://anarcat.ath.cx/software/mediawikigitdump.git/ and git://anarcat.ath.cx/software/media2iki.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15 ---- From 3cbb92ef3bedc9eeda9018026f664aa355b27e99 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 6 Jan 2012 11:30:31 -0400 Subject: [PATCH 308/460] fix my urls --- 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 788a9be6e..033f8b520 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn @@ -188,7 +188,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi [[scy]] wrote a python script to convert from mediawiki XML dumps to git repositories at . -[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at . The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter. +[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at . The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: ). > Some assembly is required to get Mediawiki2markdown and its mwlib > gitmodule available in the right place for it to use.. perhaps you could From fd76256d07d7656d4fd508a956649d3685608218 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 6 Jan 2012 11:31:37 -0400 Subject: [PATCH 309/460] really fix those urls --- doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn index 033f8b520..4d1f91833 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn @@ -188,7 +188,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi [[scy]] wrote a python script to convert from mediawiki XML dumps to git repositories at . -[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at . The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: ). +[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at git://anarcat.ath.cx/software/mediawikigitdump.git/. The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: git://anarcat.ath.cx/software/media2iki.git/). > Some assembly is required to get Mediawiki2markdown and its mwlib > gitmodule available in the right place for it to use.. perhaps you could @@ -204,7 +204,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi > fails on some html in the page named "4_metres". On archiveteam.org, > it fails trying to write to a page filename starting with "/", --[[Joey]] -> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: -- [[anarcat]] +> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: git://anarcat.ath.cx/software/media2iki.git/ -- [[anarcat]] >>> Not using your new converter, just the installation I did earlier >>> today: From b632d426422b7ff424eaae387cce60f9c1e7c448 Mon Sep 17 00:00:00 2001 From: "https://id.koumbit.net/anarcat" Date: Fri, 6 Jan 2012 11:59:06 -0400 Subject: [PATCH 310/460] fix the urls again again --- doc/tips/convert_mediawiki_to_ikiwiki.mdwn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn index 4d1f91833..e60b413dd 100644 --- a/doc/tips/convert_mediawiki_to_ikiwiki.mdwn +++ b/doc/tips/convert_mediawiki_to_ikiwiki.mdwn @@ -188,7 +188,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi [[scy]] wrote a python script to convert from mediawiki XML dumps to git repositories at . -[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at git://anarcat.ath.cx/software/mediawikigitdump.git/. The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: git://anarcat.ath.cx/software/media2iki.git/). +[[Anarcat]] wrote a python script to convert from a mediawiki website to ikiwiki at git://src.anarcat.ath.cx/mediawikigitdump.git/. The script doesn't need any special access or privileges and communicates with the documented API (so it's a bit slower, but allows you to mirror sites you are not managing, like parts of Wikipedia). The script can also incrementally import new changes from a running site, through RecentChanges inspection. It also supports mithro's new Mediawiki2markdown converter (which I have a copy here: git://src.anarcat.ath.cx/media2iki.git/). > Some assembly is required to get Mediawiki2markdown and its mwlib > gitmodule available in the right place for it to use.. perhaps you could @@ -204,7 +204,7 @@ There is a repository of tools for converting MediaWiki to Git based Markdown wi > fails on some html in the page named "4_metres". On archiveteam.org, > it fails trying to write to a page filename starting with "/", --[[Joey]] -> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: git://anarcat.ath.cx/software/media2iki.git/ -- [[anarcat]] +> > can you show me exactly which commandline arguments you're using? also, I have made improvements over the converter too, also available here: git://src/anarcat.ath.cx/media2iki.git/ -- [[anarcat]] >>> Not using your new converter, just the installation I did earlier >>> today: From 79ae6b60212def463b6fa1714e0164a38ca7aded Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 10:48:24 -0500 Subject: [PATCH 311/460] wrap lines --- doc/users/schmonz.mdwn | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index ec282c990..583d2c7b9 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -1,5 +1,10 @@ -[Amitai Schlair](http://www.netbsd.org/~schmonz/) recently discovered ikiwiki and finds himself using it for all sorts of things. His attempts at contributing: +[Amitai Schlair](http://www.netbsd.org/~schmonz/) finds himself +using ikiwiki for all sorts of things. His attempts at contributing: -[[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)"]] +[[!map +pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)" +]] -I've also written a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which may or may not be of general utility. +I've also written a plugin for [WIND +authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which +may or may not be of general utility. From fa99332893ed8ede41857806e2b92ed02ea1c9d8 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 10:52:21 -0500 Subject: [PATCH 312/460] third-person or bust --- doc/users/schmonz.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index 583d2c7b9..ebfcf3cdd 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -5,6 +5,6 @@ using ikiwiki for all sorts of things. His attempts at contributing: pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)" ]] -I've also written a plugin for [WIND +He's also written a plugin for [WIND authentication](http://www.columbia.edu/acis/rad/authmethods/wind/), which may or may not be of general utility. From 13a7b6d6eae895efc5ef6ef90dfb48f745ce95a5 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm5_tJrXPmX2LfWJ2KKt_2YsHzyd8UKv4o" Date: Sun, 8 Jan 2012 12:50:04 -0400 Subject: [PATCH 313/460] add russian openbsd.ru wiki --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 342d1494d..418557f7c 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -77,6 +77,7 @@ Projects & Organizations * [The Amnesic Incognito Live System](https://tails.boum.org/index.en.html) * [The Progress Linux OS wiki](http://wiki.progress-linux.org/) * [Oxford Computer Society](http://www.ox.compsoc.net/) +* [Russian OpenBSD Community wiki] (http://wiki.openbsd.ru/) Personal sites and blogs ======================== From f03fa8b1eb52e11a46d281688733ab1da8eba753 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawm5_tJrXPmX2LfWJ2KKt_2YsHzyd8UKv4o" Date: Sun, 8 Jan 2012 12:52:27 -0400 Subject: [PATCH 314/460] fix link to wiki.openbsd.ru --- doc/ikiwikiusers.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 418557f7c..b49ee82ca 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -77,7 +77,7 @@ Projects & Organizations * [The Amnesic Incognito Live System](https://tails.boum.org/index.en.html) * [The Progress Linux OS wiki](http://wiki.progress-linux.org/) * [Oxford Computer Society](http://www.ox.compsoc.net/) -* [Russian OpenBSD Community wiki] (http://wiki.openbsd.ru/) +* [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/) Personal sites and blogs ======================== From 2c3efbb3cebc6c45b16051683595aa02b701799e Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 12:06:56 -0500 Subject: [PATCH 315/460] When generating scripts, give them the interpreter we generated them with. --- IkiWiki/Setup/Standard.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index c85069304..ea7d763bb 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -14,7 +14,10 @@ sub import { sub gendump ($@) { my $class=shift; - "#!/usr/bin/perl", + my $thisperl = eval q{use Config; $Config{perlpath}}; + error($@) if $@; + + "#!$thisperl", "#", (map { "# $_" } @_), "use IkiWiki::Setup::Standard {", From 1dc565c9ae1e2bd94f4d3bbb9e798a1eb0f20f79 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 12:11:36 -0500 Subject: [PATCH 316/460] Portability fixes: * Define overridable defaults for SYSCONFDIR and MANDIR. * Avoid GNUisms in sed(1) and cp(1). --- Makefile.PL | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index b19636c60..69ba5e5ef 100755 --- a/Makefile.PL +++ b/Makefile.PL @@ -19,11 +19,14 @@ SED?=sed # Additional configurable path variables. W3M_CGI_BIN?=$(PREFIX)/lib/w3m/cgi-bin +SYSCONFDIR?=/etc/ikiwiki +MANDIR?=$(PREFIX)/share/man tflag=$(shell if [ -n "$$NOTAINT" ] && [ "$$NOTAINT" != 1 ]; then printf -- "-T"; fi) extramodules=$(shell if [ "$$PROFILE" = 1 ]; then printf -- "-d:NYTProf"; fi) outprogs=ikiwiki.out ikiwiki-transition.out ikiwiki-calendar.out scripts=ikiwiki-update-wikilist ikiwiki-makerepo +sysconfdir_scripts=ikiwiki-mass-rebuild ikiwiki-update-wikilist PROBABLE_INST_LIB=$(shell \\ if [ "$(INSTALLDIRS)" = "perl" ]; then \\ @@ -42,7 +45,7 @@ PROBABLE_INST_LIB=$(shell \\ ikiwiki.setup: HOME=/home/me $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -dumpsetup ikiwiki.setup -extra_build: $(outprogs) ikiwiki.setup docwiki +extra_build: $(outprogs) ikiwiki.setup docwiki sysconfdir ./mdwn2man ikiwiki 1 doc/usage.mdwn > ikiwiki.man ./mdwn2man ikiwiki-mass-rebuild 8 doc/ikiwiki-mass-rebuild.mdwn > ikiwiki-mass-rebuild.man ./mdwn2man ikiwiki-makerepo 1 doc/ikiwiki-makerepo.mdwn > ikiwiki-makerepo.man @@ -50,12 +53,15 @@ extra_build: $(outprogs) ikiwiki.setup docwiki ./mdwn2man ikiwiki-update-wikilist 1 doc/ikiwiki-update-wikilist.mdwn > ikiwiki-update-wikilist.man ./mdwn2man ikiwiki-calendar 1 doc/ikiwiki-calendar.mdwn > ikiwiki-calendar.man $(MAKE) -C po - $(SED) -i.bkp "s/Version:.*/Version: $(VER)/" ikiwiki.spec + $(PERL) -pi.bkp -e "s/Version:.*/Version: $(VER)/" ikiwiki.spec rm -f ikiwiki.spec.bkp docwiki: $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -refresh +sysconfdir: + $(PERL) -pi -e "s|/etc/ikiwiki|$(SYSCONFDIR)|g" $(sysconfdir_scripts) + extra_clean: $(PERL) -Iblib/lib $(extramodules) $(tflag) ikiwiki.in -setup docwiki.setup -clean rm -f *.man $(outprogs) ikiwiki.setup plugins/*.pyc @@ -70,7 +76,7 @@ underlay_install: for dir in `cd underlays && $(FIND) . -follow -type d`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f -not -name \\*.full.js -not -name \\*.full.css`; do \ - cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ done; \ done @@ -79,7 +85,7 @@ underlay_install: install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive for file in doc/ikiwiki/directive/*; do \ if [ -f "$$file" ]; then \ - cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \ fi \ done @@ -94,7 +100,7 @@ underlay_install: elif echo "$$file" | grep -q base.css; then \ :; \ elif [ -f "$$file" ]; then \ - cp -aL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ + cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \ fi \ done; \ @@ -106,7 +112,7 @@ extra_install: underlay_install install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ done for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \ - cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ + cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \ install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ done @@ -125,15 +131,15 @@ extra_install: underlay_install install -m 755 $$file $(DESTDIR)$(PREFIX)/lib/ikiwiki/plugins; \ done - install -d $(DESTDIR)$(PREFIX)/share/man/man1 - install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1 - install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-makerepo.1 - install -m 644 ikiwiki-transition.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-transition.1 - install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-update-wikilist.1 - install -m 644 ikiwiki-calendar.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki-calendar.1 + install -d $(DESTDIR)$(MANDIR)/man1 + install -m 644 ikiwiki.man $(DESTDIR)$(MANDIR)/man1/ikiwiki.1 + install -m 644 ikiwiki-makerepo.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-makerepo.1 + install -m 644 ikiwiki-transition.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-transition.1 + install -m 644 ikiwiki-update-wikilist.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-update-wikilist.1 + install -m 644 ikiwiki-calendar.man $(DESTDIR)$(MANDIR)/man1/ikiwiki-calendar.1 - install -d $(DESTDIR)$(PREFIX)/share/man/man8 - install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(PREFIX)/share/man/man8/ikiwiki-mass-rebuild.8 + install -d $(DESTDIR)$(MANDIR)/man8 + install -m 644 ikiwiki-mass-rebuild.man $(DESTDIR)$(MANDIR)/man8/ikiwiki-mass-rebuild.8 install -d $(DESTDIR)$(PREFIX)/sbin install ikiwiki-mass-rebuild $(DESTDIR)$(PREFIX)/sbin @@ -150,10 +156,10 @@ extra_install: underlay_install # These might fail if a regular user is installing into a home # directory. - -install -d $(DESTDIR)/etc/ikiwiki - -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki - -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki + -install -d $(DESTDIR)$(SYSCONFDIR) + -install -m 0644 wikilist $(DESTDIR)$(SYSCONFDIR) + -install -m 0644 auto.setup $(DESTDIR)$(SYSCONFDIR) + -install -m 0644 auto-blog.setup $(DESTDIR)$(SYSCONFDIR) # The git/hg plugins want to chdir; so does Devel::Cover. Skip those tests # to stop them hurting each other. From 17d012593acf260ee72e6fa7026ac48894ecf6b7 Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 13:26:56 -0500 Subject: [PATCH 318/460] repoint git branches and website --- doc/bugs/http_proxy_for_openid.mdwn | 6 ++++++ doc/install/discussion.mdwn | 7 +++++++ doc/plugins/contrib/mandoc.mdwn | 2 +- doc/users/schmonz.mdwn | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn index b7ae76aeb..566896ec3 100644 --- a/doc/bugs/http_proxy_for_openid.mdwn +++ b/doc/bugs/http_proxy_for_openid.mdwn @@ -78,3 +78,9 @@ Brian May >>>>> explicitly removed", so if ikiwiki can preferentially find that >>>>> installed, even with the above commit, `openid` won't be able to >>>>> traverse a proxy. --[[schmonz]] + +[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]] + +>>>>> I bollixed up my git, recloned, and reapplied the diffs, so +>>>>> that commit won't exist anymore. My proxy-related changes are +>>>>> now on a branch. --[[schmonz]] diff --git a/doc/install/discussion.mdwn b/doc/install/discussion.mdwn index b4ec5ebf4..b27cc4bac 100644 --- a/doc/install/discussion.mdwn +++ b/doc/install/discussion.mdwn @@ -349,3 +349,10 @@ I've attempted to mergeably patch these in my git, commit 5c177c96ac98b24aaa0613ca241fb113f1b32c55. --[[schmonz]] + +----- + +[[!template id=gitbranch branch=schmonz/portability author="[[schmonz]]"]] + +My git was in a screwy state so I started over. These changes are +now on a branch. --[[schmonz]] diff --git a/doc/plugins/contrib/mandoc.mdwn b/doc/plugins/contrib/mandoc.mdwn index 15d2826ed..672a268cc 100644 --- a/doc/plugins/contrib/mandoc.mdwn +++ b/doc/plugins/contrib/mandoc.mdwn @@ -1,5 +1,5 @@ [[!template id=plugin name=mandoc author="[[schmonz]]"]] -[[!template id=gitbranch branch=schmonz/master author="[[schmonz]]"]] +[[!template id=gitbranch branch=schmonz/mandoc author="[[schmonz]]"]] [[!tag type/format]] This plugin lets ikiwiki convert Unix man pages to HTML. It uses diff --git a/doc/users/schmonz.mdwn b/doc/users/schmonz.mdwn index ebfcf3cdd..fc7558b24 100644 --- a/doc/users/schmonz.mdwn +++ b/doc/users/schmonz.mdwn @@ -1,5 +1,5 @@ -[Amitai Schlair](http://www.netbsd.org/~schmonz/) finds himself -using ikiwiki for all sorts of things. His attempts at contributing: +[Amitai Schlair](http://www.schmonz.com/) finds himself using ikiwiki +for all sorts of things. His attempts at contributing: [[!map pages="!*/Discussion and ((link(users/schmonz) and plugins/*) or rcs/cvs)" From de04fd539805cc38e747ea684ada03d65903e34f Mon Sep 17 00:00:00 2001 From: Amitai Schlair Date: Sun, 8 Jan 2012 13:33:04 -0500 Subject: [PATCH 319/460] add TODO notes --- TODO.cvs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 TODO.cvs diff --git a/TODO.cvs b/TODO.cvs new file mode 100644 index 000000000..bf92a00ce --- /dev/null +++ b/TODO.cvs @@ -0,0 +1,20 @@ +* write test cases: + * web edits can create CVS/foo.mdwn (and think of case-insensitive "cvs/") + * binary file detection + * `cvsps` output format + * `findtimes()` +* `File::MimeInfo::default()` wrongly marks some text files `-kb` + * stop doing it + * find and fix existing +* instead of reading backwards, write one changeset per file and + `ls | sort -nr | head -100` + * obviates need for File::ReadBackwards +* parameterize `cvsps` command +* when is `-x` overkill? ever? +* `-b HEAD`, always? +* use `open()` instead of `system()` +* implement the time optimizations +* use `cvs_runcvs` everywhere `cvs` is run +* set up `log_accum` and `commit_prep` in `ikiwiki-makerepo` + * obviates need for `cvsps` +* historyurl overzealously escapes path slashes? From 28edab5ea9659878d6ab94428311ae21fb13c3a3 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Sun, 8 Jan 2012 23:56:21 -0400 Subject: [PATCH 320/460] thanks --- doc/todo/Improve_markdown_speed.mdwn | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/todo/Improve_markdown_speed.mdwn b/doc/todo/Improve_markdown_speed.mdwn index 5d5647e9b..de3230c9e 100644 --- a/doc/todo/Improve_markdown_speed.mdwn +++ b/doc/todo/Improve_markdown_speed.mdwn @@ -25,4 +25,9 @@ support of the C implementation of Markdown called >>> (Upskirt, discount... Who comes up with these names? Discount also >>> features a "NOPANTS" option.) --[[Joey]] +>>>> Thanks for doing this; it's given a well-needed speedup to my huge site. +>>>> +>>>> (At least "Discount" is related to "Mark Down" but I don't fathom "Upskirt" either.) +>>>> --[[KathrynAndersen]] + [[wishlist]] From cc4678e70d4b100e416b610aa00997b830f5b61d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jan 2012 12:17:24 -0400 Subject: [PATCH 321/460] releasing version 3.20120109 --- debian/changelog | 4 ++-- ikiwiki.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 57a27d82f..5acc7f9f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ikiwiki (3.20111230) UNRELEASED; urgency=low +ikiwiki (3.20120109) unstable; urgency=low * mdwn: Can use the discount markdown library, via the Text::Markdown::Discount perl module. This is preferred if available @@ -8,7 +8,7 @@ ikiwiki (3.20111230) UNRELEASED; urgency=low is still used.) * On Debian, depend on libtext-markdown-discount. - -- Joey Hess Sun, 01 Jan 2012 16:22:24 -0400 + -- Joey Hess Mon, 09 Jan 2012 11:49:14 -0400 ikiwiki (3.20111229) unstable; urgency=low diff --git a/ikiwiki.spec b/ikiwiki.spec index 675d29864..52b338111 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20111229 +Version: 3.20120109 Release: 1%{?dist} Summary: A wiki compiler From 6e53691fd43180abfa8c02f9fbf8860a1abf977a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 9 Jan 2012 12:17:35 -0400 Subject: [PATCH 322/460] add news item for ikiwiki 3.20120109 --- doc/news/version_3.20110715.mdwn | 5 ----- doc/news/version_3.20120109.mdwn | 9 +++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) delete mode 100644 doc/news/version_3.20110715.mdwn create mode 100644 doc/news/version_3.20120109.mdwn diff --git a/doc/news/version_3.20110715.mdwn b/doc/news/version_3.20110715.mdwn deleted file mode 100644 index da291dafb..000000000 --- a/doc/news/version_3.20110715.mdwn +++ /dev/null @@ -1,5 +0,0 @@ -ikiwiki 3.20110715 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * rename: Fix logic error that broke renaming pages when the attachment - plugin was disabled. - * rename: Fix logic error that bypassed the usual pagespec checks."""]] \ No newline at end of file diff --git a/doc/news/version_3.20120109.mdwn b/doc/news/version_3.20120109.mdwn new file mode 100644 index 000000000..de53c5d67 --- /dev/null +++ b/doc/news/version_3.20120109.mdwn @@ -0,0 +1,9 @@ +ikiwiki 3.20120109 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * mdwn: Can use the discount markdown library, via the + Text::Markdown::Discount perl module. This is preferred if available + since it's the fastest currently supported markdown library, speeding up + ikiwiki's markdown rendering by a factor of 40. + (However, when multimarkdown is enabled, Text::Markdown::Multimarkdown + is still used.) + * On Debian, depend on libtext-markdown-discount."""]] \ No newline at end of file From d3ad47829871a52c622fcb918251f72f11fec0a5 Mon Sep 17 00:00:00 2001 From: Javier Rojas Date: Tue, 10 Jan 2012 22:20:48 -0500 Subject: [PATCH 323/460] new forum post about search in attachments --- doc/forum/index_attachments.mdwn | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 doc/forum/index_attachments.mdwn diff --git a/doc/forum/index_attachments.mdwn b/doc/forum/index_attachments.mdwn new file mode 100644 index 000000000..8167a60f8 --- /dev/null +++ b/doc/forum/index_attachments.mdwn @@ -0,0 +1,9 @@ +Why doesn't the [[plugins/search]] plugin index attachments? are there any +technical reasons for not including this feature/option? (besides increased +processing time, and depending from external programs.) + +One could check for all non-mdwn files, convert them to text, if such thing is +possible, and add them as documents; I guess `needsbuild` would be a good site +for that. + +--[[jerojasro]] From 0278ddd6c1ba3fdfdc987aea8580b7fee452c226 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 11 Jan 2012 15:13:46 +0000 Subject: [PATCH 324/460] backlink(.) doesn't work --- doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn | 6 ++++++ .../backlink__40__.__41___doesn__39__t_work/test1.mdwn | 10 ++++++++++ .../backlink__40__.__41___doesn__39__t_work/test2.mdwn | 1 + 3 files changed, 17 insertions(+) create mode 100644 doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn create mode 100644 doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn create mode 100644 doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn new file mode 100644 index 000000000..6ec53d504 --- /dev/null +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn @@ -0,0 +1,6 @@ +It seems `backlink(.)` doesn't work, that is, it doesn't match pages linked +to from the current page. + +[[!inline pages=test1 raw=true]] + +— [[Jon]] diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn new file mode 100644 index 000000000..7fe3d70fe --- /dev/null +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn @@ -0,0 +1,10 @@ +test1 links to [[test2]]. + +`backlink(test1)`: + +[[!map pages="backlink(test1)"]] + +`backlink(.)`: + +[[!map pages="backlink(.)"]] + diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn new file mode 100644 index 000000000..a8b76dea9 --- /dev/null +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn @@ -0,0 +1 @@ +test2! From 52c1aecffc08448d344a195008cc7d6f7c5f3abb Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 11 Jan 2012 15:15:37 +0000 Subject: [PATCH 325/460] test doesn't work live. damnit. try varying pagespec --- doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn index 7fe3d70fe..52e1da969 100644 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn @@ -2,7 +2,7 @@ test1 links to [[test2]]. `backlink(test1)`: -[[!map pages="backlink(test1)"]] +[[!map pages="backlink(bugs/backlink(.) doesn't work/test1)"]] `backlink(.)`: From ca80578d4a015379ed6e505ca10417a12384c4e1 Mon Sep 17 00:00:00 2001 From: Jon Dowland Date: Wed, 11 Jan 2012 15:17:28 +0000 Subject: [PATCH 326/460] simplify bug report --- doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn | 8 +++++++- .../backlink__40__.__41___doesn__39__t_work/test1.mdwn | 10 ---------- .../backlink__40__.__41___doesn__39__t_work/test2.mdwn | 1 - 3 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn delete mode 100644 doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn index 6ec53d504..ede1d2fe3 100644 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn @@ -1,6 +1,12 @@ It seems `backlink(.)` doesn't work, that is, it doesn't match pages linked to from the current page. -[[!inline pages=test1 raw=true]] +If I have two test pages, `foo`, which links to `bar`, then (on the `foo` +page): + + * backlink(foo) lists 'bar' + * backlink(.) lists nothing + +tested with 3.20120109. — [[Jon]] diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn deleted file mode 100644 index 52e1da969..000000000 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test1.mdwn +++ /dev/null @@ -1,10 +0,0 @@ -test1 links to [[test2]]. - -`backlink(test1)`: - -[[!map pages="backlink(bugs/backlink(.) doesn't work/test1)"]] - -`backlink(.)`: - -[[!map pages="backlink(.)"]] - diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn deleted file mode 100644 index a8b76dea9..000000000 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work/test2.mdwn +++ /dev/null @@ -1 +0,0 @@ -test2! From eea37015275d914ed30f9dda0ee321f8e838df2f Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawmKyeW2G4jjSdnL1m6kPPtAiGFUBsnYCfY" Date: Wed, 11 Jan 2012 13:02:54 -0400 Subject: [PATCH 327/460] --- ...ranslation_page_using_po_plugin__63__.mdwn | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 doc/forum/How_to_create_first_translation_page_using_po_plugin__63__.mdwn diff --git a/doc/forum/How_to_create_first_translation_page_using_po_plugin__63__.mdwn b/doc/forum/How_to_create_first_translation_page_using_po_plugin__63__.mdwn new file mode 100644 index 000000000..e9dd6654b --- /dev/null +++ b/doc/forum/How_to_create_first_translation_page_using_po_plugin__63__.mdwn @@ -0,0 +1,24 @@ +I followed instructions at + + http://ikiwiki.info/plugins/po/ + +and added to `configfile` + + po_master_language => 'en|English', + po_slave_languages => [ 'zh|Chinese' ], + po_translatable_pages => '(* and !*/Discussion and !blog/*/comment_*)', + po_link_to => 'current' + +and did + + ikiwiki --setup configfile + +But I don't seem to see any change in the newly built site. + +How do I actually use po to create translation pages? + +1) I have existing pages that's in English. How do I add translated versions of some of those pages in the slave language? + +2) How do I add new pages with the primary language version and alternative versions in slave languages? + +The documentation of po is not explicit with what are the concrete steps. From 18a40243a18306d97051bd26a47887ea04679bed Mon Sep 17 00:00:00 2001 From: smv Date: Thu, 12 Jan 2012 21:20:47 -0400 Subject: [PATCH 328/460] --- doc/ikiwikiusers.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index b49ee82ca..1fc455298 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -78,6 +78,7 @@ Projects & Organizations * [The Progress Linux OS wiki](http://wiki.progress-linux.org/) * [Oxford Computer Society](http://www.ox.compsoc.net/) * [Russian OpenBSD Community wiki](http://wiki.openbsd.ru/) +* [Arcada Project](http://arcadaproject.org/) Personal sites and blogs ======================== From 08325b4da66d71f6c31cb269138c2ee4f279e786 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 13 Jan 2012 11:13:34 +0100 Subject: [PATCH 329/460] Propose patch to fix backlink(.) --- ...cklink__40__.__41___doesn__39__t_work.mdwn | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn index ede1d2fe3..cb7f156bc 100644 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn @@ -10,3 +10,47 @@ page): tested with 3.20120109. — [[Jon]] + +> The attached patch should fix it: + + + From 30512ac5f6a724bafb1095ab246e0648999f7b6c Mon Sep 17 00:00:00 2001 + From: Giuseppe Bilotta + Date: Fri, 13 Jan 2012 11:02:11 +0100 + Subject: [PATCH] backlink(.) should behave like backlink() + + Since commit c4d4cad3befbbd444d094cbeb0b6ebba3910a025, the single dot in + a pagespec can be used to mean the current page. While this worked + correctly in link() it didn't work in backlink(). Fix this by explicitly + checking the testpage in backlink against . and replacing it with the + current location if necessary. + --- + IkiWiki.pm | 10 ++++++++-- + 1 files changed, 8 insertions(+), 2 deletions(-) + + diff --git a/IkiWiki.pm b/IkiWiki.pm + index 08e242a..bc56501 100644 + --- a/IkiWiki.pm + +++ b/IkiWiki.pm + @@ -2647,8 +2647,14 @@ sub match_link ($$;@) { + } + + sub match_backlink ($$;@) { + - my $ret=match_link($_[1], $_[0], @_); + - $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS); + + my $page=shift; + + my $testpage=shift; + + my %params=@_; + + if ($testpage eq '.') { + + $testpage = $params{'location'} + + } + + my $ret=match_link($testpage, $page, @_); + + $ret->influences($testpage => $IkiWiki::DEPEND_LINKS); + return $ret; + } + + -- + 1.7.8.rc2.253.gdbf3 + + +> (you need to re-make IkiWiki for it to work) From 17fb0cf9f9897121d9996e8c23ac0056d29acd7b Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Fri, 13 Jan 2012 11:02:11 +0100 Subject: [PATCH 330/460] backlink(.) should behave like backlink() Since commit c4d4cad3befbbd444d094cbeb0b6ebba3910a025, the single dot in a pagespec can be used to mean the current page. While this worked correctly in link() it didn't work in backlink(). Fix this by explicitly checking the testpage in backlink against . and replacing it with the current location if necessary. --- IkiWiki.pm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index 08e242a1f..bc56501da 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -2647,8 +2647,14 @@ sub match_link ($$;@) { } sub match_backlink ($$;@) { - my $ret=match_link($_[1], $_[0], @_); - $ret->influences($_[1] => $IkiWiki::DEPEND_LINKS); + my $page=shift; + my $testpage=shift; + my %params=@_; + if ($testpage eq '.') { + $testpage = $params{'location'} + } + my $ret=match_link($testpage, $page, @_); + $ret->influences($testpage => $IkiWiki::DEPEND_LINKS); return $ret; } From 047d2c12e58e7871328fe1f114e865b7efdb487a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 13 Jan 2012 13:43:31 -0400 Subject: [PATCH 331/460] Make backlink(.) work. Thanks, Giuseppe Bilotta. --- debian/changelog | 6 ++++++ doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5acc7f9f6..142ca24ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ikiwiki (3.20120110) UNRELEASED; urgency=low + + * Make backlink(.) work. Thanks, Giuseppe Bilotta. + + -- Joey Hess Fri, 13 Jan 2012 13:43:14 -0400 + ikiwiki (3.20120109) unstable; urgency=low * mdwn: Can use the discount markdown library, via the diff --git a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn index cb7f156bc..534e5a01f 100644 --- a/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn +++ b/doc/bugs/backlink__40__.__41___doesn__39__t_work.mdwn @@ -13,6 +13,7 @@ tested with 3.20120109. > The attached patch should fix it: +>> [[applied|done]] thanks --[[Joey]] From 30512ac5f6a724bafb1095ab246e0648999f7b6c Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta From 2aabb4e0bc2eed608120a057804e7f13ca91c430 Mon Sep 17 00:00:00 2001 From: "http://joey.kitenet.net/" Date: Fri, 13 Jan 2012 13:46:50 -0400 Subject: [PATCH 332/460] Added a comment --- ...comment_1_18b9531d273292b45051eef6a306ca26._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/index_attachments/comment_1_18b9531d273292b45051eef6a306ca26._comment diff --git a/doc/forum/index_attachments/comment_1_18b9531d273292b45051eef6a306ca26._comment b/doc/forum/index_attachments/comment_1_18b9531d273292b45051eef6a306ca26._comment new file mode 100644 index 000000000..056c4139a --- /dev/null +++ b/doc/forum/index_attachments/comment_1_18b9531d273292b45051eef6a306ca26._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="http://joey.kitenet.net/" + nickname="joey" + subject="comment 1" + date="2012-01-13T17:46:49Z" + content=""" +I don't think there are really any reasons, other than noone having done it. + +Although it is worth noting that using additional libraries/programs to eg, pull exif data and comments out of image files and make it searchable, does potentially increase ikiwiki's attack surface. +"""]] From 5c9333af40455d61bf64d83337933928c83cd218 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" Date: Fri, 13 Jan 2012 15:35:00 -0400 Subject: [PATCH 333/460] --- ..._a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn new file mode 100644 index 000000000..c9081e007 --- /dev/null +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn @@ -0,0 +1,13 @@ +Since ikiwiki doesn't have much of a chance of working in windows, how about we compromise by making an offline ikiwiki editor for Windows? In fact, it might be advantageous to use it in Linux, too... + +It should be very simple: It would enter the source wiki and show the Markdown code by default, but would have an option to preview your page in another tab. + +Basic features: +* wikilinks, maps, images, inlinepages, and other basic functions should all work in the preview +* perhaps use local.css to format preview +* See the DVCS history with diffs and all +* have a discussion tab to easily see what other people have said about the page + +If we want to add some more bells and whistles, maybe we could throw in some buttons to insert markdown formatting (like in forums, mediawiki, or RES). + +Any thoughts on this? From 258412bd4368feecbd724ea88e7a98644c7fbec1 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" Date: Fri, 13 Jan 2012 15:45:31 -0400 Subject: [PATCH 334/460] --- ...4___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn index c9081e007..e23d3fddf 100644 --- a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__.mdwn @@ -3,6 +3,7 @@ Since ikiwiki doesn't have much of a chance of working in windows, how about we It should be very simple: It would enter the source wiki and show the Markdown code by default, but would have an option to preview your page in another tab. Basic features: + * wikilinks, maps, images, inlinepages, and other basic functions should all work in the preview * perhaps use local.css to format preview * See the DVCS history with diffs and all From 9e059c9709412c8e94d7b396bbc6af0ba2124f81 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 13 Jan 2012 18:30:33 -0400 Subject: [PATCH 335/460] Added a comment --- .../comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment new file mode 100644 index 000000000..26d773cb9 --- /dev/null +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2012-01-13T22:30:32Z" + content=""" +Feel free to make one if you want; nobody's stopping you. That's the most likely way of getting it done, because it's an itch you want scratched. But trying to get other people to scratch *your* itch is pretty much doomed to failure. +"""]] From e60b19ae65b4f736a21f2d448fd38436023e6974 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 13 Jan 2012 18:31:02 -0400 Subject: [PATCH 336/460] removed --- .../comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment deleted file mode 100644 index 26d773cb9..000000000 --- a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_101fb0f58d45a68f7dda4bf034b9b670._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="http://kerravonsen.dreamwidth.org/" - ip="202.173.183.92" - subject="comment 1" - date="2012-01-13T22:30:32Z" - content=""" -Feel free to make one if you want; nobody's stopping you. That's the most likely way of getting it done, because it's an itch you want scratched. But trying to get other people to scratch *your* itch is pretty much doomed to failure. -"""]] From 6b0ac401cdbe3a0e4a6997411542e1e0598ccbe5 Mon Sep 17 00:00:00 2001 From: "http://kerravonsen.dreamwidth.org/" Date: Fri, 13 Jan 2012 18:32:47 -0400 Subject: [PATCH 337/460] Added a comment --- .../comment_1_a66fd9d7ab4359784a5420cd899a1057._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_a66fd9d7ab4359784a5420cd899a1057._comment diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_a66fd9d7ab4359784a5420cd899a1057._comment b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_a66fd9d7ab4359784a5420cd899a1057._comment new file mode 100644 index 000000000..20fd763e2 --- /dev/null +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_1_a66fd9d7ab4359784a5420cd899a1057._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://kerravonsen.dreamwidth.org/" + ip="202.173.183.92" + subject="comment 1" + date="2012-01-13T22:32:47Z" + content=""" +It would probably be quite complex to write, and difficult to maintain. I don't think much of your chances of getting someone to write it. If you want to write it yourself, have fun doing so! +"""]] From 059671fc4562a6e4dd55e092ec9a31038b14ef45 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawlxhTpXjVrFtgk7H7La4U7dZSob-r0680U" Date: Fri, 13 Jan 2012 19:00:13 -0400 Subject: [PATCH 338/460] --- doc/bugs/UTF-8_in_attachment_filenames.mdwn | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 doc/bugs/UTF-8_in_attachment_filenames.mdwn diff --git a/doc/bugs/UTF-8_in_attachment_filenames.mdwn b/doc/bugs/UTF-8_in_attachment_filenames.mdwn new file mode 100644 index 000000000..6e79a4e06 --- /dev/null +++ b/doc/bugs/UTF-8_in_attachment_filenames.mdwn @@ -0,0 +1,15 @@ +I have ikiwiki_3.20111229 installed on Debian Squeeze (Perl 5.10.1, UTF-8 locale). The attachment plugin mangles UTF8-encoded attachment filenames if the name contains multibyte characters, e.g. "lää.png" becomes "lää.png". Apparently glob returns byte strings which are subject to implicit upgrading when concatenated with Perl strings. The following patch fixes the problem for me: + +---- + + diff -r -U 1 a/attachment.pm b/attachment.pm + --- a/attachment.pm 2012-01-13 23:07:29.000000000 +0200 + +++ b/attachment.pm 2012-01-13 23:33:07.000000000 +0200 + @@ -274,2 +274,3 @@ + foreach my $filename (glob("$dir/*")) { + + $filename=Encode::decode_utf8($filename); + next unless -f $filename; + @@ -347,2 +348,3 @@ + foreach my $file (glob("$dir/*")) { + + $file = Encode::decode_utf8($file); + next unless -f $file; From 71435d5508f82980e67173853e1c7097f70f6ee7 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" Date: Fri, 13 Jan 2012 23:14:38 -0400 Subject: [PATCH 339/460] Added a comment --- ...comment_2_3351ff773fea3f640f4036bb8c7c7efd._comment | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_2_3351ff773fea3f640f4036bb8c7c7efd._comment diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_2_3351ff773fea3f640f4036bb8c7c7efd._comment b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_2_3351ff773fea3f640f4036bb8c7c7efd._comment new file mode 100644 index 000000000..b83042c36 --- /dev/null +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_2_3351ff773fea3f640f4036bb8c7c7efd._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" + nickname="Lawrence" + subject="comment 2" + date="2012-01-14T03:14:38Z" + content=""" +Eh, ok, lol. I know that implementing most of the wiki features over again could be difficult, and so would a Git diff reader, but it shouldn't be that hard to get Wikilinking or a markdown previewer working. + +Could you point out some specific problems of this approach, so that it would help me out to do so? +"""]] From 8846180dcfb58188156541cd71007e002cd76081 Mon Sep 17 00:00:00 2001 From: "https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" Date: Sat, 14 Jan 2012 13:41:53 -0400 Subject: [PATCH 340/460] Added a comment --- ...mment_3_273b2b63a9af2bc4eeb030e026436687._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_3_273b2b63a9af2bc4eeb030e026436687._comment diff --git a/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_3_273b2b63a9af2bc4eeb030e026436687._comment b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_3_273b2b63a9af2bc4eeb030e026436687._comment new file mode 100644 index 000000000..e5eaf2c4c --- /dev/null +++ b/doc/forum/If_there__39__s_no_Windows_ikiwiki__44___how_about_a_WYSIWYG_ikiwiki_editor_for_Windows__63__/comment_3_273b2b63a9af2bc4eeb030e026436687._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawkr8GVPw30JBR34Btg-SKcS8gxEf7zpSJQ" + nickname="Lawrence" + subject="comment 3" + date="2012-01-14T17:41:52Z" + content=""" +Like, there's already a whole host of Markdown previewer apps that are pretty good. [Here's a](http://www.macworld.com/article/164744/2012/01/marked_excels_at_previewing_markdown_and_html_documents.html) popular one on Mac, and there are many more... + +There's also a plugin for Emacs that does so, and even resolves wikilinks (in some way..). + +But I'd have to say that I probably made a misleading title, WYSIWYG would probably be low on the list of needed features. And I'm just dumping an idea I have here in case anyone has any suggestions or comments, I'll probably do it myself in my free time. +"""]] From b38261a03aab649e3b194b7d1983536eee8a3684 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 15 Jan 2012 16:19:22 -0400 Subject: [PATCH 341/460] Workaround discount's eliding of