From 8e77b66aaee796a05109e78c67f647b924e17363 Mon Sep 17 00:00:00 2001
From: Plareplane <Plareplane@web>
Date: Wed, 1 Oct 2008 17:01:58 -0400
Subject:

---
 ...from_field_empty_if_rootpage_doesn__39__t_exist.mdwn | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn

(limited to 'doc')

diff --git a/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn b/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn
new file mode 100644
index 000000000..995f0836f
--- /dev/null
+++ b/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn
@@ -0,0 +1,17 @@
+If I put something like the below in my index.mdwn
+
+    <<!inline pages="posts/* and !*/discussion" rootpage="posts" show="10">>
+
+But posts doesn't exist, I get the following in index.html
+
+    <input type="hidden" name="do" value="blog" />
+    <input type="hidden" name="from" value="" />
+    <input type="hidden" name="subpage" value="1" />
+
+When I create posts (touch posts.mdwn), I get the following in index.html
+
+    <input type="hidden" name="do" value="blog" />
+    <input type="hidden" name="from" value="posts" />
+    <input type="hidden" name="subpage" value="1" />
+
+Bug?
-- 
cgit v1.2.3


From bf386e22f5fb65999c38668cb011bdf4ae26d72c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 17:29:03 -0400
Subject: inline: Fix handling of rootpage that doesn't exist.

It makes sense to use bestlink to determine which page rootpage refers to,
but if no page matches, just use the raw value.
---
 IkiWiki/Plugin/inline.pm                                             | 3 +++
 debian/changelog                                                     | 1 +
 doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn | 3 +++
 3 files changed, 7 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e0f33ef31..5d2ef5681 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -266,6 +266,9 @@ sub preprocess_inline (@) { #{{{
 		my $rootpage;
 		if (exists $params{rootpage}) {
 			$rootpage=bestlink($params{page}, $params{rootpage});
+			if (!length $rootpage) {
+				$rootpage=$params{rootpage};
+			}
 		}
 		else {
 			$rootpage=$params{page};
diff --git a/debian/changelog b/debian/changelog
index 1320e4f41..6c6eea205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ ikiwiki (2.66) UNRELEASED; urgency=low
     (Sponsored by The TOVA Company.)
   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
     authentication. Closes: #500524 
+  * inline: Fix handling of rootpage that doesn't exist.
 
  -- Joey Hess <joeyh@debian.org>  Thu, 25 Sep 2008 13:45:55 -0400
 
diff --git a/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn b/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn
index 995f0836f..61aeff244 100644
--- a/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn
+++ b/doc/bugs/inline_from_field_empty_if_rootpage_doesn__39__t_exist.mdwn
@@ -15,3 +15,6 @@ When I create posts (touch posts.mdwn), I get the following in index.html
     <input type="hidden" name="subpage" value="1" />
 
 Bug?
+
+> Yes, thanks for reminding me I need to do something about that... [[done]]
+> --[[Joey]]
-- 
cgit v1.2.3


From 45a2074071882b3bcb13b8983a4e5b6be0eda750 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 1 Oct 2008 17:31:21 -0400
Subject: update

---
 doc/git.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/git.mdwn b/doc/git.mdwn
index fc702b325..e5fef6a5a 100644
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -29,8 +29,10 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
+* `darcs` is being used to add darcs support.
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
 * `debian-stable` is used for updates to the old version included in
-  Debian's stable release.
+  Debian's stable release, and `debian-testing` is used for updates to
+  Debian's testing release.
-- 
cgit v1.2.3


From d30a7b12685d44312d89a2a1f7e24bb750556135 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 14:48:35 -0400
Subject: fix bug closure

---
 ...n_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn b/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
index b195f48ee..a74f6fcc7 100644
--- a/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
+++ b/doc/bugs/ddate_plugin_causes_websetup_to_change_timeformat__44___even_when_disabled.mdwn
@@ -4,4 +4,4 @@ Presumably this is because websetup loads all plugins, so IkiWiki::plugin::ddate
 
 (This bug seems oddly appropriate. Hail Eris)
 
-[[done fnord|done]]
+[[done_fnord|done]]
-- 
cgit v1.2.3


From 5c2309ada8d969bb4556e8d76d9d53668d7f9a83 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 14:49:40 -0400
Subject: typo

---
 doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
index a95378851..7daf52f2a 100644
--- a/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
+++ b/doc/bugs/Cannot_inline_pages_with_apostrophes_in_title.mdwn
@@ -1,3 +1,5 @@
-If I create a page whose title contains an apostrophe, then inlining that page produces nothing.  It looks like the inline plugin is failing to do the translation from apostrophe to "_39_" that other parts of the system do, so although one can make wikilinks to such pages and have them detected as existing (for instance, by the conditional plugin), inline looks in the wrong place and doesn't see the page.
+If I create a page whose title contains an apostrophe, then inlining that
+page produces nothing.  It looks like the inline plugin is failing to do
+the translation from apostrophe to `_39_` that other parts of the system do, so although one can make wikilinks to such pages and have them detected as existing (for instance, by the conditional plugin), inline looks in the wrong place and doesn't see the page.
 
 > I can't reproduce that (btw, an apostrophe would be `__39__`) --[[Joey]]
-- 
cgit v1.2.3


From 605ce027109fa2f3a9fe227d4e7e172ae2d6f7af Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 14:51:21 -0400
Subject: move to todo, response

---
 doc/bugs/Tags_list_in_page_footer_uses_basename.mdwn | 5 -----
 doc/todo/Tags_list_in_page_footer_uses_basename.mdwn | 8 ++++++++
 2 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 doc/bugs/Tags_list_in_page_footer_uses_basename.mdwn
 create mode 100644 doc/todo/Tags_list_in_page_footer_uses_basename.mdwn

(limited to 'doc')

diff --git a/doc/bugs/Tags_list_in_page_footer_uses_basename.mdwn b/doc/bugs/Tags_list_in_page_footer_uses_basename.mdwn
deleted file mode 100644
index 65406680a..000000000
--- a/doc/bugs/Tags_list_in_page_footer_uses_basename.mdwn
+++ /dev/null
@@ -1,5 +0,0 @@
-Page footers contain a list of links to the page and a list of tags applied to the page.  The link list uses the full path to pages.  However, the tag list contains only the basename of the tag pages.  For instance, if I tag a page with person1/foo and person2/bar, the tag list will just list foo and bar without the necessary disambiguating prefixes.
-
-I think the tag list should always contain the full path to the tag, with the tagbase value removed.
-
---[[JoshTriplett]]
diff --git a/doc/todo/Tags_list_in_page_footer_uses_basename.mdwn b/doc/todo/Tags_list_in_page_footer_uses_basename.mdwn
new file mode 100644
index 000000000..e2221bb84
--- /dev/null
+++ b/doc/todo/Tags_list_in_page_footer_uses_basename.mdwn
@@ -0,0 +1,8 @@
+Page footers contain a list of links to the page and a list of tags applied to the page.  The link list uses the full path to pages.  However, the tag list contains only the basename of the tag pages.  For instance, if I tag a page with person1/foo and person2/bar, the tag list will just list foo and bar without the necessary disambiguating prefixes.
+
+I think the tag list should always contain the full path to the tag, with the tagbase value removed.
+
+--[[JoshTriplett]]
+
+> What if tagbase is not used? I know this would clutter up the display of
+> my tags on several wikis, including this one. --[[Joey]]
-- 
cgit v1.2.3


From 6055dd3ef2390c4a4655f3a1de1ae71bec72508b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 14:53:11 -0400
Subject: close

---
 ...38__uuml__59___in_markup_makes_ikiwiki_not_un-escape_HTML_at_all.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/bugs/__38__uuml__59___in_markup_makes_ikiwiki_not_un-escape_HTML_at_all.mdwn b/doc/bugs/__38__uuml__59___in_markup_makes_ikiwiki_not_un-escape_HTML_at_all.mdwn
index 94a0e5445..eb3450a7e 100644
--- a/doc/bugs/__38__uuml__59___in_markup_makes_ikiwiki_not_un-escape_HTML_at_all.mdwn
+++ b/doc/bugs/__38__uuml__59___in_markup_makes_ikiwiki_not_un-escape_HTML_at_all.mdwn
@@ -44,3 +44,4 @@ unless that has security implications.
 >>
 >> I hope that's just a minor blemish. --liw
 
+>>> Sounds like this is [[done]] --[[Joey]]
-- 
cgit v1.2.3


From a1f4a9c5c9b93a93923d4dcd3a471bf409abd1a3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 14:54:52 -0400
Subject: ping

---
 doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn
index 61f6f733a..865637ea4 100644
--- a/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn
+++ b/doc/bugs/aggregate_plugin_should_honour_a_post__39__s_mctime.mdwn
@@ -11,3 +11,5 @@ appropriately, so that ikiwiki reflects the actual time of the post via the
 		if defined $mtime && $mtime <= time;
 
 >> I'll have to debug this, it's not working here... and this is an ikiwiki aggregator scraping another ikiwiki site.
+
+>>> Any news about this? --[[Joey]]
-- 
cgit v1.2.3


From 0b1b72b2ee714c470b28426c875bcd6887b386c8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 15:01:03 -0400
Subject: thoughts

---
 ...lert_user_about_an_invalid_pagespec_in_preferences.mdwn | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn
index 63c5b5e08..c835d9f98 100644
--- a/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn
+++ b/doc/bugs/lockedit_plugin_should_alert_user_about_an_invalid_pagespec_in_preferences.mdwn
@@ -1,3 +1,17 @@
 [[plugins/lockedit]] adds the form fields for a [[pagespec]] to preferences. This pagespec should be supplied "raw"; i.e., without quotes around it. Inexperienced users (such as [[myself|jondowland]]) may provide an invalid pagespec, such as one with quotes on it. This will be merrily accepted by the form, but will cause no locking to take place.
 
 Perhaps some validation should be performed on the pagespec and the form-submission return include "warning: this pagespec is invalid" or "warning: this pagespec does not match any existing pages" or similar.
+
+> The pagespec is no longer in the preferences and instead in the setup
+> file now. That makes warning about a problem with it harder.
+> 
+> Ikiwiki could try to detect this problem and warn at setup time to
+> stderr, I guess.
+> 
+> Main problem is I see little way to actually detect the problem you
+> described. A pagespec with quotes around it is valid. For example, the
+> pagespec `"foo or bar"` matches a page named `"foo` or a page named `bar"`.
+>
+> There are small classes of invalid pagespecs. For example, `(foo or bar`
+> is invalid due to having unbalanced parens, while `foo or and bar` 
+> has invalid syntax. It's possible to detect these, I guess ... --[[Joey]]
-- 
cgit v1.2.3


From c22c010e16ea36f9dc6b9f178812387e9fb1421f Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 15:11:17 -0400
Subject: response

---
 doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn b/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
index c57c20065..eead716d5 100644
--- a/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
+++ b/doc/bugs/blog_posts_not_added_to_mercurial_repo.mdwn
@@ -28,3 +28,23 @@ If I then edit the blog post, **then** the file gets commited and I can see the
 >>>> However, the part that seems a bit wrong to me, is this: even if my locale is utf8, I have to explicitly set a utf8 locale in the wiki's setup file, or the commit fails. It looks like ikiwiki is not using this machine's default locale, which is utf8. Also, I'm not getting any errors on apache's error log.
 
 >>>> Wouldn't it make sense to use the machine's default locale if 'locale' is commented out in the setup file?
+
+>>>>> Ikiwiki wrappers only allow whitelisted environment variables
+>>>>> through, and the locale environment variables are not included
+>>>>> currently.
+>>>>>
+>>>>> But that's not the whole story, because "machine's default locale"
+>>>>> is not very well defined. For example, my laptop is a Debian system.
+>>>>> It has a locale setting in /etc/environment (`LANG="en_US.UTF-8"`).
+>>>>> But even if I start apache, making sure that LANG is set and exported
+>>>>> in the environment, CGI scripts apache runs do not see LANG in their 
+>>>>> environment. (I notice that `/etc/init.d/apache` explocitly
+>>>>> forces LANG=C. But CGI scripts don't see the C value either.)
+>>>>> Apache simply does not propigate its runtime environment to CGI
+>>>>> scripts, and this is probably to comply with the CGI specification
+>>>>> (although it doesn't seem to completly rule out CGI's being passed
+>>>>> other variables).
+>>>>>
+>>>>> If mercurial needs a utf-8 locale, I guess the mercurial plugin needs
+>>>>> to check if it's not in one, and do something sane (either fail
+>>>>> earlier, or complain, or strip utf-8 out of comments). --[[Joey]]
-- 
cgit v1.2.3


From c885a0107bf3f0fbedc53ec22e359942e6c8170a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 15:12:57 -0400
Subject: this is a wishlist todo item, rename too

---
 doc/bugs/relative_links.mdwn                       | 27 --------------------
 ...ttp_or_https_in_urls_to_allow_serving_both.mdwn | 29 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 27 deletions(-)
 delete mode 100644 doc/bugs/relative_links.mdwn
 create mode 100644 doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn

(limited to 'doc')

diff --git a/doc/bugs/relative_links.mdwn b/doc/bugs/relative_links.mdwn
deleted file mode 100644
index a1dc8f373..000000000
--- a/doc/bugs/relative_links.mdwn
+++ /dev/null
@@ -1,27 +0,0 @@
-It looks like all links in websites are absolute paths, this has some limitations:
-
-* If connecting to website via https://... all links will take you back to http://
-* Makes it harder to mirror website via HTML version, as all links have to be updated.
-
-It would be good if relative paths could be used instead, so the transport method isn't changed unless specifically requested.
-
--- Brian May
-
-> Er, which absolute links are you talking about? If you view the source
-> to this page, you'll find links such as "../favicon.ico", "../style.css",
-> "../../", and "../". The only absolute links are to CGIs and the w3c DTD.
-> --[[Joey]]
-
->> The problem is within the CGI script. The links within the HTML page are all absolute, including links to the css file.
->> Having a http links within a HTML page retrieved using https upset most browsers (I think). Also if I push cancel on the edit page in https, I end up at at http page. -- Brian May
-
->>> Ikiwiki does not hardcode http links anywhere. If you don't want
->>> it to use such links, change your configuration to use https
->>> consistently. --[[Joey]]
-
-Errr... That is not a solution, that is a work around. ikiwiki does not hard code the absolute paths, but absolute paths are hard coded in the configuration file. If you want to serve your website so that the majority of users can see it as http, including in rss feeds (this allows proxy caches to cache the contents and has reduced load requirements), but editing is done via https for increased security, it is not possible. I have some ideas how this can be implemented (as ikiwiki has the absolute path to the CGI script and the absolute path to the destination, it should be possible to generate a relative path from one to the other), although some minor issues still need to be resolved. -- Brian May
-
-I noticed the links to the images on <http://ikiwiki.info/recentchanges/> are also absolute, that is <http://ikiwiki.info/wikiicons/diff.png>; this seems surprising, as the change.tmpl file uses &lt;TMPL_VAR BASEURL&gt;
-which seems to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL set? -- Brian May
-
-> The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]]
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
new file mode 100644
index 000000000..65b7cd96a
--- /dev/null
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -0,0 +1,29 @@
+It looks like all links in websites are absolute paths, this has some limitations:
+
+* If connecting to website via https://... all links will take you back to http://
+* Makes it harder to mirror website via HTML version, as all links have to be updated.
+
+It would be good if relative paths could be used instead, so the transport method isn't changed unless specifically requested.
+
+-- Brian May
+
+> Er, which absolute links are you talking about? If you view the source
+> to this page, you'll find links such as "../favicon.ico", "../style.css",
+> "../../", and "../". The only absolute links are to CGIs and the w3c DTD.
+> --[[Joey]]
+
+>> The problem is within the CGI script. The links within the HTML page are all absolute, including links to the css file.
+>> Having a http links within a HTML page retrieved using https upset most browsers (I think). Also if I push cancel on the edit page in https, I end up at at http page. -- Brian May
+
+>>> Ikiwiki does not hardcode http links anywhere. If you don't want
+>>> it to use such links, change your configuration to use https
+>>> consistently. --[[Joey]]
+
+Errr... That is not a solution, that is a work around. ikiwiki does not hard code the absolute paths, but absolute paths are hard coded in the configuration file. If you want to serve your website so that the majority of users can see it as http, including in rss feeds (this allows proxy caches to cache the contents and has reduced load requirements), but editing is done via https for increased security, it is not possible. I have some ideas how this can be implemented (as ikiwiki has the absolute path to the CGI script and the absolute path to the destination, it should be possible to generate a relative path from one to the other), although some minor issues still need to be resolved. -- Brian May
+
+I noticed the links to the images on <http://ikiwiki.info/recentchanges/> are also absolute, that is <http://ikiwiki.info/wikiicons/diff.png>; this seems surprising, as the change.tmpl file uses &lt;TMPL_VAR BASEURL&gt;
+which seems to do the right thing in page.tmpl, but not for change.tmpl. Where is BASEURL set? -- Brian May
+
+> The use of an absolute baseurl in change.tmpl is a special case. --[[Joey]]
+
+[[wishlist]]
-- 
cgit v1.2.3


From bc259c593fbe0ad794c0eb5315f4d8dd7cc2499c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:32:53 -0400
Subject: move

---
 doc/todo/donmarti.mdwn  | 2 --
 doc/users/donmarti.mdwn | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)
 delete mode 100644 doc/todo/donmarti.mdwn
 create mode 100644 doc/users/donmarti.mdwn

(limited to 'doc')

diff --git a/doc/todo/donmarti.mdwn b/doc/todo/donmarti.mdwn
deleted file mode 100644
index bafec7170..000000000
--- a/doc/todo/donmarti.mdwn
+++ /dev/null
@@ -1,2 +0,0 @@
-Don Marti home page: <http://zgp.org/~dmarti/>  email: <dmarti@zgp.org>
-
diff --git a/doc/users/donmarti.mdwn b/doc/users/donmarti.mdwn
new file mode 100644
index 000000000..bafec7170
--- /dev/null
+++ b/doc/users/donmarti.mdwn
@@ -0,0 +1,2 @@
+Don Marti home page: <http://zgp.org/~dmarti/>  email: <dmarti@zgp.org>
+
-- 
cgit v1.2.3


From 781957ad917b77b77bd3d2b0982cb5d9f4a5c429 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:33:25 -0400
Subject: wishlist

---
 doc/todo/fastcgi_or_modperl_installation_instructions.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/fastcgi_or_modperl_installation_instructions.mdwn b/doc/todo/fastcgi_or_modperl_installation_instructions.mdwn
index 2d3805394..74dcaeb61 100644
--- a/doc/todo/fastcgi_or_modperl_installation_instructions.mdwn
+++ b/doc/todo/fastcgi_or_modperl_installation_instructions.mdwn
@@ -8,3 +8,5 @@ There has got to be a way to run the CGI wrapper under fastcgi or modperl (apach
 > 
 > I've not looked at what code changes fastcgi or modperl would require in
 > ikiwiki. --[[Joey]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From daa095689abd9e8b00625d9b3495fa391e532d88 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:33:55 -0400
Subject: tag

---
 doc/todo/using_meta_titles_for_parentlinks.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/using_meta_titles_for_parentlinks.html b/doc/todo/using_meta_titles_for_parentlinks.html
index 8a42bf4a8..651b7fa0f 100644
--- a/doc/todo/using_meta_titles_for_parentlinks.html
+++ b/doc/todo/using_meta_titles_for_parentlinks.html
@@ -1,5 +1,5 @@
 It is possible to set a Page-Title in the meta-plugin, but that one isn't
-reused in parentlinks. This patch may fix it.
+reused in parentlinks. This [[patch]] may fix it.
 
 <ul>
 <li> I give pagetitle the full path to a page.
-- 
cgit v1.2.3


From 4857ac45854026f36340abca13aa35e23bcd5d2d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:34:52 -0400
Subject: tag

---
 doc/todo/Separate_OpenIDs_and_usernames.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Separate_OpenIDs_and_usernames.mdwn b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
index 3dd48767e..2cd52e8c4 100644
--- a/doc/todo/Separate_OpenIDs_and_usernames.mdwn
+++ b/doc/todo/Separate_OpenIDs_and_usernames.mdwn
@@ -7,3 +7,5 @@ I see this being implemented in one of two possible ways. The easiest seems like
 A slightly more complex next step would be to request sreg from the provider and, if provided, automatically set the identity's username and email address from the provided persona. If username login to accounts with blank passwords is disabled, then you have the best of both worlds. Passwordless signin, human-friendly attribution, automatic setting of preferences.
 
 Unfortunately I don't speak Perl, so hopefully someone thinks these suggestions are good enough to code up. I've hacked on openid code in Ruby before, so hopefully these changes aren't all that difficult to implement. Even if you don't get any data via sreg, you're no worse off than where you are now, so I don't think there'd need to be much in the way of error/sanity-checking of returned data. If it's null or not available then no big deal, typing in a username is no sweat.
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 3388e1474ab7478cef8aa84c6cbde48241072feb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:35:46 -0400
Subject: tag

---
 doc/todo/access_keys.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/access_keys.mdwn b/doc/todo/access_keys.mdwn
index ea367a197..52031ffc1 100644
--- a/doc/todo/access_keys.mdwn
+++ b/doc/todo/access_keys.mdwn
@@ -66,3 +66,5 @@ Tabbing isn't quite the same as a nice shortcut key.  There's always
 Conkeror...
 
 --[[JasonBlevins]], March 22, 2008 10:35 EDT
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 3634d40a38299caf2fb38e6c346c0e771324a0f2 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:36:53 -0400
Subject: tag

---
 doc/todo/mtime.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/mtime.mdwn b/doc/todo/mtime.mdwn
index 92cbe84ff..22d4cd4ff 100644
--- a/doc/todo/mtime.mdwn
+++ b/doc/todo/mtime.mdwn
@@ -12,3 +12,5 @@ plugin changes page content without any younger page being involved. And
 editing one of the html templates and rebuilding the wiki can change every
 page. All of these need to be reflected in the file mtime to avoid caching
 problems.
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 6d8cb05ddcd0ab0f47cf2f38ae69b596fe53891a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:38:13 -0400
Subject: tag

---
 doc/todo/Add_space_before_slash_in_parent_links.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/Add_space_before_slash_in_parent_links.mdwn b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
index 0dbcef68d..40a334032 100644
--- a/doc/todo/Add_space_before_slash_in_parent_links.mdwn
+++ b/doc/todo/Add_space_before_slash_in_parent_links.mdwn
@@ -1,4 +1,4 @@
-This patch adds a space before the forward-slash in the the parent links. There is already a space after the slash.
+This [[patch]] adds a space before the forward-slash in the the parent links. There is already a space after the slash.
 
 > I intentionally put the space after the slash and not before, because I
 > like how it looks that way. So I don't plan to apply this patch unless a
-- 
cgit v1.2.3


From 7c07a20b367c0d400fc4adf661bd11ccce2d58ab Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:39:08 -0400
Subject: done

---
 doc/todo/remove_basewiki_redir_pages.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/remove_basewiki_redir_pages.mdwn b/doc/todo/remove_basewiki_redir_pages.mdwn
index 247801a8d..fe9e49ce2 100644
--- a/doc/todo/remove_basewiki_redir_pages.mdwn
+++ b/doc/todo/remove_basewiki_redir_pages.mdwn
@@ -1,2 +1,4 @@
 In version 2.16, several redir pages were put in for [[basewiki]] pages
 that were moved. These redirs should be removed later. --[[Joey]]
+
+[[done]]
-- 
cgit v1.2.3


From de235168153178e148a9a474f609c3fb043bd1ea Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:40:07 -0400
Subject: close

---
 doc/todo/improved_parentlinks_styling.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/improved_parentlinks_styling.mdwn b/doc/todo/improved_parentlinks_styling.mdwn
index fc2d7f986..64130a616 100644
--- a/doc/todo/improved_parentlinks_styling.mdwn
+++ b/doc/todo/improved_parentlinks_styling.mdwn
@@ -5,3 +5,5 @@ usable in browsers like w3m that don't support styled uls. ikiwiki does use
 styled uls for other things, such as the action bar, but displaying that as
 a simple unstyled list in a simple browser works well and makes sense. For
 parent links, it does not. --[[Joey]]
+
+[[done]]
-- 
cgit v1.2.3


From 0b89d442331bd62b4dc2da4f7fcbca59d5ca21eb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:42:33 -0400
Subject: rename

---
 doc/bugs/ikiwiki_is_not_truly_localizable.mdwn     | 47 ----------------------
 .../some_strings_are_not_internationalized.mdwn    | 47 ++++++++++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 delete mode 100644 doc/bugs/ikiwiki_is_not_truly_localizable.mdwn
 create mode 100644 doc/bugs/some_strings_are_not_internationalized.mdwn

(limited to 'doc')

diff --git a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn b/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn
deleted file mode 100644
index a1b38257a..000000000
--- a/doc/bugs/ikiwiki_is_not_truly_localizable.mdwn
+++ /dev/null
@@ -1,47 +0,0 @@
-A lot of strings in ikiwiki are hardcoded and not taken for locales resources through gettext. This is bad because ikiwiki is thus difficult to spread for non-english users.
-
-I mean that, for instance in CGI.pm, line like:
-
-`my @buttons=("Save Page", "Preview", "Cancel");`
-
-should be written as
-
-`my @buttons=(gettext("Save Page"), gettext("Preview"), gettext("Cancel"));`
-
-> Yes, these need to be fixed. But note that the localised texts come back
-> into ikiwiki and are used in various places, including plugins.
-> Including, possibly, third-party plugins. So localising the buttons would
-> seem to require converting from the translations back into the C locale
-> when the form is posted. --[[Joey]]
-
->> Wouldn't it be more easy to change all calls to the corrects ones (including in plugins) ?
->> For instance in the same file (CGI.pm): `elsif ($form->submitted eq gettext("Save Page")) {`.
->> That way no conversion to the C locale is needed.
->> gettext use should just be publicized in documentation (at least in [[plugins/write]]). --[[bbb]]
-
->>> It would be easy, but it could break third-party plugins that hardcode
->>> the english strings. It's also probably less efficient to run gettext
->>> over and over. --[[Joey]]
-
-In standards templates things seems wrongly written too. For instance in page.tmpl line like:
-
-`<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>`
-
-should be written as
-
-`<li><a href="<TMPL_VAR EDITURL>" rel="nofollow"><TMPL_VAR EDITURL_TEXT</a></li>`
-
-with EDITURL_TEXT variable initialized in Render.pm through a gettext call. 
-
-Am I wrong ?
-
-> No, that's not a sane way to localise the templates. The templates can be
-> translated by making a copy and modifying it, or by using a tool to
-> generate .mo files from the templates, and generate translated templates
-> from .po files. (See [[todo/l10n]] for one attempt.) But pushing the
-> localisation of random strings in the templates through the ikiwiki
-> program defeats the purpose of having templates at all. --[[Joey]]
-
-If not I can spend some time preparing patches for such corrections if it can help.
-
--- [[/users/bbb]]
diff --git a/doc/bugs/some_strings_are_not_internationalized.mdwn b/doc/bugs/some_strings_are_not_internationalized.mdwn
new file mode 100644
index 000000000..a1b38257a
--- /dev/null
+++ b/doc/bugs/some_strings_are_not_internationalized.mdwn
@@ -0,0 +1,47 @@
+A lot of strings in ikiwiki are hardcoded and not taken for locales resources through gettext. This is bad because ikiwiki is thus difficult to spread for non-english users.
+
+I mean that, for instance in CGI.pm, line like:
+
+`my @buttons=("Save Page", "Preview", "Cancel");`
+
+should be written as
+
+`my @buttons=(gettext("Save Page"), gettext("Preview"), gettext("Cancel"));`
+
+> Yes, these need to be fixed. But note that the localised texts come back
+> into ikiwiki and are used in various places, including plugins.
+> Including, possibly, third-party plugins. So localising the buttons would
+> seem to require converting from the translations back into the C locale
+> when the form is posted. --[[Joey]]
+
+>> Wouldn't it be more easy to change all calls to the corrects ones (including in plugins) ?
+>> For instance in the same file (CGI.pm): `elsif ($form->submitted eq gettext("Save Page")) {`.
+>> That way no conversion to the C locale is needed.
+>> gettext use should just be publicized in documentation (at least in [[plugins/write]]). --[[bbb]]
+
+>>> It would be easy, but it could break third-party plugins that hardcode
+>>> the english strings. It's also probably less efficient to run gettext
+>>> over and over. --[[Joey]]
+
+In standards templates things seems wrongly written too. For instance in page.tmpl line like:
+
+`<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>`
+
+should be written as
+
+`<li><a href="<TMPL_VAR EDITURL>" rel="nofollow"><TMPL_VAR EDITURL_TEXT</a></li>`
+
+with EDITURL_TEXT variable initialized in Render.pm through a gettext call. 
+
+Am I wrong ?
+
+> No, that's not a sane way to localise the templates. The templates can be
+> translated by making a copy and modifying it, or by using a tool to
+> generate .mo files from the templates, and generate translated templates
+> from .po files. (See [[todo/l10n]] for one attempt.) But pushing the
+> localisation of random strings in the templates through the ikiwiki
+> program defeats the purpose of having templates at all. --[[Joey]]
+
+If not I can spend some time preparing patches for such corrections if it can help.
+
+-- [[/users/bbb]]
-- 
cgit v1.2.3


From dd7cd7e4ac33d39e248623f0827c233311130219 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:43:03 -0400
Subject: fix tag

---
 doc/todo/tmplvars_plugin.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/tmplvars_plugin.mdwn b/doc/todo/tmplvars_plugin.mdwn
index fe163fb5f..f7d06a579 100644
--- a/doc/todo/tmplvars_plugin.mdwn
+++ b/doc/todo/tmplvars_plugin.mdwn
@@ -1,6 +1,6 @@
 A simple plugin to allow per-page customization of a template by passing paramaters to HTML::Template. For those times when a whole pagetemplate is too much work. --Ethan
 
-[[!tags patch]]
+[[!tag patch]]
 
     #!/usr/bin/perl
     package IkiWiki::Plugin::tmplvars;
-- 
cgit v1.2.3


From c2c1438e4970b850925883a3b37ea6472ed7e1fd Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:49:51 -0400
Subject: tag

---
 doc/todo/CVS_backend.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/CVS_backend.mdwn b/doc/todo/CVS_backend.mdwn
index c14d8af4f..f99d09b22 100644
--- a/doc/todo/CVS_backend.mdwn
+++ b/doc/todo/CVS_backend.mdwn
@@ -8,3 +8,5 @@ Original discussion:
 >
 >> No, although the existing svn backend could fairly esily be modified into
 >> a CVS backend, by someone who doesn't mind working with CVS. --[[Joey]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From ab2cc5040c58923fab4ad72b94fd1044b14acd2c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 2 Oct 2008 17:52:20 -0400
Subject: close

---
 doc/todo/optimisations.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/optimisations.mdwn b/doc/todo/optimisations.mdwn
index 582c03ef1..b8c4fa0da 100644
--- a/doc/todo/optimisations.mdwn
+++ b/doc/todo/optimisations.mdwn
@@ -3,6 +3,13 @@ Ikiwiki has already been optimised a lot, however..
 * Look at splitting up CGI.pm. But note that too much splitting can slow
   perl down.
 
+  > It's split enough, or possibly more than enough, now. :-)
+
 * The backlinks calculation code is still O(N^2) on the number of pages.
   If backlinks info were stored in the index file, it would go down to
   constant time for iterative builds, though still N^2 for rebuilds.
+
+  > Seems to be O(Num Pages * Num Links in Page), or effectively O(N)
+  > pages for most wikis.
+
+[[done]]
-- 
cgit v1.2.3


From e2ae3963d5363dce6b8bf8206847560116de27e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 5 Oct 2008 19:25:15 -0400
Subject: add news item for ikiwiki 2.66

---
 doc/news/version_2.62.mdwn | 41 -----------------------------------------
 doc/news/version_2.66.mdwn | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 41 deletions(-)
 delete mode 100644 doc/news/version_2.62.mdwn
 create mode 100644 doc/news/version_2.66.mdwn

(limited to 'doc')

diff --git a/doc/news/version_2.62.mdwn b/doc/news/version_2.62.mdwn
deleted file mode 100644
index e91c9a2ab..000000000
--- a/doc/news/version_2.62.mdwn
+++ /dev/null
@@ -1,41 +0,0 @@
-News for ikiwiki 2.62:
-
-   The teximg plugin now has a configurable LaTeX preamble.
-
-   As part of this change the `mchem` LaTeX package has been removed from
-   the default LaTeX preamble as it wasn't included in many TeX installations.
-   The previous behaviour can be restored by adding the following to your
-   ikiwiki setup:
-
-	 teximg_prefix => '\documentclass{scrartcl}
-	         \usepackage[version=3]{mhchem}
-	         \usepackage{amsmath}
-	         \usepackage{amsfonts}
-	         \usepackage{amssymb}
-	         \pagestyle{empty}
-	         \begin{document}',
-
-   In addition, the rendering mechanism has been changed to use `dvipng` by
-   default, if available.
-
-ikiwiki 2.62 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Avoid using cp -a (again). (HenrikBrixAndersen)
-   * Avoid using hostname -f for portability to eg, OS X, use Net::Domain
-     instead, and prompt if it fails.
-   * Fix bug in wikiname sanitisation in the setup automator.
-   * ikiwiki-makerepo: Added support for monotone. (Thomas Keller)
-   * map: The fix for #449285 was buggy and broke display of parents in certian
-     circumstances.
-   * teximg: The prefix is configurable, and has changed to not include the
-     nonstandard mhchem by default. (willu)
-   * teximg: dvipng is used if available to render images. Its output is
-     antialiased and better than dvips. If not available, the old dvips+convert
-     chain will be used. (willu)
-   * Drop suggests on texlive-science, add suggests on dvipng.
-   * listdirectives: New plugin. (willu)
-   * filecheck: New plugin factoring out the PageSpec additions that were
-     originally part of the attachment plugin.
-   * edittemplate: Don't wipe out edits on preview.
-   * color: New plugin from ptecza.
-   * autoindex: Avoid re-adding previously deleted (or renamed) pages."""]]
diff --git a/doc/news/version_2.66.mdwn b/doc/news/version_2.66.mdwn
new file mode 100644
index 000000000..029c7a1b9
--- /dev/null
+++ b/doc/news/version_2.66.mdwn
@@ -0,0 +1,39 @@
+ikiwiki 2.66 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * recentchanges: Fix redirects to non-page files.
+   * aggregate: Avoid uninitialized value warnings for pages with no recorded
+     ctime.
+   * attachment: Add admin() pagespec to test if the uploading user is a wiki
+     admin.
+   * git: Fix handling of utf-8 filenames in recentchanges.
+   * tag: Make edit link for new tags ensure that the tags are created
+     inside tagbase, when it's set.
+   * template: Make edit link for new templates ensure the page is located
+     under toplevel templates directory.
+   * htmlscrubber: Add a config setting that can be used to disable the
+     scrubber acting on a set of pages.
+   * Expand usage message and add --help. Closes: #[500344](http://bugs.debian.org/500344)
+   * Beautify urls used in various places. (smcv)
+   * Export pagetitle, titlepage, linkpage.
+   * htmltidy: Avoid returning undef if tidy fails. Also avoid returning the
+     untidied content if tidy crashes. In either case, it seems best to tidy
+     the content to nothing.
+   * htmltidy: Avoid spewing tidy errors to stderr.
+   * Reorganize index file, add a format version field. Upgrades to the new
+     index format should be transparent.
+   * Add %wikistate, which is like %pagestate except not specific to a given
+     page, and is preserved across rebuilds.
+   * editpage: Be more aggressive (and less buggy) about cleaning up
+     temporary files rendered during page preview.
+   * Add an indexpages option, which causes foo/index.mdwn to be the source
+     for page foo when foo.mdwn doesn't exist. Also, when it's enabled,
+     creating a new page will save it to foo/index.mdwn by default.
+     Closes: #[474611](http://bugs.debian.org/474611)
+     (Sponsored by The TOVA Company.)
+   * httpauth: Document that ikiwiki.cgi has to be in a directory subject to
+     authentication. Closes: #[500524](http://bugs.debian.org/500524)
+   * inline: Fix handling of rootpage that doesn't exist.
+   * attachment: Support adding attachments to pages even as they are being
+     created.
+   * remove, rename: Allow acting on attachments as a page is being created.
+   * Updated French translation. Closes: #[500929](http://bugs.debian.org/500929)"""]]
\ No newline at end of file
-- 
cgit v1.2.3


From 8747b12b571490a54a80b313a2ae24bd1232e23c Mon Sep 17 00:00:00 2001
From: lschiere <lschiere@web>
Date: Mon, 6 Oct 2008 00:32:20 -0400
Subject:

---
 doc/tips/Importing_posts_from_Wordpress/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 doc/tips/Importing_posts_from_Wordpress/discussion.mdwn

(limited to 'doc')

diff --git a/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn b/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
new file mode 100644
index 000000000..3b328649e
--- /dev/null
+++ b/doc/tips/Importing_posts_from_Wordpress/discussion.mdwn
@@ -0,0 +1,4 @@
+When I attempt to use this script, I get the following error:
+warning: Not updating refs/heads/master (new tip 26b1787fca04f2f9772b6854843fe99fe06e6088 does not contain fc0ad65d14d88fd27a6cee74c7cef3176f6900ec).  I have git 1.5.6.5, any ideas?
+
+Thanks!!
-- 
cgit v1.2.3


From 8380dfc2c367a418062c6cf994b46a71d296ac21 Mon Sep 17 00:00:00 2001
From: foob <foob@web>
Date: Mon, 6 Oct 2008 05:15:50 -0400
Subject:

---
 doc/examples/blog/posts/foo.mdwn | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 doc/examples/blog/posts/foo.mdwn

(limited to 'doc')

diff --git a/doc/examples/blog/posts/foo.mdwn b/doc/examples/blog/posts/foo.mdwn
new file mode 100644
index 000000000..08d51525a
--- /dev/null
+++ b/doc/examples/blog/posts/foo.mdwn
@@ -0,0 +1,2 @@
+# Hello World
+## ikiwiki
-- 
cgit v1.2.3


From 7d36f1000a83176df979325e7ea5446ef1d7f501 Mon Sep 17 00:00:00 2001
From: foob <foob@web>
Date: Mon, 6 Oct 2008 05:16:34 -0400
Subject:

---
 doc/examples/blog/posts/foo.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/examples/blog/posts/foo.mdwn b/doc/examples/blog/posts/foo.mdwn
index 08d51525a..987556a15 100644
--- a/doc/examples/blog/posts/foo.mdwn
+++ b/doc/examples/blog/posts/foo.mdwn
@@ -1,2 +1,7 @@
 # Hello World
 ## ikiwiki
+
+
+
+# Hello World
+### ikiwiki
-- 
cgit v1.2.3


From 8e2362a4995bafaaf87bd6385927bcb51e951d05 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@web>
Date: Mon, 6 Oct 2008 05:28:53 -0400
Subject: done, documented workaround

---
 doc/todo/else_parameter_for_map_plugin.mdwn | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/todo/else_parameter_for_map_plugin.mdwn b/doc/todo/else_parameter_for_map_plugin.mdwn
index 12a91b4ee..981e50d43 100644
--- a/doc/todo/else_parameter_for_map_plugin.mdwn
+++ b/doc/todo/else_parameter_for_map_plugin.mdwn
@@ -1,4 +1,4 @@
-[[!tag patch]]
+[[!tag patch done]]
 
 [[plugins/map]] (and I) could benefit from a bonus parameter:
 
@@ -45,3 +45,12 @@ documentation yet, I'm waiting for feedback first, but I'll do it for sure. -- [
 >>>> someone might want to be able to handle an "else" case where a
 >>>> pagespec expands to nothing. And adding else cases for all of them
 >>>> could be a bit much. --[[Joey]]
+
+>>>>> Agreed, and tagging as done. For the record, here is the [[plugins/template]] I use:
+
+        \[[!if test="<TMPL_VAR raw_pages>"
+        then="""<TMPL_VAR intro>
+        [[!map pages="<TMPL_VAR raw_pages>"]]"""
+        else="<TMPL_VAR else>"]]
+
+>>>>> --[[intrigeri]]
-- 
cgit v1.2.3


From f504df45bc57a03aae5173e871bcd5a39e706475 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 6 Oct 2008 12:53:55 -0400
Subject: remove post, since this is intended to be an example people copy and
 use, it should not get cluttered up

---
 doc/examples/blog/posts/foo.mdwn | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 doc/examples/blog/posts/foo.mdwn

(limited to 'doc')

diff --git a/doc/examples/blog/posts/foo.mdwn b/doc/examples/blog/posts/foo.mdwn
deleted file mode 100644
index 987556a15..000000000
--- a/doc/examples/blog/posts/foo.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-# Hello World
-## ikiwiki
-
-
-
-# Hello World
-### ikiwiki
-- 
cgit v1.2.3


From cbde407de8cb26d227410f5fc47db842a55c0a4a Mon Sep 17 00:00:00 2001
From: bstpierre <bstpierre@web>
Date: Tue, 7 Oct 2008 12:33:25 -0400
Subject:

---
 doc/users/bstpierre.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/users/bstpierre.mdwn

(limited to 'doc')

diff --git a/doc/users/bstpierre.mdwn b/doc/users/bstpierre.mdwn
new file mode 100644
index 000000000..327d25016
--- /dev/null
+++ b/doc/users/bstpierre.mdwn
@@ -0,0 +1 @@
+Brian St. Pierre is **<brian@bstpierre.org>**
-- 
cgit v1.2.3


From 5b2b4a28a6e8d04b05f3bd3904c245aef5758716 Mon Sep 17 00:00:00 2001
From: bstpierre <bstpierre@web>
Date: Tue, 7 Oct 2008 12:34:52 -0400
Subject:

---
 doc/todo/modify_page_filename_in_plugin.mdwn | 33 ++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 doc/todo/modify_page_filename_in_plugin.mdwn

(limited to 'doc')

diff --git a/doc/todo/modify_page_filename_in_plugin.mdwn b/doc/todo/modify_page_filename_in_plugin.mdwn
new file mode 100644
index 000000000..7c0a909eb
--- /dev/null
+++ b/doc/todo/modify_page_filename_in_plugin.mdwn
@@ -0,0 +1,33 @@
+I'm writing a plugin to wikify c/c++ code.
+
+By default ikiwiki generates xxx.html for a file called xxx.c.
+
+The problem is that I occasionally have xxx.c and xxx.h in the same directory and there's a filename collision.
+
+My solution is to allow plugins to provide a hook that sets the pagename. --[[/users/bstpierre]]
+
+    --- /usr/share/perl5/IkiWiki.pm.ORIG    2008-10-03 14:12:50.000000000 -0400
+    +++ /usr/share/perl5/IkiWiki.pm 2008-10-07 11:57:26.000000000 -0400
+    @@ -196,11 +196,32 @@
+
+     sub pagename ($) { #{{{
+            my $file=shift;
+
+            my $type=pagetype($file);
+    +
+    +   if(defined $type &&
+    +      exists $hooks{pagename} &&
+    +      exists $hooks{pagename}{$type}) {
+    +
+    +      return $hooks{pagename}{$type}{call}($file);
+    +
+    +   } else {
+    +
+            my $page=$file;
+            $page=~s/\Q.$type\E*$// if defined $type;
+            return $page;
+    +   }
+     } #}}}
+
+     sub htmlpage ($) { #{{{
+
-- 
cgit v1.2.3


From 6caed59b9c852836371f9542636da290350c0e8b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 8 Oct 2008 17:09:24 -0400
Subject: remove page_locking page, move content to plugins/lockedit

Also, removed obsolte para about using the prefs page to configure locked
pages, that interface is obsolete, hidden by default, and the locked_pages
setup file setting is used instead.
---
 doc/features.mdwn         |  8 ++++----
 doc/page_locking.mdwn     | 17 -----------------
 doc/plugins/lockedit.mdwn | 18 +++++++++++++++++-
 doc/todo/ACL.mdwn         |  2 +-
 4 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 100644 doc/page_locking.mdwn

(limited to 'doc')

diff --git a/doc/features.mdwn b/doc/features.mdwn
index e9be02be4..395ca0981 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -146,10 +146,10 @@ Thanks to subpages, every page can easily and automatically have a
 
 ### Edit controls
 
-Wiki admins can [[lock_pages|page_locking]] so that only other admins can
-edit them. Or a wiki can be set up to allow anyone to edit Discussion
-pages, but only registered users to edit other pages. These are just two
-possibilities, since page edit controls can be changed via plugins.
+Wiki admins can lock_pages so that only other admins can edit them. Or a
+wiki can be set up to allow anyone to edit Discussion pages, but only
+registered users to edit other pages. These are just two possibilities,
+since page edit controls can be changed via plugins.
 
 ### [[PageHistory]]
 
diff --git a/doc/page_locking.mdwn b/doc/page_locking.mdwn
deleted file mode 100644
index 21f4fb027..000000000
--- a/doc/page_locking.mdwn
+++ /dev/null
@@ -1,17 +0,0 @@
-The administrator of a wiki can choose to lock some pages, which allows
-only the admin to edit them using the online interface. This doesn't
-prevent anyone who can commit to the underlying revision control system
-from editing the pages, however.
-
-To lock a page, log into the wiki as whatever user is configured as the
-admin, and in your Preferences page, you'll find a field listing locked
-pages. This is a [[ikiwiki/PageSpec]], so you have a fair bit of control
-over what kinds of pages to lock. For example, you could choose to lock all
-pages created before 2006, or all pages that are linked to from the page
-named "locked". More usually though, you'll just list some names of pages
-to lock.
-
-One handy thing to do if you're using ikiwiki for your blog is to lock 
-"* and !*/Discussion". This prevents others from adding to or modifying
-posts in your blog, while still letting them comment via the Discussion
-pages.
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index 01b0f157d..07abce1af 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -1,4 +1,20 @@
 [[!template id=plugin name=lockedit core=1 author="[[Joey]]"]]
 [[!tag type/auth]]
 
-This plugin enables [[page_locking]]. It is enabled by default.
+This plugin allows the administrator of a wiki to lock some pages, limiting
+who can edit them using the online interface. This doesn't prevent anyone
+who can commit to the underlying revision control system from editing the
+pages, however.
+
+The `locked_pages` setting configures what pages are locked. It is a
+[[ikiwiki/PageSpec]], so you have lots of control over what kind of pages
+to lock. For example, you could choose to lock all pages created before
+2006, or all pages that are linked to from the page named "locked". More
+usually though, you'll just list some names of pages to lock.
+
+One handy thing to do if you're using ikiwiki for your blog is to lock
+"* and !*/Discussion". This prevents others from adding to or modifying
+posts in your blog, while still letting them comment via the Discussion
+pages.
+
+Wiki administrators can always edit locked pages.
diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index fb496c518..373f89364 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -32,7 +32,7 @@ Also see [[!debbug 443346]].
 >  defined in the wiki pages (although they could be).
 >* Given the previous two points, can't this be done with the `match_user()`
 > function defined by the [[plugins/attachment]] plugin (see the [[ikiwiki/pagespec/attachment]] pagespec info)
-> and the [[plugins/lockedit]] plugin (see [[page_locking]])?
+> and the [[plugins/lockedit]] plugin?
 >
 > For example, add the following to your config file:
 >
-- 
cgit v1.2.3


From 240b58c36c0d3ed9ecf89fc005364b769d0caf8e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 8 Oct 2008 17:12:06 -0400
Subject: fix name of admin() pagespec test

---
 doc/ikiwiki/pagespec/attachment.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 234fcdf02..1287fc0a4 100644
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -41,7 +41,7 @@ additional tests:
   Tests whether the attachment is being uploaded by a user with the
   specified username. If openid is enabled, an openid can also be put here.
 
-* adminuser()
+* admin()
 
   Tests whether the attachment is being uploded by one of the wiki admins.
 
-- 
cgit v1.2.3


From d3ca495e61e0e9d66095b1aba2fd1995e564e841 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 8 Oct 2008 17:47:38 -0400
Subject: lockedit: Support specifying which users (and IP addresses) a page is
 locked for. This supports most of the ACL type things users have been wanting
 to be done. Closes: #443346 (It does not control who can read a page, but
 that's out of scope for ikiwiki.)

---
 IkiWiki.pm                           | 57 +++++++++++++++++++++++++++
 IkiWiki/Plugin/attachment.pm         | 59 ----------------------------
 IkiWiki/Plugin/lockedit.pm           | 10 ++++-
 debian/changelog                     |  4 ++
 doc/ikiwiki/pagespec.mdwn            | 10 ++++-
 doc/ikiwiki/pagespec/attachment.mdwn | 45 ++++++----------------
 doc/plugins/lockedit.mdwn            |  6 ++-
 doc/todo/ACL.mdwn                    |  3 +-
 po/es.po                             | 75 ++++++++++++++++++++++--------------
 po/ikiwiki.pot                       | 12 +++---
 10 files changed, 147 insertions(+), 134 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 82370f430..633c51381 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1919,4 +1919,61 @@ sub match_creation_year ($$;@) { #{{{
 	}
 } #}}}
 
+sub match_user ($$;@) { #{{{
+	shift;
+	my $user=shift;
+	my %params=@_;
+	
+	if (! exists $params{user}) {
+		return IkiWiki::FailReason->new("no user specified");
+	}
+
+	if (defined $params{user} && lc $params{user} eq lc $user) {
+		return IkiWiki::SuccessReason->new("user is $user");
+	}
+	elsif (! defined $params{user}) {
+		return IkiWiki::FailReason->new("not logged in");
+	}
+	else {
+		return IkiWiki::FailReason->new("user is $params{user}, not $user");
+	}
+} #}}}
+
+sub match_admin ($$;@) { #{{{
+	shift;
+	shift;
+	my %params=@_;
+	
+	if (! exists $params{user}) {
+		return IkiWiki::FailReason->new("no user specified");
+	}
+
+	if (defined $params{user} && IkiWiki::is_admin($params{user})) {
+		return IkiWiki::SuccessReason->new("user is an admin");
+	}
+	elsif (! defined $params{user}) {
+		return IkiWiki::FailReason->new("not logged in");
+	}
+	else {
+		return IkiWiki::FailReason->new("user is not an admin");
+	}
+} #}}}
+
+sub match_ip ($$;@) { #{{{
+	shift;
+	my $ip=shift;
+	my %params=@_;
+	
+	if (! exists $params{ip}) {
+		return IkiWiki::FailReason->new("no IP specified");
+	}
+
+	if (defined $params{ip} && lc $params{ip} eq lc $ip) {
+		return IkiWiki::SuccessReason->new("IP is $ip");
+	}
+	else {
+		return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
+	}
+} #}}}
+
 1
diff --git a/IkiWiki/Plugin/attachment.pm b/IkiWiki/Plugin/attachment.pm
index 2d1fe51cf..dcac3e820 100644
--- a/IkiWiki/Plugin/attachment.pm
+++ b/IkiWiki/Plugin/attachment.pm
@@ -289,63 +289,4 @@ sub attachment_list ($) { #{{{
 	return sort { $b->{mtime_raw} <=> $a->{mtime_raw} || $a->{link} cmp $b->{link} } @ret;
 } #}}}
 
-package IkiWiki::PageSpec;
-
-sub match_user ($$;@) { #{{{
-	shift;
-	my $user=shift;
-	my %params=@_;
-	
-	if (! exists $params{user}) {
-		return IkiWiki::FailReason->new("no user specified");
-	}
-
-	if (defined $params{user} && lc $params{user} eq lc $user) {
-		return IkiWiki::SuccessReason->new("user is $user");
-	}
-	elsif (! defined $params{user}) {
-		return IkiWiki::FailReason->new("not logged in");
-	}
-	else {
-		return IkiWiki::FailReason->new("user is $params{user}, not $user");
-	}
-} #}}}
-
-sub match_admin ($$;@) { #{{{
-	shift;
-	shift;
-	my %params=@_;
-	
-	if (! exists $params{user}) {
-		return IkiWiki::FailReason->new("no user specified");
-	}
-
-	if (defined $params{user} && IkiWiki::is_admin($params{user})) {
-		return IkiWiki::SuccessReason->new("user is an admin");
-	}
-	elsif (! defined $params{user}) {
-		return IkiWiki::FailReason->new("not logged in");
-	}
-	else {
-		return IkiWiki::FailReason->new("user is not an admin");
-	}
-} #}}}
-
-sub match_ip ($$;@) { #{{{
-	shift;
-	my $ip=shift;
-	my %params=@_;
-	
-	if (! exists $params{ip}) {
-		return IkiWiki::FailReason->new("no IP specified");
-	}
-
-	if (defined $params{ip} && lc $params{ip} eq lc $ip) {
-		return IkiWiki::SuccessReason->new("IP is $ip");
-	}
-	else {
-		return IkiWiki::FailReason->new("IP is $params{ip}, not $ip");
-	}
-} #}}}
-
 1
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 7462de41c..f6cac6cdd 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -37,7 +37,10 @@ sub canedit ($$) { #{{{
 	return undef if defined $user && IkiWiki::is_admin($user);
 
 	if (defined $config{locked_pages} && length $config{locked_pages} &&
-	    pagespec_match($page, $config{locked_pages})) {
+	    pagespec_match($page, $config{locked_pages},
+		    user => $session->param("name"),
+		    ip => $ENV{REMOTE_ADDR},
+	    )) {
 		if (! defined $user ||
 		    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
 			return sub { IkiWiki::needsignin($cgi, $session) };
@@ -51,7 +54,10 @@ sub canedit ($$) { #{{{
 
 	# XXX deprecated, should be removed eventually
 	foreach my $admin (@{$config{adminuser}}) {
-		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"))) {
+		if (pagespec_match($page, IkiWiki::userinfo_get($admin, "locked_pages"),
+		    user => $session->param("name"),
+		    ip => $ENV{REMOTE_ADDR},
+		)) {
 			if (! defined $user ||
 			    ! IkiWiki::userinfo_get($session->param("name"), "regdate")) {
 				return sub { IkiWiki::needsignin($cgi, $session) };
diff --git a/debian/changelog b/debian/changelog
index a7b4cbb00..9947c8a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ ikiwiki (2.67) UNRELEASED; urgency=low
 
   * remove: Avoid $_ breakage. (Stupid, stupid perl.)
   * Updated Spanish translation from Victor Moral.
+  * lockedit: Support specifying which users (and IP addresses) a page
+    is locked for. This supports most of the ACL type things users have been
+    wanting to be done. Closes: #443346 (It does not control who can read a
+    page, but that's out of scope for ikiwiki.)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 06 Oct 2008 16:07:50 -0400
 
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 156e3f6ca..c78666c40 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -22,8 +22,7 @@ match all pages except for Discussion pages and the SandBox:
 
 	* and !SandBox and !*/Discussion
 
-Some more elaborate limits can be added to what matches using any of these
-functions:
+Some more elaborate limits can be added to what matches using these functions:
 
 * "`link(page)`" - match only pages that link to a given page (or glob)
 * "`backlink(page)`" - match only pages that a given page links to
@@ -41,6 +40,13 @@ functions:
 * "`title(glob)`", "`author(glob)`", "`authorurl(glob)`",
   "`license(glob)`", "`copyright(glob)`" - match pages that have the given
   metadata, matching the specified glob.
+* "`user(username)`" - tests whether a modification is being made by a
+  user with the specified username. If openid is enabled, an openid can also
+  be put here.
+* "`admin()`" - tests whether a modification is being made by one of the
+  wiki admins.
+* "`ip(address)`" - tests whether a modification is being made from the
+  specified IP address.
 
 For example, to match all pages in a blog that link to the page about music
 and were written in 2005:
diff --git a/doc/ikiwiki/pagespec/attachment.mdwn b/doc/ikiwiki/pagespec/attachment.mdwn
index 1287fc0a4..2d33db748 100644
--- a/doc/ikiwiki/pagespec/attachment.mdwn
+++ b/doc/ikiwiki/pagespec/attachment.mdwn
@@ -16,45 +16,22 @@ check all attachments for virii, something like this could be used:
 The regular [[ikiwiki/PageSpec]] syntax is expanded with the following
 additional tests:
 
-* maxsize(size)
-
-  Tests whether the attachment is no larger than the specified size.
-  The size defaults to being in bytes, but "kb", "mb", "gb" etc can be
-  used to specify the units.
+* "`maxsize(size)`" - Tests whether the attachment is no larger than the
+  specified size. The size defaults to being in bytes, but "kb", "mb", "gb"
+  etc can be used to specify the units.
   
-* minsize(size)
-
-  Tests whether the attachment is no smaller than the specified size.
-
-* ispage()
+* "`minsize(size)`" - Tests whether the attachment is no smaller than the
+  specified size.
 
-  Tests whether the attachment will be treated by ikiwiki as a wiki page.
-  (Ie, if it has an extension of ".mdwn", or of any other enabled page
-  format).
+* "`ispage()`" - Tests whether the attachment will be treated by ikiwiki as a
+  wiki page. (Ie, if it has an extension of ".mdwn", or of any other enabled
+  page format).
 
   So, if you don't want to allow wiki pages to be uploaded as attachments,
   use `!ispage()` ; if you only want to allow wiki pages to be uploaded
   as attachments, use `ispage()`.
 
-* user(username)
-
-  Tests whether the attachment is being uploaded by a user with the
-  specified username. If openid is enabled, an openid can also be put here.
-
-* admin()
-
-  Tests whether the attachment is being uploded by one of the wiki admins.
-
-* ip(address)
-
-  Tests whether the attacment is being uploaded from the specified IP
-  address.
-
-* mimetype(foo/bar)
-
-  This checks the MIME type of the attachment. You can include a glob
-  in the type, for example `mimetype(image/*)`.
-
-* virusfree()
+* "`mimetype(foo/bar)`" - This checks the MIME type of the attachment. You can
+  include a glob in the type, for example `mimetype(image/*)`.
 
-  Checks the attachment with an antiviral program.
+* "`virusfree()`" - Checks the attachment with an antiviral program.
diff --git a/doc/plugins/lockedit.mdwn b/doc/plugins/lockedit.mdwn
index 07abce1af..71bf232ab 100644
--- a/doc/plugins/lockedit.mdwn
+++ b/doc/plugins/lockedit.mdwn
@@ -17,4 +17,8 @@ One handy thing to do if you're using ikiwiki for your blog is to lock
 posts in your blog, while still letting them comment via the Discussion
 pages.
 
-Wiki administrators can always edit locked pages.
+Wiki administrators can always edit locked pages. The [[ikiwiki/PageSpec]]
+can specify that some pages are not locked for some users. For example,
+"important_page and !user(joey)" locks `important_page` while still
+allowing joey to edit it, while "!*/Discussion and user(bob)" prevents bob
+from editing pages except for Discussion pages.
diff --git a/doc/todo/ACL.mdwn b/doc/todo/ACL.mdwn
index 373f89364..e9fb2717f 100644
--- a/doc/todo/ACL.mdwn
+++ b/doc/todo/ACL.mdwn
@@ -44,7 +44,8 @@ Also see [[!debbug 443346]].
 >> Yes, writing per-user commit ACLs has become somewhat easier with recent
 >> features. Breaking `match_user` out of attachment, and making the
 >> lockedit plugin pass`user` and `ip` params when it calls `pagespec_match`
->> would be sufficient. --[[Joey]]
+>> would be sufficient. And [[done]], configurable via
+>> [[plugin/lockedit]]'s `locked_pages`. --[[Joey]]
 
 I am considering giving this a try, implementing it as a module.
 Here is how I see it:
diff --git a/po/es.po b/po/es.po
index 34a4d3669..ff02ea86a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-29 17:12-0400\n"
+"POT-Creation-Date: 2008-10-08 17:34-0400\n"
 "PO-Revision-Date: 2008-10-07 12:44+0200\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -48,7 +48,7 @@ msgstr "Las preferencias se han guardado."
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
-#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1153
+#: ../IkiWiki/CGI.pm:385 ../IkiWiki/CGI.pm:386 ../IkiWiki.pm:1166
 msgid "Error"
 msgstr "Error"
 
@@ -58,7 +58,8 @@ msgstr "Contenido añadido activado vía web."
 
 #: ../IkiWiki/Plugin/aggregate.pm:89
 msgid "Nothing to do right now, all feeds are up-to-date!"
-msgstr "¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
+msgstr ""
+"¡ No hay nada que hacer, todas las fuentes de noticias están actualizadas !"
 
 #: ../IkiWiki/Plugin/aggregate.pm:216
 #, perl-format
@@ -159,20 +160,20 @@ msgstr "ya existe una página de nombre %s"
 msgid "prohibited by allowed_attachments"
 msgstr "prohibido por la claúsula allowed_attachments"
 
-#: ../IkiWiki/Plugin/attachment.pm:188
+#: ../IkiWiki/Plugin/attachment.pm:189
 msgid "bad attachment filename"
 msgstr "nombre de archivo adjunto erróneo"
 
-#: ../IkiWiki/Plugin/attachment.pm:230
+#: ../IkiWiki/Plugin/attachment.pm:231
 msgid "attachment upload"
 msgstr "enviado el adjunto"
 
-#: ../IkiWiki/Plugin/autoindex.pm:103
+#: ../IkiWiki/Plugin/autoindex.pm:105
 msgid "automatic index generation"
 msgstr "creación de índice automática"
 
 #: ../IkiWiki/Plugin/brokenlinks.pm:33 ../IkiWiki/Plugin/editpage.pm:261
-#: ../IkiWiki/Plugin/inline.pm:323 ../IkiWiki/Plugin/opendiscussion.pm:26
+#: ../IkiWiki/Plugin/inline.pm:326 ../IkiWiki/Plugin/opendiscussion.pm:26
 #: ../IkiWiki/Plugin/orphans.pm:37 ../IkiWiki/Render.pm:79
 #: ../IkiWiki/Render.pm:149
 msgid "discussion"
@@ -303,20 +304,20 @@ msgstr "falta el parámetro pages"
 msgid "unknown sort type %s"
 msgstr "no conozco este tipo de ordenación %s"
 
-#: ../IkiWiki/Plugin/inline.pm:282
+#: ../IkiWiki/Plugin/inline.pm:285
 msgid "Add a new post titled:"
 msgstr "Añadir una entrada nueva titulada:"
 
-#: ../IkiWiki/Plugin/inline.pm:298
+#: ../IkiWiki/Plugin/inline.pm:301
 #, perl-format
 msgid "nonexistant template %s"
 msgstr "la plantilla %s no existe "
 
-#: ../IkiWiki/Plugin/inline.pm:331 ../IkiWiki/Render.pm:83
+#: ../IkiWiki/Plugin/inline.pm:334 ../IkiWiki/Render.pm:83
 msgid "Discussion"
 msgstr "Comentarios"
 
-#: ../IkiWiki/Plugin/inline.pm:568
+#: ../IkiWiki/Plugin/inline.pm:571
 msgid "RPC::XML::Client not found, not pinging"
 msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna"
 
@@ -324,13 +325,15 @@ msgstr "No he encontrado el componente RPC::XML::Client, no envío señal alguna
 msgid "failed to run dot"
 msgstr "no he podido ejecutar el programa dot"
 
-#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60
+#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
+#, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr "La página %s está bloqueada y no puede modificarse"
 
 #: ../IkiWiki/Plugin/mdwn.pm:44
 msgid "multimarkdown is enabled, but Text::MultiMarkdown is not installed"
-msgstr "el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
+msgstr ""
+"el modo multimarkdown está activo, pero no está instalado Text::MultiMarkdown"
 
 #: ../IkiWiki/Plugin/mdwn.pm:67
 #, perl-format
@@ -393,7 +396,9 @@ msgstr "Error creando la cuenta de usuario."
 
 #: ../IkiWiki/Plugin/passwordauth.pm:257
 msgid "No email address, so cannot email password reset instructions."
-msgstr "No tengo dirección de correo electrónica, así que no puedo enviar instrucciones para reiniciar la contraseña"
+msgstr ""
+"No tengo dirección de correo electrónica, así que no puedo enviar "
+"instrucciones para reiniciar la contraseña"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:291
 msgid "Failed to send mail"
@@ -401,7 +406,9 @@ msgstr "No he podido enviar el mensaje de correo electrónico"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:293
 msgid "You have been mailed password reset instructions."
-msgstr "Las instrucciones para reinicar la contraseña se le han enviado por correo electrónico"
+msgstr ""
+"Las instrucciones para reinicar la contraseña se le han enviado por correo "
+"electrónico"
 
 #: ../IkiWiki/Plugin/passwordauth.pm:328
 msgid "incorrect password reset url"
@@ -558,16 +565,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:112
+#: ../IkiWiki/Plugin/remove.pm:115
 #, perl-format
 msgid "confirm removal of %s"
 msgstr "confirme el borrado de %s"
 
-#: ../IkiWiki/Plugin/remove.pm:148
+#: ../IkiWiki/Plugin/remove.pm:152
 msgid "Please select the attachments to remove."
 msgstr "Por favor seleccione los adjuntos que serán borrados."
 
-#: ../IkiWiki/Plugin/remove.pm:188
+#: ../IkiWiki/Plugin/remove.pm:192
 msgid "removed"
 msgstr "borrado"
 
@@ -604,20 +611,20 @@ msgstr "cambiando de nombre %s"
 msgid "Also rename SubPages and attachments"
 msgstr "También cambia de nombre las subpáginas y los adjuntos"
 
-#: ../IkiWiki/Plugin/rename.pm:223
+#: ../IkiWiki/Plugin/rename.pm:224
 msgid "Only one attachment can be renamed at a time."
 msgstr "Únicamente un adjunto puede ser renombrado a la vez."
 
-#: ../IkiWiki/Plugin/rename.pm:226
+#: ../IkiWiki/Plugin/rename.pm:227
 msgid "Please select the attachment to rename."
 msgstr "Por favor, seleccione el adjunto al que cambiar el nombre."
 
-#: ../IkiWiki/Plugin/rename.pm:332
+#: ../IkiWiki/Plugin/rename.pm:338
 #, perl-format
 msgid "rename %s to %s"
 msgstr "%s cambia de nombre a %s"
 
-#: ../IkiWiki/Plugin/rename.pm:484
+#: ../IkiWiki/Plugin/rename.pm:490
 #, perl-format
 msgid "update for rename of %s to %s"
 msgstr "actualizado el cambio de nombre de %s a %s"
@@ -762,13 +769,17 @@ msgstr "complementos"
 #: ../IkiWiki/Plugin/websetup.pm:395
 msgid ""
 "The configuration changes shown below require a wiki rebuild to take effect."
-msgstr "Los cambios en la configuración que se muestran más abajo precisan una reconstrucción del wiki para tener efecto."
+msgstr ""
+"Los cambios en la configuración que se muestran más abajo precisan una "
+"reconstrucción del wiki para tener efecto."
 
 #: ../IkiWiki/Plugin/websetup.pm:399
 msgid ""
 "For the configuration changes shown below to fully take effect, you may need "
 "to rebuild the wiki."
-msgstr "Para que los cambios en la configuración mostrados más abajo tengan efecto, es posible que necesite reconstruir el wiki."
+msgstr ""
+"Para que los cambios en la configuración mostrados más abajo tengan efecto, "
+"es posible que necesite reconstruir el wiki."
 
 #: ../IkiWiki/Plugin/websetup.pm:433
 #, perl-format
@@ -780,7 +791,9 @@ msgstr "<p class=\"error\">Error: %s finaliza con código distinto de cero (%s)"
 msgid ""
 "symlink found in srcdir path (%s) -- set allow_symlinks_before_srcdir to "
 "allow this"
-msgstr "encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use la directiva allow_symlinks_before_srcdir para permitir la acción"
+msgstr ""
+"encontrado un enlace simbólico en la ruta del directorio fuente (%s) -- use "
+"la directiva allow_symlinks_before_srcdir para permitir la acción"
 
 #: ../IkiWiki/Render.pm:277 ../IkiWiki/Render.pm:302
 #, perl-format
@@ -926,12 +939,14 @@ msgstr "no puedo emplear varios complementos rcs"
 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:1136
+#: ../IkiWiki.pm:1149
 #, 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"
+msgstr ""
+"se ha detectado en la página %s un bucle de preprocesado en la iteración "
+"número %i"
 
-#: ../IkiWiki.pm:1645
+#: ../IkiWiki.pm:1658
 msgid "yes"
 msgstr "si"
 
@@ -949,7 +964,9 @@ msgstr "¿ Qué sistema de control de versiones empleará ?"
 
 #: ../auto.setup:20
 msgid "What wiki user (or openid) will be wiki admin?"
-msgstr "¿ Qué usuario del wiki (ó identificador openid) será el administrador del wiki ? "
+msgstr ""
+"¿ Qué usuario del wiki (ó identificador openid) será el administrador del "
+"wiki ? "
 
 #: ../auto.setup:23
 msgid "What is the domain name of the web server?"
diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index dbbf986d5..f07f2bf62 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: 2008-10-05 19:11-0400\n"
+"POT-Creation-Date: 2008-10-08 17:34-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "attachment upload"
 msgstr ""
 
-#: ../IkiWiki/Plugin/autoindex.pm:103
+#: ../IkiWiki/Plugin/autoindex.pm:105
 msgid "automatic index generation"
 msgstr ""
 
@@ -321,7 +321,7 @@ msgstr ""
 msgid "failed to run dot"
 msgstr ""
 
-#: ../IkiWiki/Plugin/lockedit.pm:46 ../IkiWiki/Plugin/lockedit.pm:60
+#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66
 #, perl-format
 msgid "%s is locked and cannot be edited"
 msgstr ""
@@ -554,16 +554,16 @@ msgstr ""
 msgid "%s is not a file"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:113
+#: ../IkiWiki/Plugin/remove.pm:115
 #, perl-format
 msgid "confirm removal of %s"
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:150
+#: ../IkiWiki/Plugin/remove.pm:152
 msgid "Please select the attachments to remove."
 msgstr ""
 
-#: ../IkiWiki/Plugin/remove.pm:190
+#: ../IkiWiki/Plugin/remove.pm:192
 msgid "removed"
 msgstr ""
 
-- 
cgit v1.2.3


From 94cec17155d216014dcd7227bdf30aa6f47db7f7 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 8 Oct 2008 18:02:03 -0400
Subject: update

---
 doc/features.mdwn | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'doc')

diff --git a/doc/features.mdwn b/doc/features.mdwn
index 395ca0981..ff341d2cc 100644
--- a/doc/features.mdwn
+++ b/doc/features.mdwn
@@ -4,9 +4,10 @@ An overview of some of ikiwiki's features:
 ## Uses a real RCS
 
 Rather than implement its own system for storing page histories etc,
-ikiwiki uses a real Revision Control System. This isn't (just) because we're
-lazy, it's because a real RCS is a good thing to have, and there are
-advantages to using one that are not possible with a standard wiki.
+ikiwiki uses a real [[Revision_Control_System|rcs]]. This isn't (just)
+because we're lazy, it's because a real RCS is a good thing to have, and
+there are advantages to using one that are not possible with a standard
+wiki.
 
 Instead of editing pages in a stupid web form, you can use vim and commit
 changes via [[Subversion|rcs/svn]], [[rcs/git]], or any of a number of other
@@ -72,12 +73,11 @@ can change the look and layout of all pages in any way you would like.
 
 ## [[Plugins]]
 
-Plugins can be used to add additional features to ikiwiki. The interface
-is quite flexible, allowing plugins to implement additional markup
-languages, register [[directives|ikiwiki/directive]], hook into [[CGI]] mode,
-and more. Most of ikiwiki's features are actually provided by plugins.
-Ikiwiki's backend RCS support is also pluggable, so support for new
-revision control systems can be added to ikiwiki.
+Plugins can be used to add additional features to ikiwiki. The interface is
+quite flexible, allowing plugins to implement additional markup languages,
+register [[directives|ikiwiki/directive]], provide a [[RCS]] backend, hook
+into [[CGI]] mode, and much more. Most of ikiwiki's features are actually
+provided by plugins.
 
 The standard language for ikiwiki plugins is perl, but ikiwiki also supports
 [[plugins/write/external]] plugins: Standalone programs that can be written in
@@ -146,7 +146,7 @@ Thanks to subpages, every page can easily and automatically have a
 
 ### Edit controls
 
-Wiki admins can lock_pages so that only other admins can edit them. Or a
+Wiki admins can lock pages so that only other admins can edit them. Or a
 wiki can be set up to allow anyone to edit Discussion pages, but only
 registered users to edit other pages. These are just two possibilities,
 since page edit controls can be changed via plugins.
-- 
cgit v1.2.3


From feb71d541d6592f6f7223db99584e0e8f90ceb0e Mon Sep 17 00:00:00 2001
From: "http://josephturian.blogspot.com/"
 <http://josephturian.blogspot.com/@web>
Date: Thu, 9 Oct 2008 14:33:58 -0400
Subject:

---
 doc/users/josephturian.mdwn | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/users/josephturian.mdwn b/doc/users/josephturian.mdwn
index f055f951c..5ad68290d 100644
--- a/doc/users/josephturian.mdwn
+++ b/doc/users/josephturian.mdwn
@@ -1,8 +1,10 @@
-Joseph Turian is a scientist.
+Joseph Turian is a scientist. You can email him at
+    lastname at gmail dot com
 
 * Academic: <http://www-etud.iro.umontreal.ca/~turian/>
 
 He hopes to set up ikiwiki and organize his thoughts.
-In more distant dreams, he hopes that ikiwiki is someday ported to python.
 
 He also imagines adding wacky NLP and machine learning to ikiwiki.
+
+In more hazy dreams, he hopes that ikiwiki is someday ported to python.
-- 
cgit v1.2.3


From 33d1c8ec3e76a1777483024bf458e4f237a7cd21 Mon Sep 17 00:00:00 2001
From: "http://josephturian.blogspot.com/"
 <http://josephturian.blogspot.com/@web>
Date: Thu, 9 Oct 2008 14:37:10 -0400
Subject:

---
 doc/todo/Mailing_list.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 doc/todo/Mailing_list.mdwn

(limited to 'doc')

diff --git a/doc/todo/Mailing_list.mdwn b/doc/todo/Mailing_list.mdwn
new file mode 100644
index 000000000..84ec130ae
--- /dev/null
+++ b/doc/todo/Mailing_list.mdwn
@@ -0,0 +1,12 @@
+Please don't shoot me for asking:
+
+Could we have an ikiwiki mailing list?
+
+Here's an example use case:
+I want to discuss building a feature. Such discussion could happen on the wiki, but I would prefer to---at the least---be able to email ikiwiki developers and ask them to participate in this particular discussion.
+
+Does this sound okay?
+
+---[[JosephTurian]]
+
+[[!tag wishlist]]
-- 
cgit v1.2.3


From 2666da7cd90a8779b284a8ef74d6f1abd3d3a278 Mon Sep 17 00:00:00 2001
From: "http://josephturian.blogspot.com/"
 <http://josephturian.blogspot.com/@web>
Date: Thu, 9 Oct 2008 14:38:56 -0400
Subject:

---
 doc/todo/latex.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/latex.mdwn b/doc/todo/latex.mdwn
index 56d3b1c0c..eb53538b4 100644
--- a/doc/todo/latex.mdwn
+++ b/doc/todo/latex.mdwn
@@ -23,6 +23,8 @@ Conversely, how about adding a plugin to support exporting to LaTeX?
 
 >>> Have a look at [pandoc](http://code.google.com/p/pandoc/).  It can make PDFs via pdflatex. --[[roktas]]
 
+>>>> Interesting, just yesterday I was playing with pandoc to make PDFs from my Markdown. Could someone advise me on how to embed these PDFs into ikiwiki? I need some guidance in implementing this. --[[JosephTurian]]
+
 ----
 
 [here](http://ng.l4x.org/gitweb/gitweb.cgi?p=ikiwiki.git/.git;a=blob;f=IkiWiki/Plugin/latex.pm) is a first stab at
-- 
cgit v1.2.3


From 4544a3e583cebc152d94a3f4515dfebe87af6d36 Mon Sep 17 00:00:00 2001
From: "http://josephturian.blogspot.com/"
 <http://josephturian.blogspot.com/@web>
Date: Thu, 9 Oct 2008 15:01:09 -0400
Subject:

---
 doc/plugins/contrib/gallery.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/gallery.mdwn b/doc/plugins/contrib/gallery.mdwn
index ed9e17f32..7148de3ef 100644
--- a/doc/plugins/contrib/gallery.mdwn
+++ b/doc/plugins/contrib/gallery.mdwn
@@ -32,6 +32,7 @@ It uses templated named [Lightbox](http://www.hudddletogether.com).
 For any feedback or query, feel free to mail me at arpitjain11 [AT] gmail.com 
 
 Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikigallery.html).
+> That link is broken. --[[JosephTurian]]
 
 -- [[arpitjain]]
 
-- 
cgit v1.2.3


From 8c191adf5c8be51c9b60f597b0de78a7341d5a04 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 9 Oct 2008 16:58:25 -0400
Subject: tag updates

---
 doc/plugins/attachment.mdwn   | 2 +-
 doc/plugins/editdiff.mdwn     | 2 +-
 doc/plugins/edittemplate.mdwn | 2 +-
 doc/plugins/poll.mdwn         | 2 +-
 doc/plugins/remove.mdwn       | 2 +-
 doc/plugins/rename.mdwn       | 2 +-
 doc/plugins/search.mdwn       | 2 +-
 doc/plugins/type/web.mdwn     | 1 +
 doc/plugins/version.mdwn      | 2 +-
 doc/plugins/websetup.mdwn     | 2 +-
 10 files changed, 10 insertions(+), 9 deletions(-)
 create mode 100644 doc/plugins/type/web.mdwn

(limited to 'doc')

diff --git a/doc/plugins/attachment.mdwn b/doc/plugins/attachment.mdwn
index 2aa8490ed..4fcd714f8 100644
--- a/doc/plugins/attachment.mdwn
+++ b/doc/plugins/attachment.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=attachment core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows files to be uploaded to the wiki over the web.
 
diff --git a/doc/plugins/editdiff.mdwn b/doc/plugins/editdiff.mdwn
index 6351c563f..8d9daa0ff 100644
--- a/doc/plugins/editdiff.mdwn
+++ b/doc/plugins/editdiff.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=editdiff author="[[JeremieKoenig]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds a "Diff" button when a page is being edited.
 When clicked, a diff between the stored page and provided content
diff --git a/doc/plugins/edittemplate.mdwn b/doc/plugins/edittemplate.mdwn
index ca4a9ac45..85dfdfc2d 100644
--- a/doc/plugins/edittemplate.mdwn
+++ b/doc/plugins/edittemplate.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=edittemplate author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin provides the [[ikiwiki/directive/edittemplate]] [[ikiwiki/directive]].
 This directive allows registering template pages, that provide default
diff --git a/doc/plugins/poll.mdwn b/doc/plugins/poll.mdwn
index 160fd2ffa..510f67798 100644
--- a/doc/plugins/poll.mdwn
+++ b/doc/plugins/poll.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=poll author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin provides the [[ikiwiki/directive/poll]] [[ikiwiki/directive]],
 which allows inserting an online poll into a page.
diff --git a/doc/plugins/remove.mdwn b/doc/plugins/remove.mdwn
index be382e1d8..47993f44b 100644
--- a/doc/plugins/remove.mdwn
+++ b/doc/plugins/remove.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=remove core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows pages or other files to be removed using the web
 interface.
diff --git a/doc/plugins/rename.mdwn b/doc/plugins/rename.mdwn
index dcb569b31..ddaede8b0 100644
--- a/doc/plugins/rename.mdwn
+++ b/doc/plugins/rename.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=rename core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows pages or other files to be renamed using the web
 interface.
diff --git a/doc/plugins/search.mdwn b/doc/plugins/search.mdwn
index cc8190567..92cc5945a 100644
--- a/doc/plugins/search.mdwn
+++ b/doc/plugins/search.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=search author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin adds full text search to ikiwiki, using the
 [xapian](http://xapian.org/) engine, its
diff --git a/doc/plugins/type/web.mdwn b/doc/plugins/type/web.mdwn
new file mode 100644
index 000000000..b60e26a29
--- /dev/null
+++ b/doc/plugins/type/web.mdwn
@@ -0,0 +1 @@
+These plugins enhance the web interface.
diff --git a/doc/plugins/version.mdwn b/doc/plugins/version.mdwn
index 257f8f303..43027bdd7 100644
--- a/doc/plugins/version.mdwn
+++ b/doc/plugins/version.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=version author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/meta]]
 
 This plugin provides the [[ikiwiki/directive/version]]
 [[ikiwiki/directive]], which inserts the current version
diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index 694429fe1..f1756ba8f 100644
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -1,5 +1,5 @@
 [[!template id=plugin name=websetup core=0 author="[[Joey]]"]]
-[[!tag type/useful]]
+[[!tag type/web]]
 
 This plugin allows wiki admins to configure the wiki using a web interface,
 rather than editing the setup file directly. A "Wiki Setup" button is added
-- 
cgit v1.2.3


From 954e228ad64f1caf3e3d523cb20b7f88c098d01a Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Thu, 9 Oct 2008 17:37:24 -0400
Subject:

---
 doc/bugs/disabling_backlinks.mdwn | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/disabling_backlinks.mdwn b/doc/bugs/disabling_backlinks.mdwn
index 74b25f0f0..6a83bdcd9 100644
--- a/doc/bugs/disabling_backlinks.mdwn
+++ b/doc/bugs/disabling_backlinks.mdwn
@@ -12,3 +12,8 @@ My first reading (and second and third) of this was that backlinks would be disa
 > Yes, it only controls the number of backlinks that are shown at the
 > bottom of the page vs how many are moved to the popup. I've tried to
 > improve the documentation for this. [[done]] --[[Joey]]
+
+
+I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow?
+
+ --Peter
-- 
cgit v1.2.3


From 72d93d447ca43234401e0e20578327f6cd1a1086 Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Thu, 9 Oct 2008 17:43:27 -0400
Subject:

---
 doc/bugs/disabling_backlinks.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/disabling_backlinks.mdwn b/doc/bugs/disabling_backlinks.mdwn
index 6a83bdcd9..f10cd3833 100644
--- a/doc/bugs/disabling_backlinks.mdwn
+++ b/doc/bugs/disabling_backlinks.mdwn
@@ -14,6 +14,6 @@ My first reading (and second and third) of this was that backlinks would be disa
 > improve the documentation for this. [[done]] --[[Joey]]
 
 
-I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow?
+I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow? I realise that backlinks aren't generated when the tag index page refers to its contents by [[!map ...]], etc., but sometimes an auto-generated index is insufficient.
 
  --Peter
-- 
cgit v1.2.3


From b888eeb564af053f6298cae40cfd4f77d66b7aaf Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Thu, 9 Oct 2008 17:51:16 -0400
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 doc/ikiwiki/directive/map/discussion.mdwn

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
new file mode 100644
index 000000000..f44d5848c
--- /dev/null
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -0,0 +1,11 @@
+Question: Is there a way to generate a listing that shows *both* title and description meta information? Currently, a \[\[!map ...]] shows only one of the two, but I'd like to generate a navigation that looks like a description list. For example:
+
+ * This is the title meta information.
+
+   This is the description meta information
+
+ * This is another title.  
+
+   And so on ...
+
+Is that possible?
-- 
cgit v1.2.3


From 1dc7aa1a3e3697c5ebbd88e6ef3527789ca7b2ef Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Thu, 9 Oct 2008 17:51:51 -0400
Subject:

---
 doc/bugs/disabling_backlinks.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/disabling_backlinks.mdwn b/doc/bugs/disabling_backlinks.mdwn
index f10cd3833..9c31b6030 100644
--- a/doc/bugs/disabling_backlinks.mdwn
+++ b/doc/bugs/disabling_backlinks.mdwn
@@ -14,6 +14,6 @@ My first reading (and second and third) of this was that backlinks would be disa
 > improve the documentation for this. [[done]] --[[Joey]]
 
 
-I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow? I realise that backlinks aren't generated when the tag index page refers to its contents by [[!map ...]], etc., but sometimes an auto-generated index is insufficient.
+I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow? I realise that backlinks aren't generated when the tag index page refers to its contents by \[\[!map ...]], etc., but sometimes an auto-generated index is insufficient.
 
  --Peter
-- 
cgit v1.2.3


From e3bdea01e7ac5acfed78512ee1fa917c97ff2a9a Mon Sep 17 00:00:00 2001
From: "https://yag.myopenid.com//" <https://yag.myopenid.com//@web>
Date: Thu, 9 Oct 2008 17:52:21 -0400
Subject:

---
 doc/ikiwiki/directive/map/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/directive/map/discussion.mdwn b/doc/ikiwiki/directive/map/discussion.mdwn
index f44d5848c..808930fa4 100644
--- a/doc/ikiwiki/directive/map/discussion.mdwn
+++ b/doc/ikiwiki/directive/map/discussion.mdwn
@@ -9,3 +9,5 @@ Question: Is there a way to generate a listing that shows *both* title and descr
    And so on ...
 
 Is that possible?
+
+--Peter
-- 
cgit v1.2.3


From 8c46ca734aabb83dbace7241e004b2b5f42a90c5 Mon Sep 17 00:00:00 2001
From: "http://yag.myopenid.com/" <http://yag.myopenid.com/@web>
Date: Thu, 9 Oct 2008 18:50:04 -0400
Subject:

---
 doc/plugins/orphans/discussion.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/orphans/discussion.mdwn b/doc/plugins/orphans/discussion.mdwn
index 2b2532bfe..7956f52d8 100644
--- a/doc/plugins/orphans/discussion.mdwn
+++ b/doc/plugins/orphans/discussion.mdwn
@@ -9,3 +9,12 @@ In my wiki, the page "realname" shows up as an orphan although it's being linked
 > reason to use other link mechanisms provided by eg, markdown for internal
 > links in the wiki (indeed, using them is likely to cause broken links
 > when doing things like inlining or renaming pages). --[[Joey]]
+
+
+The orphans plugin fails with an error when it has to deal with a page that contains '+' characters as part of the filename. Apparently the code uses regular expressions and forgets to quote that string at some cruicial point. The error message I see is:
+
+     \[[!orphans Error: Nested quantifiers in regex; 
+     marked by <-- HERE in m/^(c++ <-- HERE |)$/ at
+     /usr/lib/perl5/vendor_perl/5.8.8/IkiWiki/Plugin/orphans.pm line 43.]]
+
+--Peter
-- 
cgit v1.2.3


From 484e42fd48f0bc6a1d9b7b27f2e5baf5a2ff8200 Mon Sep 17 00:00:00 2001
From: "http://yag.myopenid.com/" <http://yag.myopenid.com/@web>
Date: Thu, 9 Oct 2008 19:05:12 -0400
Subject:

---
 doc/ikiwiki/wikilink/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index e4b1f933f..0ab05304c 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -58,3 +58,7 @@ How do I make images clickable?  The obvious guess, \[[foo.png|/index]], doesn't
 > You can do it using the img plugin. The syntax you suggested would be ambiguous,
 > as there's no way to tell if the text is meant to be an image or displayed as-is.
 > --[[Joey]]
+
+----
+
+Is it possible to refer to a page, say \[[foobar]], such that the link text is taken from foobar's title [[directive/meta]] tag? --Peter
-- 
cgit v1.2.3


From debd8636a0dc8908126c2a3b8c6e6cd3072996fb Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 9 Oct 2008 19:15:39 -0400
Subject: problem fixed

---
 doc/plugins/orphans/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/orphans/discussion.mdwn b/doc/plugins/orphans/discussion.mdwn
index 7956f52d8..3165e5968 100644
--- a/doc/plugins/orphans/discussion.mdwn
+++ b/doc/plugins/orphans/discussion.mdwn
@@ -18,3 +18,5 @@ The orphans plugin fails with an error when it has to deal with a page that cont
      /usr/lib/perl5/vendor_perl/5.8.8/IkiWiki/Plugin/orphans.pm line 43.]]
 
 --Peter
+
+> Fixed. BTW, for an important bug like this, use [[bugs]]. --[[Joey]]
-- 
cgit v1.2.3


From 2ff36e631e8d19c511e8fcf0c77187b372dc6d04 Mon Sep 17 00:00:00 2001
From: "http://yag.myopenid.com/" <http://yag.myopenid.com/@web>
Date: Thu, 9 Oct 2008 19:33:25 -0400
Subject:

---
 doc/plugins/contrib/sourcehighlight.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/sourcehighlight.mdwn b/doc/plugins/contrib/sourcehighlight.mdwn
index 0f1ab1b21..b9e618c16 100644
--- a/doc/plugins/contrib/sourcehighlight.mdwn
+++ b/doc/plugins/contrib/sourcehighlight.mdwn
@@ -17,4 +17,6 @@ because they both generate page working/dir/foo.
 It looks to me like ikiwiki is hardcoded to strip the extension in `pagename()` (IkiWiki.pm).
 This problem with sourcehighlight needs to be fixed before it is very useful.
 
+- Is there a way to configure the colors used by source-highlight (other than editing the globally installed "default.style" file)? It would help if I could pass the command arbitrary command-line arguments; then I could configure which config file it's supposed to use. For instance, I'm not a fan of hard-coding the colors into the HTML output. IMHO, css-style formatting should be preferred. All that can be set via the command line ... --Peter
+
 [[DavidBremner]]
-- 
cgit v1.2.3


From 3369bbee1c969ac6ac17edaf10da06c5660358d0 Mon Sep 17 00:00:00 2001
From: bremner <bremner@web>
Date: Fri, 10 Oct 2008 01:45:45 -0400
Subject:

---
 doc/plugins/contrib/sourcehighlight.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/contrib/sourcehighlight.mdwn b/doc/plugins/contrib/sourcehighlight.mdwn
index b9e618c16..2eb22e6ed 100644
--- a/doc/plugins/contrib/sourcehighlight.mdwn
+++ b/doc/plugins/contrib/sourcehighlight.mdwn
@@ -19,4 +19,4 @@ This problem with sourcehighlight needs to be fixed before it is very useful.
 
 - Is there a way to configure the colors used by source-highlight (other than editing the globally installed "default.style" file)? It would help if I could pass the command arbitrary command-line arguments; then I could configure which config file it's supposed to use. For instance, I'm not a fan of hard-coding the colors into the HTML output. IMHO, css-style formatting should be preferred. All that can be set via the command line ... --Peter
 
-[[DavidBremner]]
+> I don't really have time right now, but it should be easy to add, if you look at how src-lang is handled.  Patches are welcome :-) --[[DavidBremner]]
-- 
cgit v1.2.3


From 9a80c66c7007a1d16078e39c2702e7f41129393a Mon Sep 17 00:00:00 2001
From: "http://alcopop.org/me/openid/" <http://alcopop.org/me/openid/@web>
Date: Fri, 10 Oct 2008 08:54:29 -0400
Subject: +myself

---
 doc/ikiwikiusers.mdwn | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 6e234ceed..e5f978e12 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -100,7 +100,8 @@ Personal sites and blogs
 * [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/)
-
+* [[JonDowland]]'s [homepage](http://jmtd.net/)
+ 
 Please feel free to add your own ikiwiki site!
 
 See also: [Debian ikiwiki popcon graph](http://people.debian.org/~igloo/popcon-graphs/index.php?packages=ikiwiki)
-- 
cgit v1.2.3


From c35f3baffca020bb1f7eb2dd6fb30da16e848701 Mon Sep 17 00:00:00 2001
From: "http://alcopop.org/me/openid/" <http://alcopop.org/me/openid/@web>
Date: Fri, 10 Oct 2008 08:55:41 -0400
Subject: update homepage

---
 doc/users/jondowland.mdwn | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn
index d5aa6d0be..6f43bc335 100644
--- a/doc/users/jondowland.mdwn
+++ b/doc/users/jondowland.mdwn
@@ -1,4 +1,5 @@
 A new ikiwiki user, looking at ikiwiki both for his personal site but also as a team-documentation management system for a small-sized group of UNIX sysadmins.
 
-* (currently non-ikiwiki) Homepage: <http://alcopop.org/>
-* potential future (ikiwiki) Homepage: <http://jmtd.net/>
+* My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts)
+
+
-- 
cgit v1.2.3


From 61b37a3d73d7777e32fcc6aaa45699581494969d Mon Sep 17 00:00:00 2001
From: "http://alcopop.org/me/openid/" <http://alcopop.org/me/openid/@web>
Date: Fri, 10 Oct 2008 08:57:36 -0400
Subject: ukuug talk

---
 doc/users/jondowland.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/users/jondowland.mdwn b/doc/users/jondowland.mdwn
index 6f43bc335..c6302616f 100644
--- a/doc/users/jondowland.mdwn
+++ b/doc/users/jondowland.mdwn
@@ -2,4 +2,4 @@ A new ikiwiki user, looking at ikiwiki both for his personal site but also as a
 
 * My [homepage](http://jmtd.net/) is powered by ikiwiki (replacing my [older homepage](http://alcopop.org/), which was a mess of scripts)
 
-
+I am giving a talk at the [UK UNIX User's Group](http://www.ukuug.org/) annual [Linux conference](http://www.ukuug.org/events/linux2008/) about organising system administrator documentation which will feature IkiWiki.
-- 
cgit v1.2.3


From cd305909d37546d1f75365f9e92995429927e91a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 10 Oct 2008 17:13:33 -0400
Subject: document google plugin

---
 debian/changelog        |  1 +
 debian/copyright        |  4 ++++
 doc/plugins/google.mdwn | 12 ++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 doc/plugins/google.mdwn

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index b89d76e1b..fa6829eb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low
     wanting to be done. Closes: #443346 (It does not control who can read a
     page, but that's out of scope for ikiwiki.)
   * orphans: Fix unquoted page name in regexp.
+  * google: Plugin provides google site search, contributed by Peter Simons.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 06 Oct 2008 16:07:50 -0400
 
diff --git a/debian/copyright b/debian/copyright
index 87f3cac89..f257234dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -104,6 +104,10 @@ Files: color.pm
 Copyright: Copyright (C) 2008 Paweł Tęcza <ptecza@net.icm.edu.pl>
 License: GPL-2+
 
+Files: google.pm
+Copyright: Copyright (C) 2008 Peter Simons <simons@cryp.to>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+
diff --git a/doc/plugins/google.mdwn b/doc/plugins/google.mdwn
new file mode 100644
index 000000000..7c61e637b
--- /dev/null
+++ b/doc/plugins/google.mdwn
@@ -0,0 +1,12 @@
+[[!template id=plugin name=google author="Peter Simons"]]
+[[!tag type/web]]
+
+This plugin adds a search form to the wiki, using google's site search.
+
+Google is asked to search for pages in the domain specified in the wiki's
+`url` configuration parameter. Results will depend on whether google has
+indexed the site, and how recently. Also, if the same domain has other
+content, outside the wiki's content, it will be searched as well.
+
+The [[search]] plugin offers full text search of only the wiki, but
+requires that a search engine be installed on your site.
-- 
cgit v1.2.3


From 07d4868e57e3548e15cf6665617ee099d54b47d9 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Sat, 11 Oct 2008 10:29:52 -0400
Subject: fix entry

---
 doc/shortcuts.mdwn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/shortcuts.mdwn b/doc/shortcuts.mdwn
index 4bb677489..14cd5ff2b 100644
--- a/doc/shortcuts.mdwn
+++ b/doc/shortcuts.mdwn
@@ -27,7 +27,7 @@ This page controls what shortcut links the wiki supports.
 * [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
 * [[!shortcut name=debss url="http://snapshot.debian.net/package/%s"]]
   * Usage: `\[[!debss package]]`, `\[[!debss package#version]]`, or `\[[!debss package/version]]`.  See http://snapshot.debian.net for details.
-  [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
+* [[!shortcut name=debwiki url="http://wiki.debian.org/%s"]]
 * [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
 * [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
 * [[!shortcut name=gnomebug url="http://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
-- 
cgit v1.2.3


From 7ac2b6a6ca4925655d45e985db776eca2ddef741 Mon Sep 17 00:00:00 2001
From: "http://yag.myopenid.com/" <http://yag.myopenid.com/@web>
Date: Sat, 11 Oct 2008 10:43:01 -0400
Subject:

---
 doc/bugs/rst_tweak.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn
index 8348ed470..5a2caf2bf 100644
--- a/doc/bugs/rst_tweak.mdwn
+++ b/doc/bugs/rst_tweak.mdwn
@@ -20,3 +20,7 @@ Index: IkiWiki/Plugin/rst.pm
  print html[html.find('<body>')+6:html.find('</body>')].strip();
  ";
 </pre>
+
+----
+
+Does the Perl version of this plugin still exist?  There appears to be no "rst.pm" in the current distribution; all there is is the python version. --Peter
-- 
cgit v1.2.3


From 4d368e17c716395acd4bf9c2aab271f53eae126f Mon Sep 17 00:00:00 2001
From: pesco <pesco@web>
Date: Sat, 11 Oct 2008 11:53:25 -0400
Subject: update on state of the darcs plugin

---
 doc/todo/darcs.mdwn | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'doc')

diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index a410f5ecf..f383514a2 100644
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -486,11 +486,11 @@ It's got couple of FIXMEs, and a very site-specific filter for recentchanges. No
 
 ---
 
-And here's yet another one. :)
+And here's yet another one, including an updated `ikiwiki-makerepo`. :)
 
-<http://khjk.org/~pesco/ikiwiki-darcs/>
+<http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)
 
-I've taken all the good stuff from the above and added the missing hooks. Some of them I haven't had a chance to test, namely `rcs_rename`, `rcs_remove`, `rcs_commit_staged`, and `rcs_diff`. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
+I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
 
@@ -523,4 +523,20 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
 > * Is the the darcs info in [[details]] still up-to-date re this version?
 > --[[Joey]]
 
+> Update:
+>
+> I think I've addressed all of the above except for the XML parsing in `darcs_info`.
+> The function determines the md5 hash of the last patch the given file appears in.
+> That's indeed being done with regexps but my Perl isn't good enough for a quick recode
+> right now.
+>
+> As for the darcs info in [[rcs/details]], it does not accurately describe the way
+> this version works. It's similar, but the details differ slightly.
+> You could copy my description above to replace it.
+>
+> There is still some ironing to do, for instance the current version doesn't allow for
+> modifying attachments by re-uploading them via CGI ("darcs add failed"). Am I assuming
+> correctly that "adding" a file that's already in the repo should just be a no-op?
+> --pesco
+
 [[!tag patch]]
-- 
cgit v1.2.3


From de805e0f39886673e56d5702a5609c09099600e4 Mon Sep 17 00:00:00 2001
From: "http://per.bothner.myopenid.com/"
 <http://per.bothner.myopenid.com/@web>
Date: Sun, 12 Oct 2008 16:16:06 -0400
Subject:

---
 doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn

(limited to 'doc')

diff --git a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
new file mode 100644
index 000000000..6596936fa
--- /dev/null
+++ b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
@@ -0,0 +1,7 @@
+My <code>page.tmpl</code> can contain:
+
+    Created <TMPL_VAR CTIME>.  Last edited <TMPL_VAR MTIME>.
+ 
+and that works.  However, if I have the same line in <code>inlinepage.tmpl</code> 
+or <code>archivepage.tmpl</code>, then only the <code>CTIME</code> works - the <code>MTIME</code> is blank.
+This leads to an annoying inconsistency.
-- 
cgit v1.2.3


From a75a0dd1dc4f4c827a02375883614af7c68dae27 Mon Sep 17 00:00:00 2001
From: "http://per.bothner.myopenid.com/"
 <http://per.bothner.myopenid.com/@web>
Date: Sun, 12 Oct 2008 16:31:24 -0400
Subject: Suggested patch.

---
 doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
index 6596936fa..58579ac35 100644
--- a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
+++ b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
@@ -5,3 +5,15 @@ My <code>page.tmpl</code> can contain:
 and that works.  However, if I have the same line in <code>inlinepage.tmpl</code> 
 or <code>archivepage.tmpl</code>, then only the <code>CTIME</code> works - the <code>MTIME</code> is blank.
 This leads to an annoying inconsistency.
+
+Update - even though I'm not a Perl programmer, this patch seems right:
+
+    --- /home/bothner/ikiwiki/ikiwiki/IkiWiki/Plugin/inline.pm	2008-10-01 14:29:11.000000000 -0700
+    +++ ./inline.pm	2008-10-12 13:26:11.000000000 -0700
+    @@ -316,6 +316,7 @@
+     				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
+     				$template->param(title => pagetitle(basename($page)));
+     				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+    +				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
+     				$template->param(first => 1) if $page eq $list[0];
+     				$template->param(last => 1) if $page eq $list[$#list];	
-- 
cgit v1.2.3


From fe2ba07428f43fe3bbe7ce360149229e795975bc Mon Sep 17 00:00:00 2001
From: jsilence <jsilence@web>
Date: Tue, 14 Oct 2008 04:04:33 -0400
Subject: Only a simple test

---
 doc/sandbox/Blagging_is_cool.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/sandbox/Blagging_is_cool.mdwn

(limited to 'doc')

diff --git a/doc/sandbox/Blagging_is_cool.mdwn b/doc/sandbox/Blagging_is_cool.mdwn
new file mode 100644
index 000000000..16aafa304
--- /dev/null
+++ b/doc/sandbox/Blagging_is_cool.mdwn
@@ -0,0 +1,6 @@
+This is a testing Blag-Entry.
+/me loves blagging.
+
+ * Entry one
+ * entry two
+
-- 
cgit v1.2.3


From c39112e6effa8a4057cc6350c0be46f3363c259a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 14 Oct 2008 15:00:46 -0400
Subject: inline: Allow MTIME to be used in inlinepage.tmpl.

---
 IkiWiki/Plugin/inline.pm                                  | 1 +
 debian/changelog                                          | 1 +
 doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn | 3 +++
 3 files changed, 5 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5d2ef5681..037c20618 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -316,6 +316,7 @@ sub preprocess_inline (@) { #{{{
 				$template->param(pageurl => urlto(bestlink($params{page}, $page), $params{destpage}));
 				$template->param(title => pagetitle(basename($page)));
 				$template->param(ctime => displaytime($pagectime{$page}, $params{timeformat}));
+				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
 				$template->param(first => 1) if $page eq $list[0];
 				$template->param(last => 1) if $page eq $list[$#list];
 	
diff --git a/debian/changelog b/debian/changelog
index c38f44d79..f5156a667 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (2.67) UNRELEASED; urgency=low
   * google: Plugin provides google site search, contributed by Peter Simons.
   * Pass HTTPS variable through the wrapper so that CGI->https can be used
     by plugins. Closes: #502047
+  * inline: Allow MTIME to be used in inlinepage.tmpl.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 06 Oct 2008 16:07:50 -0400
 
diff --git a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
index 58579ac35..89947b544 100644
--- a/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
+++ b/doc/bugs/MTIME_not_set_for_inline_or_archive_entries.mdwn
@@ -17,3 +17,6 @@ Update - even though I'm not a Perl programmer, this patch seems right:
     +				$template->param(mtime => displaytime($pagemtime{$page}, $params{timeformat}));
      				$template->param(first => 1) if $page eq $list[0];
      				$template->param(last => 1) if $page eq $list[$#list];	
+
+
+> [[done]], thanks
-- 
cgit v1.2.3


From 559c0707ae50c2272e917dd6e680c196cee33650 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 14 Oct 2008 15:02:12 -0400
Subject: response

---
 doc/bugs/rst_tweak.mdwn | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/rst_tweak.mdwn b/doc/bugs/rst_tweak.mdwn
index 5a2caf2bf..8c7d8134d 100644
--- a/doc/bugs/rst_tweak.mdwn
+++ b/doc/bugs/rst_tweak.mdwn
@@ -24,3 +24,6 @@ Index: IkiWiki/Plugin/rst.pm
 ----
 
 Does the Perl version of this plugin still exist?  There appears to be no "rst.pm" in the current distribution; all there is is the python version. --Peter
+
+> No, only the python version exists. It does have `raw_enabled` set.
+> --[[Joey]]
-- 
cgit v1.2.3


From f2d43e4a0cbf02a230ac984a9fb49adcf2f788e1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 14 Oct 2008 15:03:38 -0400
Subject: response

---
 doc/ikiwiki/wikilink/discussion.mdwn | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'doc')

diff --git a/doc/ikiwiki/wikilink/discussion.mdwn b/doc/ikiwiki/wikilink/discussion.mdwn
index 0ab05304c..b5cb848ed 100644
--- a/doc/ikiwiki/wikilink/discussion.mdwn
+++ b/doc/ikiwiki/wikilink/discussion.mdwn
@@ -62,3 +62,5 @@ How do I make images clickable?  The obvious guess, \[[foo.png|/index]], doesn't
 ----
 
 Is it possible to refer to a page, say \[[foobar]], such that the link text is taken from foobar's title [[directive/meta]] tag? --Peter
+
+> Not yet. :-) Any suggestion for a syntax for it? Maybe something like \[[|foobar]] ? --[[Joey]]
-- 
cgit v1.2.3


From b7f09741f564052c6d5cf9663285fac85ae3dd10 Mon Sep 17 00:00:00 2001
From: PaulePanter <PaulePanter@web>
Date: Wed, 15 Oct 2008 16:27:53 -0400
Subject: New post.

---
 ...pagespec_for_creation_dates_relative_to_today__63__.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn b/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn
new file mode 100644
index 000000000..8072747d9
--- /dev/null
+++ b/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn
@@ -0,0 +1,13 @@
+Dear users,
+
+
+using the directive inline, I want to show all pages (for example named 2008.10.2:foo.mdwn or 2009.12.3:bar.mdwn), whose date in the title are in the future. So in this example only the second one.
+
+I did not find a directive doing this in [[/ikiwiki/PageSpec]].
+
+Does somebody have an idea? I just came up with using a tag “recent” or using a separate folder. But this would be a quite some work to maintain this setup.
+
+
+Thanks,
+
+Paul
-- 
cgit v1.2.3


From 9ae8774540d151e631df319e0b275392430be658 Mon Sep 17 00:00:00 2001
From: neale <neale@web>
Date: Wed, 15 Oct 2008 17:58:14 -0400
Subject:

---
 doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn

(limited to 'doc')

diff --git a/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn b/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
new file mode 100644
index 000000000..81cc93fb1
--- /dev/null
+++ b/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
@@ -0,0 +1,7 @@
+I can make an image link, such as:
+
+    ![image](image.jpg)
+
+That will render as ![image](image.jpg).
+
+If I then inline that page, the (relative) URL no longer points to the right place.  The fix for this promises to be hairy.
-- 
cgit v1.2.3


From 063cacce3904dd7cd394915f91b62148dc926b51 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 19:12:59 -0400
Subject: response

---
 doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn b/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
index 81cc93fb1..8cfd42e78 100644
--- a/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
+++ b/doc/bugs/images_in_inlined_pages_have_wrong_relative_URL.mdwn
@@ -5,3 +5,9 @@ I can make an image link, such as:
 That will render as ![image](image.jpg).
 
 If I then inline that page, the (relative) URL no longer points to the right place.  The fix for this promises to be hairy.
+
+> Similarly, if you insert a relative link using the markdown link syntax,
+> it will tend to break when the page is inlined.
+> 
+> However, there is a simple way to avoid both problems: Use WikiLinks
+> and/or the [[img_directive|ikiwiki/directive/img]]. --[[Joey]]
-- 
cgit v1.2.3


From 2a0cb4e9b16203264dad358fae7abc38bfce93e3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 19:16:27 -0400
Subject: response

---
 ...re_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn b/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn
index 8072747d9..e88400cd4 100644
--- a/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn
+++ b/doc/forum/Is_there_a_pagespec_for_creation_dates_relative_to_today__63__.mdwn
@@ -11,3 +11,12 @@ Does somebody have an idea? I just came up with using a tag “recent” or usin
 Thanks,
 
 Paul
+
+> There's no such pagespec, and doing one is difficult, because such a
+> pagespec will change what it matches over time. So ikiwiki would have to
+> somehow figure out that pages matched by it yesterday no longer match,
+> and that pages containing the pagespec need to be rebuilt. Which means
+> you'd also need a cron job.
+>
+> I suspect what you're trying to accomplish is
+> [[todo/tagging_with_a_publication_date]]? --[[Joey]]
-- 
cgit v1.2.3


From 62201f83ed6f98ddbad0df1b4790974dc0acc3f3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 19:23:53 -0400
Subject: response

---
 doc/todo/Mailing_list.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Mailing_list.mdwn b/doc/todo/Mailing_list.mdwn
index 84ec130ae..b6a207420 100644
--- a/doc/todo/Mailing_list.mdwn
+++ b/doc/todo/Mailing_list.mdwn
@@ -10,3 +10,11 @@ Does this sound okay?
 ---[[JosephTurian]]
 
 [[!tag wishlist]]
+
+> People ask for this from time to time, but I personally prefer not to be
+> on an ikiwiki mailing list, because limiting public ikiwiki discussion to
+> this wiki helps make ikiwiki a better platform for discussion. So some
+> (most?) active ikiwiki people subscribe to recentchanges, or to the
+> todo/bugs/forum feeds, or to some other feed they create on their user page.
+> And there's work on making the discussion pages more structured, on
+> accepting comments sent via mail, etc. --[[Joey]]
-- 
cgit v1.2.3


From 020eb6f294346a3a5db5d04b7d14cb30ddd4bfaf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 19:32:39 -0400
Subject: response

---
 doc/bugs/disabling_backlinks.mdwn | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/disabling_backlinks.mdwn b/doc/bugs/disabling_backlinks.mdwn
index 9c31b6030..ba96a4e2b 100644
--- a/doc/bugs/disabling_backlinks.mdwn
+++ b/doc/bugs/disabling_backlinks.mdwn
@@ -14,6 +14,17 @@ My first reading (and second and third) of this was that backlinks would be disa
 > improve the documentation for this. [[done]] --[[Joey]]
 
 
-I notice that there is quite a bit of redundancy when both tags and backlinks are used extensively. On most pages, the set of links features in both categories is almost identical because a tag's index page is shown both as a tag link and as a backlink. Is there a way to improve that situation somehow? I realise that backlinks aren't generated when the tag index page refers to its contents by \[\[!map ...]], etc., but sometimes an auto-generated index is insufficient.
+I notice that there is quite a bit of redundancy when both tags and
+backlinks are used extensively. On most pages, the set of links features in
+both categories is almost identical because a tag's index page is shown
+both as a tag link and as a backlink. Is there a way to improve that
+situation somehow? I realise that backlinks aren't generated when the tag
+index page refers to its contents by \[\[!map ...]], etc., but sometimes an
+auto-generated index is insufficient.
 
  --Peter
+
+> Um, if you're manually linking from the tag's page to each page so
+> tagged, I think you have larger problems than tags and backlinks being
+> the same. Like keeping that list of links up to date as tags are added
+> and changed. --[[Joey]]
-- 
cgit v1.2.3


From 20e691fe20ead76d826ab77501c6e9cbc7b487e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Wed, 15 Oct 2008 19:36:35 -0400
Subject: response

---
 doc/todo/darcs.mdwn | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/darcs.mdwn b/doc/todo/darcs.mdwn
index f383514a2..b8ddfd485 100644
--- a/doc/todo/darcs.mdwn
+++ b/doc/todo/darcs.mdwn
@@ -490,6 +490,9 @@ And here's yet another one, including an updated `ikiwiki-makerepo`. :)
 
 <http://khjk.org/~pesco/ikiwiki-darcs/> (now a darcs repo)
 
+> Note that there's a 'darcs' branch in git that I'm keeping a copy of your
+> code in. Just in case. :-)
+
 I've taken all the good stuff from the above and added the missing hooks. The code hasn't seen a lot of testing, so some bugs are likely yet to surface. Also, I'm not experienced with perl and don't know where I should have used the function `possibly_foolish_untaint`.
 
 Regarding the repository layout: There are two darcs repositories. One is the `srcdir`, the other we'll call `master`.
@@ -539,4 +542,8 @@ Regarding the repository layout: There are two darcs repositories. One is the `s
 > correctly that "adding" a file that's already in the repo should just be a no-op?
 > --pesco
 
+>> It should result in the new file contents being committed by
+>> `rcs_commit_staged`. For some revision control systems, which
+>> automatically commit modifications, it would be a no-op. --[[Joey]]
+
 [[!tag patch]]
-- 
cgit v1.2.3