From e694579d2729a8f771acc9e5789efc03e039ed56 Mon Sep 17 00:00:00 2001
From: jeanm <jeanm@web>
Date: Wed, 30 Jun 2010 07:30:08 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_3_4eec15c8c383275db5401c8e3c2d9242._comment          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment
new file mode 100644
index 000000000..faf3ad31b
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_3_4eec15c8c383275db5401c8e3c2d9242._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="jeanm"
+ ip="81.56.145.104"
+ subject="do parameter missing"
+ date="2010-06-30T07:30:08Z"
+ content="""
+the site address is piaffer.org, with a link to blog just over the picture.
+tia,
+"""]]
-- 
cgit v1.2.3


From 1ffe0d97394bb9b1de29d9a3df914c97d89584cb Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:50:05 +0200
Subject: cleaner bugfix in now available

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

(limited to 'doc')

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index a0ccc5f53..ce0ac3577 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -12,6 +12,12 @@ generated HTML.
 
 This has been fixed in my po branch.
 
+> My commit dcd57dd5c9f3265bb7a78a5696b90976698c43aa updates the
+> bugfix in a much more elegant manner. Its main disadvantage is to
+> add an (optional) argument to IkiWiki::filter. Please review.
+
 -- [[intrigeri]]
 
+
+
 [[!tag patch]]
-- 
cgit v1.2.3


From e63ead1c13290f314579f90e8ae2a607f2b69e7a Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:50:19 +0200
Subject: please review new po pagespec: needstranlation()

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

(limited to 'doc')

diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
new file mode 100644
index 000000000..acc5641a4
--- /dev/null
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -0,0 +1,5 @@
+Commit b225fdc44d4b3d in my po branch adds a `needstranslation()`
+PageSpec. It makes it easy to list pages that need translation work.
+Please review. --[[intrigeri]]
+
+[[!tag patch]]
-- 
cgit v1.2.3


From 91fde37f13a89b4593e128852c2f8927b478d881 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Thu, 1 Jul 2010 00:30:58 +0000
Subject: response to Microdata question

---
 doc/plugins/contrib/field/discussion.mdwn | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/contrib/field/discussion.mdwn b/doc/plugins/contrib/field/discussion.mdwn
index 5f4c9b942..191f8b27d 100644
--- a/doc/plugins/contrib/field/discussion.mdwn
+++ b/doc/plugins/contrib/field/discussion.mdwn
@@ -325,4 +325,8 @@ smcv's discuission of field author vs meta author above. --[[Joey]]
 
 >>> --[[KathrynAndersen]]
 
+-----
+
 I was just looking at HTML5 and wondered if the field plugin should generate the new Microdata tags (as well as the internal structures)? <http://slides.html5rocks.com/#slide19> -- [[Will]]
+
+> This could just as easily be done as a separate plugin.  Feel free to do so. --[[KathrynAndersen]]
-- 
cgit v1.2.3


From 29fd100e9f4e71fb85505d932184ffd5e3f26242 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 30 Jun 2010 20:53:58 -0400
Subject: Use comment template on comments page of example blog.

---
 debian/changelog                | 1 +
 doc/examples/blog/comments.mdwn | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 15ae21a55..0697efffd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
     (Make it relative like everything else.)
   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
     and prevented actually rendering hnb files.
+  * Use comment template on comments page of example blog.
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index f59b44390..52c7d3132 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -6,4 +6,5 @@ Comments in the moderation queue:
 """]]
 
 Recent comments on posts in the [[blog|index]]:
-[[!inline pages="./posts/*/Discussion or comment(./posts/*)"]]
+[[!inline pages="./posts/*/Discussion or comment(./posts/*)"
+template="comment"]]
-- 
cgit v1.2.3


From 824ad84e2b490e3aa9107e3a3d244bd8e041d918 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 1 Jul 2010 15:52:03 -0400
Subject: add note about genwrapper code running before wrapper sanitizes
 environment

(That is needed for the receive test code.)
---
 doc/plugins/write.mdwn | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index a921b9a02..bb8012342 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -595,7 +595,10 @@ describes the plugin as a whole. For example:
 	hook(type => "genwrapper", id => "foo", call => \&genwrapper);
 
 This hook is used to inject C code (which it returns) into the `main`
-function of the ikiwiki wrapper when it is being generated.
+function of the ikiwiki wrapper when it is being generated. 
+
+The code runs before anything else -- in particular it runs before
+the suid wrapper has sanitized its environment.
 
 ## Exported variables
 
-- 
cgit v1.2.3


From 14fb28ab54ed7effb698874c6e5968db9d6ddda1 Mon Sep 17 00:00:00 2001
From: "http://nicolas-schodet.myopenid.com/"
 <http://nicolas-schodet.myopenid.com/@web>
Date: Fri, 2 Jul 2010 20:18:26 +0000
Subject: add own site using ikiwiki

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index e2465108a..6a323ade0 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -148,6 +148,7 @@ Personal sites and blogs
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
 * [Mukund](https://www.mukund.org/)
+* [Nicolas Schodet](http://ni.fr.eu.org/)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 92ee5386acdff8cd0180be9397e7370f4ec25088 Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Sun, 4 Jul 2010 18:16:27 +0000
Subject: Added a comment

---
 .../comment_4_43ac867621efb68affa6ae2b92740cad._comment        | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment
new file mode 100644
index 000000000..d8b516f5f
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_4_43ac867621efb68affa6ae2b92740cad._comment
@@ -0,0 +1,10 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="comment 4"
+ date="2010-07-04T18:16:26Z"
+ content="""
+What is the muse plugin that you have enabled? I am not familiar with it.
+
+Apparently your ikiwiki is not seeing cgi parameters that should be passed to it. This appears to be some kind of web server misconfiguration, or possibly a broken ikiwiki wrapper or broken CGI.pm. 
+"""]]
-- 
cgit v1.2.3


From be49679fe9235f0fe9a28dabf3d91c9ee173106f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Tue, 29 Jun 2010 15:45:34 +0200
Subject: po: added a needstranslation() pagespec (cherry picked from commit
 b225fdc44d4b3d2853db622d59aed7b59788aeec)

---
 IkiWiki/Plugin/po.pm         | 15 +++++++++++++++
 doc/ikiwiki/pagespec/po.mdwn |  2 ++
 2 files changed, 17 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index 86d5087f4..f12c69d5f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1220,4 +1220,19 @@ sub match_currentlang ($$;@) {
 	}
 }
 
+sub match_needstranslation ($$;@) {
+	my $page=shift;
+
+	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
+	if ($percenttranslated eq 'N/A') {
+		return IkiWiki::FailReason->new("file is not a translation page");
+	}
+	elsif ($percenttranslated < 100) {
+		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
+        }
+	else {
+		return IkiWiki::FailReason->new("file is fully translated");
+	}
+}
+
 1
diff --git a/doc/ikiwiki/pagespec/po.mdwn b/doc/ikiwiki/pagespec/po.mdwn
index 40ed9efb6..f8b398575 100644
--- a/doc/ikiwiki/pagespec/po.mdwn
+++ b/doc/ikiwiki/pagespec/po.mdwn
@@ -11,6 +11,8 @@ wiki:
   specified as a ISO639-1 (two-letter) language code.
 * "`currentlang()`" - tests whether a page is written in the same
   language as the current page.
+* "`needstranslation()`" - tests whether a page needs translation
+  work. Only slave pages match this PageSpec.
 
 Note that every non-po page is considered to be written in
 `po_master_language`, as specified in `ikiwiki.setup`.
-- 
cgit v1.2.3


From 8a8914151cee44592dfdc3df3bb2c45b19b8c29c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 14:22:19 -0400
Subject: review of needstranslation() pagespec

Minor wording fix; changelog; etc.
---
 IkiWiki/Plugin/po.pm                       | 2 +-
 debian/changelog                           | 1 +
 doc/todo/po_needstranslation_pagespec.mdwn | 6 +++++-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index f12c69d5f..0b2251668 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -1225,7 +1225,7 @@ sub match_needstranslation ($$;@) {
 
 	my $percenttranslated=IkiWiki::Plugin::po::percenttranslated($page);
 	if ($percenttranslated eq 'N/A') {
-		return IkiWiki::FailReason->new("file is not a translation page");
+		return IkiWiki::FailReason->new("file is not a translatable page");
 	}
 	elsif ($percenttranslated < 100) {
 		return IkiWiki::SuccessReason->new("file has $percenttranslated translated");
diff --git a/debian/changelog b/debian/changelog
index 7d857d9c0..bdcf52884 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ ikiwiki (3.20100624) UNRELEASED; urgency=low
   * git: Added git_wrapper_background_command option. Can be used to eg, 
     make the git wrapper push to github in the background after ikiwiki
     runs.
+  * po: Added needstranslation() pagespec. (intrigeri)
 
  -- Joey Hess <joeyh@debian.org>  Wed, 23 Jun 2010 15:30:04 -0400
 
diff --git a/doc/todo/po_needstranslation_pagespec.mdwn b/doc/todo/po_needstranslation_pagespec.mdwn
index acc5641a4..77449dc2b 100644
--- a/doc/todo/po_needstranslation_pagespec.mdwn
+++ b/doc/todo/po_needstranslation_pagespec.mdwn
@@ -2,4 +2,8 @@ Commit b225fdc44d4b3d in my po branch adds a `needstranslation()`
 PageSpec. It makes it easy to list pages that need translation work.
 Please review. --[[intrigeri]]
 
-[[!tag patch]]
+> Looks good, cherry-picked. The only improvment I can 
+> think of is that `needstranslation(50)` could match
+> only pages less than 50% translated. --[[Joey]] 
+
+[[!tag patch done]]
-- 
cgit v1.2.3


From 1b14a849fff50888e6a48d7299c23c7d5821572a Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 14:27:57 -0400
Subject: example

---
 doc/plugins/po.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index dd85edf3d..2e16cc7c4 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -296,6 +296,12 @@ underlay, and the underlays lack translation to a given language.
 > Any simple testcase to reproduce it, please? I've never seen this
 > happen yet. --[[intrigeri]]
 
+>> Sure, go here <http://l10n.ikiwiki.info/smiley/smileys/index.sv.html>
+>> (Currently 0% translateed) and see the 'WikiLink' link at the bottom,
+>> which goes to <http://l10n.ikiwiki.info/ikiwiki.cgi?page=ikiwiki/wikilink&from=smiley/smileys&do=create>
+>> Compare with eg, the 100% translated Dansk version, where
+>> the WikiLink link links to the English WikiLink page. --[[Joey]] 
+
 Double commits of po files
 --------------------------
 
-- 
cgit v1.2.3


From 6160238439c5df335944add13b00a0a80d1b663b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:15:34 -0400
Subject: comments; my filter-full branch should fix this

---
 doc/bugs/po_vs_templates.mdwn | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index ce0ac3577..7bc56676e 100644
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -18,6 +18,26 @@ This has been fixed in my po branch.
 
 -- [[intrigeri]]
 
-
+>> Hmm. Don't like adding a fourth positional parameter to that (or
+>> any really) function.
+>>
+>> I think it's quite possible that some of the directives that are
+>> calling filter do so unnecessarily. For example, conditional,
+>> cutpaste, more, and toggle each re-filter text that comes from the
+>> page and so has already been filtered. They could probably drop
+>> the filtering. template likewise does not need to filter the 
+>> parameters passed into it. Does it need to filter the template output?
+>> Well, it allows the (deprecated) embed plugin to work on template
+>> content, but that's about it.
+>>
+>> Note also that the only other plugin to provide a filter, txt,
+>> could also run into similar problems as po has, in theory (it looks at
+>> the page parameter and assumes the content is for the whole page).
+>>
+>> [[!template id=gitbranch branch=origin/filter-full author="[[joey]]"]]
+>> So, I've made a filter-full branch, where I attempt to fix this
+>> by avoiding unnecessary filtering. Can you check it and merge it into
+>> your po branch and remove your other workarounds so I can merge?
+>> --[[Joey]]
 
 [[!tag patch]]
-- 
cgit v1.2.3


From beabd511e2477b90c409ce63c3b8decb5769ef03 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 15:23:59 -0400
Subject: comment

---
 doc/todo/Fix_selflink_in_po_plugin.mdwn | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'doc')

diff --git a/doc/todo/Fix_selflink_in_po_plugin.mdwn b/doc/todo/Fix_selflink_in_po_plugin.mdwn
index b83d2814a..791c6c055 100644
--- a/doc/todo/Fix_selflink_in_po_plugin.mdwn
+++ b/doc/todo/Fix_selflink_in_po_plugin.mdwn
@@ -8,3 +8,9 @@ Fixed in my po branch. --[[intrigeri]]
 [[!tag patch]]
 
 > bump?
+
+>> I know I've looked at 88c6e2891593fd508701d728602515e47284180c 
+>> before, and something about it just seemed wrong. Maybe it's
+>> the triviality of the sub, which it would seem to be easy to 
+>> decide to refactor back into its one caller (which would reintroduce the
+>> bug). --[[Joey]] 
-- 
cgit v1.2.3


From 8fe277c2ab42393b754fc65d966bf4ec242719ab Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Sat, 26 Jun 2010 00:59:20 +0200
Subject: typo fix. (cherry picked from commit
 924f559e5049a63488a5f2baca610299a7e02957)

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

(limited to 'doc')

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 2e16cc7c4..646d0cef3 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -130,7 +130,7 @@ lighttpd
 --------
 
 Recent versions of lighttpd should be able to use
-`$HTTP["language"]` to configure the translatted pages to be served.
+`$HTTP["language"]` to configure the translated pages to be served.
 
 See [Lighttpd Issue](http://redmine.lighttpd.net/issues/show/1119)
 
-- 
cgit v1.2.3


From cd03bd0b804cf4919a5d195c53bcea1f9730a51f Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Fri, 25 Jun 2010 23:18:34 +0200
Subject: po: added support for html pagetype

... after having audited the po4a Xml and Xhtml modules for security issues.

Signed-off-by: intrigeri <intrigeri@boum.org>
(cherry picked from commit a128c256a51392fcf752bf612d83a90e8c68027e)
---
 IkiWiki/Plugin/po.pm           | 47 +++++++++++++++++++++++++++++++++---------
 doc/plugins/po.mdwn            | 10 ++++-----
 doc/plugins/po/discussion.mdwn | 17 +++++++++++++++
 3 files changed, 59 insertions(+), 15 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm
index e85c9d760..4e6eff94f 100644
--- a/IkiWiki/Plugin/po.pm
+++ b/IkiWiki/Plugin/po.pm
@@ -848,8 +848,8 @@ sub refreshpot ($) {
 	my $masterfile=shift;
 
 	my $potfile=potfile($masterfile);
-	my %options = ("markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->{TT}{utf_mode} = 1;
 	$doc->{TT}{file_in_charset} = 'UTF-8';
 	$doc->{TT}{file_out_charset} = 'UTF-8';
@@ -940,10 +940,8 @@ sub percenttranslated ($) {
 	return gettext("N/A") unless istranslation($page);
 	my $file=srcfile($pagesources{$page});
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $file ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1094,10 +1092,8 @@ sub po_to_markup ($$) {
 		or return $fail->(sprintf(gettext("failed to write %s"), $infile));
 
 	my $masterfile = srcfile($pagesources{masterpage($page)});
-	my %options = (
-		"markdown" => (pagetype($masterfile) eq 'mdwn') ? 1 : 0,
-	);
-	my $doc=Locale::Po4a::Chooser::new('text',%options);
+	my $doc=Locale::Po4a::Chooser::new(po4a_type($masterfile),
+					   po4a_options($masterfile));
 	$doc->process(
 		'po_in_name'	=> [ $infile ],
 		'file_in_name'	=> [ $masterfile ],
@@ -1160,6 +1156,37 @@ sub isvalidpo ($) {
 					"to previous page to continue edit"));
 }
 
+sub po4a_type ($) {
+	my $file = shift;
+
+	my $pagetype = pagetype($file);
+	if ($pagetype eq 'html') {
+		return 'xhtml';
+        }
+	return 'text';
+}
+
+sub po4a_options($) {
+	my $file = shift;
+
+	my %options;
+	my $pagetype = pagetype($file);
+
+	if ($pagetype eq 'html') {
+		# how to disable options is not consistent across po4a modules
+		$options{includessi} = '';
+		$options{includeexternal} = 0;
+        }
+	elsif ($pagetype eq 'mdwn') {
+		$options{markdown} = 1;
+        }
+        else {
+		$options{markdown} = 0;
+        }
+
+	return %options;
+}
+
 # ,----
 # | PageSpecs
 # `----
diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 646d0cef3..fab6053b3 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -213,16 +213,16 @@ preferred `$EDITOR`, without needing to be online.
 Markup languages support
 ------------------------
 
-[[Markdown|mdwn]] is well supported. Some other markup languages supported
-by ikiwiki mostly work, but some pieces of syntax are not rendered
-correctly on the slave pages:
+[[Markdown|mdwn]] and [[html]] are well supported. Some other markup
+languages supported by ikiwiki mostly work, but some pieces of syntax
+are not rendered correctly on the slave pages:
 
 * [[reStructuredText|rst]]: anonymous hyperlinks and internal
   cross-references
 * [[wikitext]]: conversion of newlines to paragraphs
 * [[creole]]: verbatim text is wrapped, tables are broken
-* [[html]] and LaTeX: not supported yet; the dedicated po4a modules
-  could be used to support them, but they would need a security audit
+* LaTeX: not supported yet; the dedicated po4a module
+  could be used to support it, but it would need a security audit
 * other markup languages have not been tested.
 
 Security
diff --git a/doc/plugins/po/discussion.mdwn b/doc/plugins/po/discussion.mdwn
index 27683f1ea..73858c818 100644
--- a/doc/plugins/po/discussion.mdwn
+++ b/doc/plugins/po/discussion.mdwn
@@ -150,6 +150,23 @@ The following analysis was done with his help.
   variables; according to [[Joey]], this is "Freaky code, but seems ok
   due to use of `quotementa`".
 
+##### Locale::Po4a::Xhtml
+
+* does not run any external program
+* does not build regexp's from untrusted variables
+
+=> Seems safe as far as the `includessi` option is disabled; the po
+plugin explicitly disables it.
+
+Relies on Locale::Po4a::Xml` to do most of the work.
+
+##### Locale::Po4a::Xml
+
+* does not run any external program
+* the `includeexternal` option makes it able to read external files;
+  the po plugin explicitly disables it
+* untrusted variables are escaped when used to build regexp's
+
 ##### Text::WrapI18N
 
 `Text::WrapI18N` can cause DoS
-- 
cgit v1.2.3


From 472d3fba7db7184fee3c4122d8f628cd6436c6bc Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 16:08:54 -0400
Subject: comment

---
 doc/plugins/po.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index fab6053b3..fe4d75748 100644
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -266,6 +266,14 @@ to an array to support this. (If twere done, twere best done quickly.)
 > Done in my po branch, preserving backward compatibility. Please
 > review :) --[[intrigeri]]
 
+>> Right, well my immediate concern is that using an array to hold
+>> hash-like pairs is not very clear to the user. It will be displayed
+>> in a confusing way by websetup; dumping a setup file will probably
+>> also cause it to be formatted in a confusing way. And the code
+>> seems to assume that the array length is even, and probably blows
+>> up if it is not.. and the value is marked safe so websetup can be
+>> used to modify it and break that way too. --[[Joey]] 
+
 Pagespecs
 ---------
 
-- 
cgit v1.2.3


From 527c169ab2a6617138da2c4b817e452db65f80bf Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 4 Jul 2010 17:11:30 -0400
Subject: add news item for ikiwiki 3.20100704

---
 doc/news/version_3.20100515.mdwn | 58 ----------------------------------------
 doc/news/version_3.20100704.mdwn | 26 ++++++++++++++++++
 2 files changed, 26 insertions(+), 58 deletions(-)
 delete mode 100644 doc/news/version_3.20100515.mdwn
 create mode 100644 doc/news/version_3.20100704.mdwn

(limited to 'doc')

diff --git a/doc/news/version_3.20100515.mdwn b/doc/news/version_3.20100515.mdwn
deleted file mode 100644
index 043346c88..000000000
--- a/doc/news/version_3.20100515.mdwn
+++ /dev/null
@@ -1,58 +0,0 @@
-News for ikiwiki 3.20100515:
-
-   There are two significant changes to the page.tmpl template in this version.
-   If you have a locally modified version of that template, you will need to
-   update it at least to contain the following in the HTML `<head>`:
-
-	<TMPL_IF DYNAMIC>
-	<TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
-	<TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF>
-	</TMPL_IF>
-	</TMPL_IF>
-
-   Also, the footer should be wrapped in `<TMPL_UNLESS DYNAMIC> ... </TMPL_UNLESS>`
-
-   There is a new "comment()" pagespec, that can be used to match a
-   comment on a page. It is recommended to use it instead of the old
-   method of using a pagespec such as "internal(comment\_*)" to match
-   things that looked like comments. The old pagespec will now also match
-   comments that are held for moderation; likely not what you want.
-
-   There have also been some changes to the style.css in this version,
-   particularly to support the new openid selector. If you have a modified
-   version, of style.css, updating it (or moving it to local.css) is
-   recommended.
-
-ikiwiki 3.20100515 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Removed misc.tmpl. Now to theme ikiwiki, you only need to customise
-     a single template, page.tmpl.
-   * If you have a locally customised page.tmpl, it needs to be updated
-     to set &lt;base&gt; when BASEURL or FORCEBASEURL is set.
-   * comments: Comments pending moderation are now stored in the srcdir
-     alongside accepted comments, but with a `._comment_pending` extension.
-     This allows easier byhand moderation, as the "\_pending" need
-     only be stripped off and the comment be committed to version control.
-   * The `comment_pending()` pagespec can be used to match such unmoderated
-     comments, which makes it easy to add a feed of them, or a counter
-     indicating how many there are.
-   * Belatedly added a `comment()` pagespec.
-   * Gave comment and page editing forms some CSS and accessability love.
-   * Renamed postscan hook to indexhtml, to reflect its changed position,
-     and typical use.
-   * inline: Call indexhtml when inlining internal pages, so their
-     text can be indexed for searching.
-   * Delete hooks are passed deleted internal pages.
-   * openid: Incorporated a fancy openid-selector signin form.
-     (Based on <http://code.google.com/p/openid-selector/>)
-   * openid: Use "openid\_identifier" as the form field, as required
-     by OpenID Authentication v2.0 spec.
-   * Removed the openidsignup option. Instead, my recommendation is to
-     leave passwordauth enabled and let people who don't have an openid use it.
-     The openid selector form avoids the UI annoyance of having both openid
-     and passwordauth on one form.
-   * calendar: Allow negative month to be specified. -1 is last month, etc.
-     (And also negative years.)
-   * calendar: Display year in title of month calendar.
-   * Use xhtml friendly pubdate setting.
-   * remove, rename: Add guards against XSRF attacks."""]]
diff --git a/doc/news/version_3.20100704.mdwn b/doc/news/version_3.20100704.mdwn
new file mode 100644
index 000000000..9d2792ce6
--- /dev/null
+++ b/doc/news/version_3.20100704.mdwn
@@ -0,0 +1,26 @@
+ikiwiki 3.20100704 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Changes to avoid display of ugly google openids, by displaying
+     a username taken from openid.
+   * API: Add new optional field nickname to rcs\_recentchanges.
+   * API: rcs\_commit and rcs\_commit\_staged are now passed named
+     parameters.
+   * openid: Store nickname based on username or email provided from
+     openid provider.
+   * git: Record the nickname from openid in the git author email.
+   * comment: Record the username from openid in the comment page.
+   * Fixed some confusion and bugginess about whether
+     rcs\_getctime/rcs\_getmtime were passed absolute or relative filenames.
+     (Make it relative like everything else.)
+   * hnb: Fixed broken use of mkstemp that had caused dangling temp files,
+     and prevented actually rendering hnb files.
+   * Use comment template on comments page of example blog.
+   * comment.tmpl: Fix up display when inline uses it to display a non-comment
+     page. (Such as a discussion page.)
+   * git: Added git\_wrapper\_background\_command option. Can be used to eg,
+     make the git wrapper push to github in the background after ikiwiki
+     runs.
+   * po: Added needstranslation() pagespec. (intrigeri)
+   * po: Added support for .html source pages. (intrigeri)
+   * comment: Fix problem moderating comments of certian pages with utf-8
+     in their name."""]]
\ No newline at end of file
-- 
cgit v1.2.3


From bb216ff0ad183981b5f9be74ccaaf9ef72617922 Mon Sep 17 00:00:00 2001
From: "http://danieroux.com/" <danieroux@web>
Date: Mon, 5 Jul 2010 08:23:20 +0000
Subject:

---
 doc/sandbox.mdwn | 10 ----------
 1 file changed, 10 deletions(-)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 4c8621f1c..59b1d7fd9 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,15 +1,5 @@
 This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version  ]]).
 
-<<<<<<< HEAD
-Test conflict.
-=======
-Testing 123.
->>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718
-
-# Header
-
-## Subheader2
-
 > This is a blockquote.
 >
 > This is the first level of quoting.
-- 
cgit v1.2.3


From ca818980147c875a29031e33495995856f06cc3d Mon Sep 17 00:00:00 2001
From: "http://danieroux.com/" <danieroux@web>
Date: Mon, 5 Jul 2010 08:23:48 +0000
Subject:

---
 doc/sandbox.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 59b1d7fd9..f386adec4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -19,6 +19,7 @@ Numbered list
 1. And another..
  1. foo
  2. bar
+ 3. quz
 
 Bulleted list
 
-- 
cgit v1.2.3


From a3f7333496cbec14d4c6c0b6347c77e2390fe09e Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Mon, 5 Jul 2010 10:36:39 +0000
Subject: recentchanges dir should be under control of RCS?

---
 ...s_dir_should_be_under_control_of_RCS__63__.mdwn | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
new file mode 100644
index 000000000..e8b5d9290
--- /dev/null
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -0,0 +1,32 @@
+Hello Joey,
+
+I noticed that my Ikiwiki started to rebuild pages very slowly after my last changes
+when I upgraded Ikiwiki to version 3.20100623. Now I have the latest release 3.20100704,
+but it doesn't help me.
+
+I started to debug the problem and I found that I can see a lot of messages
+like below when I try to rebuild my wiki manually:
+
+    svn: '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany' is not a working copy
+    svn: Can't open file '/path/to/ikiwiki/trunk/pages/ostatnie_zmiany/.svn/entries': No such file or directory
+    svn log exited 256
+
+"ostatnie_zmiany" is a value of `recentchangespage` parameter in my
+`ikiwiki.setup` file. It is not under control Subversion I use for Ikiwiki:
+
+    $ svn status pages/ostatnie_zmiany
+    ?      pages/ostatnie_zmiany
+
+    $ ls pages/ostatnie_zmiany/*._change |wc -l
+    100
+
+`recentchangesnum` parameter has value 100 for me and I noticed that my Ikiwiki
+takes a lot of time to parse all `._change` files.
+
+Do you think I should add `ostatnie_zmiany` directory under control of my
+Subversion repo? If it's not necessary, could you please give me any hint
+to find a reason of problem with my Ikiwiki?
+
+My best regards,
+Pawel
+
-- 
cgit v1.2.3


From cddb39cbf5d385273645f62f15bdf29b7607aac2 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Mon, 5 Jul 2010 10:44:29 +0000
Subject: Forgotten notice about /ostatnie_zmiany.html page

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

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index e8b5d9290..69af04fe9 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -21,7 +21,8 @@ like below when I try to rebuild my wiki manually:
     100
 
 `recentchangesnum` parameter has value 100 for me and I noticed that my Ikiwiki
-takes a lot of time to parse all `._change` files.
+takes a lot of time to parse all `._change` files. Finally it doesn't refresh
+/ostatnie_zmiany.html page.
 
 Do you think I should add `ostatnie_zmiany` directory under control of my
 Subversion repo? If it's not necessary, could you please give me any hint
-- 
cgit v1.2.3


From f6db10df21f04df83e109924647b07672050dbf3 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 14:04:49 -0400
Subject: img: Add a margin around images displayed by this directive.

Particularly important for floating images, which could before be placed
uncomfortably close to text.
---
 IkiWiki/Plugin/img.pm | 7 +++++++
 debian/changelog      | 6 ++++++
 doc/style.css         | 4 ++++
 3 files changed, 17 insertions(+)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/img.pm b/IkiWiki/Plugin/img.pm
index eb1b68124..2375ead89 100644
--- a/IkiWiki/Plugin/img.pm
+++ b/IkiWiki/Plugin/img.pm
@@ -156,6 +156,13 @@ sub preprocess (@) {
 		$imgurl="$config{url}/$imglink";
 	}
 
+	if (exists $params{class}) {
+		$params{class}.=" img";
+	}
+	else {
+		$params{class}="img";
+	}
+
 	my $attrs='';
 	foreach my $attr (qw{alt title class id hspace vspace}) {
 		if (exists $params{$attr}) {
diff --git a/debian/changelog b/debian/changelog
index 9f1a33f2f..d426be019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20100705) UNRELEASED; urgency=low
+
+  * img: Add a margin around images displayed by this directive.
+
+ -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
+
 ikiwiki (3.20100704) unstable; urgency=low
 
   * Changes to avoid display of ugly google openids, by displaying
diff --git a/doc/style.css b/doc/style.css
index bf000dae1..8dd3b1c15 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -91,6 +91,10 @@ nav {
 	text-align: center;
 }
 
+img.img {
+	margin: 0.5ex;
+}
+
 .align-left {
 	float:left;
 }
-- 
cgit v1.2.3


From d89e2be91d79fca0a062744ff1dee630962cba7d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 14:16:36 -0400
Subject: response

---
 ...changes_dir_should_be_under_control_of_RCS__63__.mdwn | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index 69af04fe9..bef79335f 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -31,3 +31,19 @@ to find a reason of problem with my Ikiwiki?
 My best regards,
 Pawel
 
+> No, the recentchanges pages are automatically generated and should not
+> themselves be in revision control.
+> 
+> Ikiwiki has recently started automatically enabing `--gettime`, but
+> it should not do it every time, but only on the initial build
+> of a wiki. It will print "querying svn for file creation and modification
+> times.." when it does this. If it's doing it every time, something
+> is wrong. (Specifically, `.ikiwiki/indexdb` must be missing somehow.)
+> 
+> The support for svn with --gettime is rather poor. (While with git it is
+> quite fast.) But as it's only supposed to happen on the first build,
+> I haven't tried to speed it up. It would be hard to do it fast with svn.
+> It would be possible to avoid the warning message above, or even skip
+> processing files in directories not checked into svn -- but I'd much
+> rather understand why you are seeing this happen on repeated builds.
+> --[[Joey]]
-- 
cgit v1.2.3


From 7e3fb8b8a230a725df7814c15745c6fee9ddd5b1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Jul 2010 20:19:31 -0400
Subject: comments: Added commentmoderation directive for easy linking to the
 comment moderation queue.

---
 IkiWiki/Plugin/comments.pm                   | 17 +++++++++++++++++
 debian/changelog                             |  2 ++
 doc/examples/blog/comments.mdwn              |  2 +-
 doc/ikiwiki/directive/commentmoderation.mdwn |  9 +++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 doc/ikiwiki/directive/commentmoderation.mdwn

(limited to 'doc')

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 30ade5634..f0eec9ace 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -22,6 +22,7 @@ sub import {
 	hook(type => "checkconfig", id => 'comments',  call => \&checkconfig);
 	hook(type => "getsetup", id => 'comments',  call => \&getsetup);
 	hook(type => "preprocess", id => 'comment', call => \&preprocess);
+	hook(type => "preprocess", id => 'commentmoderation', call => \&preprocess_moderation);
 	# here for backwards compatability with old comments
 	hook(type => "preprocess", id => '_comment', call => \&preprocess);
 	hook(type => "sessioncgi", id => 'comment', call => \&sessioncgi);
@@ -251,6 +252,22 @@ sub preprocess {
 	return $content;
 }
 
+sub preprocess_moderation {
+	my %params = @_;
+
+	$params{desc}=gettext("Comment Moderation")
+		unless defined $params{desc};
+
+	if (length $config{cgiurl}) {
+		return '<a href="'.
+			IkiWiki::cgiurl(do => 'commentmoderation').
+			'">'.$params{desc}.'</a>';
+	}
+	else {
+		return $params{desc};
+	}
+}
+
 sub sessioncgi ($$) {
 	my $cgi=shift;
 	my $session=shift;
diff --git a/debian/changelog b/debian/changelog
index d426be019..18db7c0c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 ikiwiki (3.20100705) UNRELEASED; urgency=low
 
   * img: Add a margin around images displayed by this directive.
+  * comments: Added commentmoderation directive for easy linking to the
+    comment moderation queue.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/examples/blog/comments.mdwn b/doc/examples/blog/comments.mdwn
index 52c7d3132..e22b50a34 100644
--- a/doc/examples/blog/comments.mdwn
+++ b/doc/examples/blog/comments.mdwn
@@ -1,7 +1,7 @@
 [[!sidebar content="""
 [[!inline pages="comment_pending(./posts/*)" feedfile=pendingmoderation
 description="comments pending moderation" show=-1]]
-Comments in the moderation queue:
+Comments in the [[!commentmoderation desc="moderation queue"]]:
 [[!pagecount pages="comment_pending(./posts/*)"]]
 """]]
 
diff --git a/doc/ikiwiki/directive/commentmoderation.mdwn b/doc/ikiwiki/directive/commentmoderation.mdwn
new file mode 100644
index 000000000..8553b5b17
--- /dev/null
+++ b/doc/ikiwiki/directive/commentmoderation.mdwn
@@ -0,0 +1,9 @@
+The `commentmoderation` directive is supplied by the
+[[!iki plugins/comments desc=comments]] plugin, and is used to link
+to the comment moderation queue.
+
+Example:
+
+	\[[!commentmoderation desc="here is the comment moderation queue"]]
+
+[[!meta robots="noindex, follow"]]
-- 
cgit v1.2.3


From b5085a01ce325e5ae55080cca4860cdcc1885165 Mon Sep 17 00:00:00 2001
From: Javier Rojas <jerojasro@devnull.li>
Date: Mon, 5 Jul 2010 23:34:47 -0500
Subject: new forum post - ikiwiki vim syntax

---
 doc/forum/ikiwiki_vim_syntaxfile.mdwn | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 doc/forum/ikiwiki_vim_syntaxfile.mdwn

(limited to 'doc')

diff --git a/doc/forum/ikiwiki_vim_syntaxfile.mdwn b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
new file mode 100644
index 000000000..d0f8d259e
--- /dev/null
+++ b/doc/forum/ikiwiki_vim_syntaxfile.mdwn
@@ -0,0 +1,21 @@
+Hi all,
+
+I'm teaching myself how to write syntax files for vim by fixing several issues
+(and up to certain extent, taking over the maintenance) of the vim syntax
+(highlighting) file for ikiwiki.
+
+I'd like you to document here which problems you have found, so I can hunt them
+and see if I can fix them.
+
+## Problems Found
+
+  * Arguments of directives with a value of length 1 cause the following text to
+  be highlighted incorrectly. Example:
+
+        [[!directive param1="val1" param2="1"]] more text ...
+
+  * A named wikilink in a line, followed by text, and then another wikilink,
+  makes the text in between the links to be incorrectly highlighted. Example:
+
+        \[[a link|alink]] text that appears incorrectly .... \[[link]]
+
-- 
cgit v1.2.3


From 9edab06b186e7e0b3d7cef84e92509cdb05ddb7d Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Tue, 6 Jul 2010 10:36:02 +0000
Subject: Reply

---
 ...s_dir_should_be_under_control_of_RCS__63__.mdwn | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index bef79335f..b58c2c28e 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -47,3 +47,34 @@ Pawel
 > processing files in directories not checked into svn -- but I'd much
 > rather understand why you are seeing this happen on repeated builds.
 > --[[Joey]]
+
+>> Thanks a lot for your reply! I've just checked my `rebuild-pages.sh`
+>> script and discovered that it contains
+>> `/usr/bin/ikiwiki --setup ikiwiki.setup --gettime` command... :D
+>> The warnings disappeared when I removed `--gettime` parameter.
+>> Sorry for confusing! :)
+>>
+>> I have `.ikiwiki/indexdb` file here, but I noticed that it has been
+>> modified about 1 minute **after** last Subversion commit:
+>>
+>>     $ LANG=C svn up
+>>     At revision 5951.
+>>    
+>>     $ LANG=C svn log -r 5951
+>>     ------------------------------------------------------------------------
+>>     r5951 | svn | 2010-07-06 09:02:30 +0200 (Tue, 06 Jul 2010) | 1 line
+>>     
+>>     web commit by xahil
+>>     ------------------------------------------------------------------------
+>>    
+>>     $ LANG=C stat pages/.ikiwiki/indexdb 
+>>       File: `pages/.ikiwiki/indexdb'
+>>       Size: 184520    	Blocks: 368        IO Block: 131072 regular file
+>>     Device: 2bh/43d	Inode: 1931145     Links: 1
+>>     Access: (0644/-rw-r--r--)  Uid: ( 1005/     svn)   Gid: ( 1005/     svn)
+>>     Access: 2010-07-06 12:06:24.000000000 +0200
+>>     Modify: 2010-07-06 09:03:38.000000000 +0200
+>>     Change: 2010-07-06 09:03:38.000000000 +0200
+>>
+>> I believe it's the time I have to wait to see that my wiki page has been rebuilt.
+>> Do you have any idea how to find a reason of that delay? --[[Paweł|ptecza]]
-- 
cgit v1.2.3


From 2dd0c177a6b33488dfcfff9041a3749b44484f34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 6 Jul 2010 13:57:17 -0400
Subject: aggregate: Write timestamp next aggregation can happen to
 .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.

---
 IkiWiki/Plugin/aggregate.pm | 18 ++++++++++++++++--
 debian/changelog            |  2 ++
 doc/plugins/aggregate.mdwn  | 15 ++++++++++++---
 3 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 5a9eb433d..7789c4c2a 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -298,7 +298,7 @@ sub loadstate () {
 	return if $state_loaded;
 	$state_loaded=1;
 	if (-e "$config{wikistatedir}/aggregate") {
-		open(IN, "$config{wikistatedir}/aggregate") ||
+		open(IN, "<", "$config{wikistatedir}/aggregate") ||
 			die "$config{wikistatedir}/aggregate: $!";
 		while (<IN>) {
 			$_=IkiWiki::possibly_foolish_untaint($_);
@@ -335,7 +335,7 @@ sub savestate () {
 	garbage_collect();
 	my $newfile="$config{wikistatedir}/aggregate.new";
 	my $cleanup = sub { unlink($newfile) };
-	open (OUT, ">$newfile") || error("open $newfile: $!", $cleanup);
+	open (OUT, ">", $newfile) || error("open $newfile: $!", $cleanup);
 	foreach my $data (values %feeds, values %guids) {
 		my @line;
 		foreach my $field (keys %$data) {
@@ -356,6 +356,20 @@ sub savestate () {
 	close OUT || error("save $newfile: $!", $cleanup);
 	rename($newfile, "$config{wikistatedir}/aggregate") ||
 		error("rename $newfile: $!", $cleanup);
+
+	my $timestamp=undef;
+	foreach my $feed (keys %feeds) {
+		my $t=$feeds{$feed}->{lastupdate}+$feeds{$feed}->{updateinterval};
+		if (! defined $timestamp || $timestamp > $t) {
+			$timestamp=$t;
+		}
+	}
+	$newfile=~s/\.new$/time/;
+	open (OUT, ">", $newfile) || error("open $newfile: $!", $cleanup);
+	if (defined $timestamp) {
+		print OUT $timestamp."\n";
+	}
+	close OUT || error("save $newfile: $!", $cleanup);
 }
 
 sub garbage_collect () {
diff --git a/debian/changelog b/debian/changelog
index 18db7c0c2..9d88b5c9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
   * img: Add a margin around images displayed by this directive.
   * comments: Added commentmoderation directive for easy linking to the
     comment moderation queue.
+  * aggregate: Write timestamp next aggregation can happen to
+    .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/plugins/aggregate.mdwn b/doc/plugins/aggregate.mdwn
index bb828b05c..2925b6fba 100644
--- a/doc/plugins/aggregate.mdwn
+++ b/doc/plugins/aggregate.mdwn
@@ -5,9 +5,13 @@ This plugin allows content from other feeds to be aggregated into the
 wiki. To specify feeds to aggregate, use the
 [[ikiwiki/directive/aggregate]] [[ikiwiki/directive]].
 
-The [[meta]] and [[tag]] plugins are also recommended. Either the
-[[htmltidy]] or [[htmlbalance]] plugin is suggested, since feeds can easily
-contain html problems, some of which these plugins can fix.
+## requirements
+
+The [[meta]] and [[tag]] plugins are also recommended to be used with this
+one. Either the [[htmltidy]] or [[htmlbalance]] plugin is suggested, since
+feeds can easily contain html problems, some of which these plugins can fix.
+
+## triggering aggregation
 
 You will need to run ikiwiki periodically from a cron job, passing it the
 --aggregate parameter, to make it check for new posts. Here's an example
@@ -15,6 +19,11 @@ crontab entry:
 
 	*/15 * * * * ikiwiki --setup my.wiki --aggregate --refresh
 
+The plugin updates a file `.ikiwiki/aggregatetime` with the unix time stamp
+when the next aggregation run could occur. (The file may be empty, if no
+aggregation is required.) This can be integrated into more complex cron
+jobs or systems to trigger aggregation only when needed.
+
 Alternatively, you can allow `ikiwiki.cgi` to trigger the aggregation. You
 should only need this if for some reason you cannot use cron, and instead
 want to use a service such as [WebCron](http://webcron.org). To enable
-- 
cgit v1.2.3


From 87890d19cca9c051f4e0de1acf0a5c337e93a92e Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE"
 <Kai@web>
Date: Wed, 7 Jul 2010 09:01:29 +0000
Subject: quick fix

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

(limited to 'doc')

diff --git a/doc/bugs/support_for_openid2_logins.mdwn b/doc/bugs/support_for_openid2_logins.mdwn
index 139a53760..a71ed7ba9 100644
--- a/doc/bugs/support_for_openid2_logins.mdwn
+++ b/doc/bugs/support_for_openid2_logins.mdwn
@@ -20,3 +20,5 @@ However both Perl OpenID 2.x implementations have not been released and are inco
 
 > I've tested with yahoo, and it works with the updated module. Sweet and
 > [[done]] --[[Joey]] 
+
+## A quick fix for the impatient running stable is simply `sudo apt-get install libnet-openid-consumer-perl -t unstable`
-- 
cgit v1.2.3


From c34e4823268183eac476072a8aa87a2756529a29 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawmbuZI4n1RsTe3Yeaqb5F-yhtR7a8BWEIE"
 <Kai@web>
Date: Wed, 7 Jul 2010 10:48:36 +0000
Subject:

---
 doc/tips/howto_limit_to_admin_users.mdwn | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/tips/howto_limit_to_admin_users.mdwn

(limited to 'doc')

diff --git a/doc/tips/howto_limit_to_admin_users.mdwn b/doc/tips/howto_limit_to_admin_users.mdwn
new file mode 100644
index 000000000..4d579327a
--- /dev/null
+++ b/doc/tips/howto_limit_to_admin_users.mdwn
@@ -0,0 +1,9 @@
+Enable [[plugins/lockedit]] in your setup file.
+
+For example:
+
+    add_plugins => [qw{goodstuff table rawhtml template embed typography sidebar img remove lockedit}],
+
+And to only allow admin users to edit the page, simply specify a pagespec for everything in the .setup:
+
+    locked_pages => '*',
-- 
cgit v1.2.3


From ee279518878fc3225f138d06a16406b418858b2e Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Jul 2010 13:55:46 -0400
Subject: another tip

---
 doc/tips/optimising_ikiwiki.mdwn | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'doc')

diff --git a/doc/tips/optimising_ikiwiki.mdwn b/doc/tips/optimising_ikiwiki.mdwn
index 14d619ff8..caed75ba6 100644
--- a/doc/tips/optimising_ikiwiki.mdwn
+++ b/doc/tips/optimising_ikiwiki.mdwn
@@ -38,6 +38,14 @@ If your version of ikiwiki is not [[!version]], try upgrading. New
 optimisations are frequently added to ikiwiki, some of them yielding
 *enormous* speed increases.
 
+## run ikiwiki in verbose mode
+
+Try changing a page, and run ikiwiki with `-v` so it will tell you
+everything it does to deal with that changed page. Take note of
+which other pages are rebuilt, and which parts of the build take a long
+time. This can help you zero in on individual pages that contain some of
+the expensive things listed below. 
+
 ## expensive inlines
 
 Do you have an archive page for your blog that shows all posts, 
-- 
cgit v1.2.3


From b1f7aac8ec81490415d487b7db09d03675a7890b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 7 Jul 2010 13:57:34 -0400
Subject: response

---
 ...centchanges_dir_should_be_under_control_of_RCS__63__.mdwn | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index b58c2c28e..c49baca3e 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -78,3 +78,15 @@ Pawel
 >>
 >> I believe it's the time I have to wait to see that my wiki page has been rebuilt.
 >> Do you have any idea how to find a reason of that delay? --[[Paweł|ptecza]]
+
+>>> Well, I hope that your svn post-commit hook is not running your
+>>> `rebuild-pages.sh`. That script rebuilds everything, rather than just
+>>> refreshing what's been changed.
+>>>
+>>> Using subversion is not asking for speed. Especially if your svn
+>>> repository is on a remote host. You might try disabling
+>>> recentchanges and see if that speeds up the refreshes (it will avoid
+>>> one `svn log`).
+>>>
+>>> Otherwise, take a look at [[tips/optimising_ikiwiki]]
+>>> for some advice on things that can make ikiwiki run slowly. --[[Joey]]
-- 
cgit v1.2.3


From 366b24a0f980b677dcb615fd7964953230f47dec Mon Sep 17 00:00:00 2001
From: "http://joey.kitenet.net/" <joey@web>
Date: Thu, 8 Jul 2010 06:04:44 +0000
Subject: Added a comment: do parameter missing

---
 .../comment_5_e098723bb12adfb91ab561cae21b492b._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment

(limited to 'doc')

diff --git a/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment
new file mode 100644
index 000000000..b832d64f4
--- /dev/null
+++ b/doc/forum/The_requested_URL___47____126__jean__47__blog__47__ikiwiki.cgi_was_not_found_on_this_server./comment_5_e098723bb12adfb91ab561cae21b492b._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://joey.kitenet.net/"
+ nickname="joey"
+ subject="do parameter missing"
+ date="2010-07-08T06:04:44Z"
+ content="""
+I just debugged this problem with someone else who was using ngix-fcgi. There was a problem with it not passing CGI environment variables properly. If you're using that, it might explain your problem.
+"""]]
-- 
cgit v1.2.3


From 39b0c2d04b20c902769037352a81fe080e324b17 Mon Sep 17 00:00:00 2001
From: "http://ptecza.myopenid.com/" <ptecza@web>
Date: Thu, 8 Jul 2010 12:25:45 +0000
Subject: Reply

---
 ...entchanges_dir_should_be_under_control_of_RCS__63__.mdwn | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'doc')

diff --git a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
index c49baca3e..2fe97366b 100644
--- a/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
+++ b/doc/forum/recentchanges_dir_should_be_under_control_of_RCS__63__.mdwn
@@ -90,3 +90,16 @@ Pawel
 >>>
 >>> Otherwise, take a look at [[tips/optimising_ikiwiki]]
 >>> for some advice on things that can make ikiwiki run slowly. --[[Joey]]
+
+>>>> Thanks for the hints! I don't understand it, but it seems that refreshing
+>>>> all pages has resolved the problem and now my wiki works well again :)
+>>>>
+>>>> No, I use `rebuild-pages.sh` script only when I want to rebuild
+>>>> my wiki manually, for example when you release new Ikiwiki version
+>>>> then I need to update my templates. Some of them have been translated
+>>>> to Polish by me.
+>>>>
+>>>> Fortunately my wiki and its Subversion repo are located on the same host.
+>>>> We have a lot of Subversion repos for our projects and I don't want to
+>>>> change only wiki repo for better performance. I'm rather satisfied with
+>>>> its speed. --[[Paweł|ptecza]]
-- 
cgit v1.2.3


From 4e9d62a2d75c79f3450781037e24b549dbd3eda6 Mon Sep 17 00:00:00 2001
From: "http://jeremiahfoster.com/" <jeremiah@web>
Date: Thu, 8 Jul 2010 16:09:32 +0000
Subject:

---
 doc/plugins/goodstuff/discussion.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/plugins/goodstuff/discussion.mdwn

(limited to 'doc')

diff --git a/doc/plugins/goodstuff/discussion.mdwn b/doc/plugins/goodstuff/discussion.mdwn
new file mode 100644
index 000000000..0ad95c00a
--- /dev/null
+++ b/doc/plugins/goodstuff/discussion.mdwn
@@ -0,0 +1 @@
+What is the syntax for enabling plugins in the setup file?
-- 
cgit v1.2.3


From 7dbad39bbe93ebcc05f278965906fd1c77d2bc34 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 8 Jul 2010 14:01:52 -0400
Subject: Add --changesetup mode that allows easily changing options in a setup
 file.

---
 debian/changelog |  2 ++
 doc/setup.mdwn   |  6 ++++++
 doc/usage.mdwn   | 14 +++++++++++---
 ikiwiki.in       | 38 ++++++++++++++++++++++++++------------
 4 files changed, 45 insertions(+), 15 deletions(-)

(limited to 'doc')

diff --git a/debian/changelog b/debian/changelog
index 9d88b5c9c..c340f8901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ikiwiki (3.20100705) UNRELEASED; urgency=low
     comment moderation queue.
   * aggregate: Write timestamp next aggregation can happen to
     .ikiwiki/aggregatetime, to allow for more sophisticated cron jobs.
+  * Add --changesetup mode that allows easily changing options in a
+    setup file.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 05 Jul 2010 13:59:42 -0400
 
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 03fed3aa9..266222cc3 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -102,6 +102,12 @@ After making changes to this file, you need to tell ikiwiki to use it:
 
 	% ikiwiki -setup foo.setup
 
+Alternatively, you can ask ikiwiki to change settings in the file for you:
+
+	% ikiwiki -changesetup foo.setup -plugin goodstuff
+
+See [[usage]] for more options.
+
 ## Customizing file locations
 
 As a wiki compiler, ikiwiki builds a wiki from files in a source directory,
diff --git a/doc/usage.mdwn b/doc/usage.mdwn
index 2f87d60d5..840d105d2 100644
--- a/doc/usage.mdwn
+++ b/doc/usage.mdwn
@@ -32,14 +32,22 @@ These options control the mode that ikiwiki operates in.
 
 * --setup setupfile
 
-  In setup mode, ikiwiki reads the config file, which is really a perl
-  program that can call ikiwiki internal functions.
-
   The default action when --setup is specified is to automatically generate
   wrappers for a wiki based on data in a setup file, and rebuild the wiki.
   If you only want to build any changed pages, you can use --refresh with
   --setup.
 
+* --changesetup setupfile
+
+  Reads the setup file, adds any configuration changes specified by other
+  options, and writes the new configuration back to the setup file. Also
+  updates any configured wrappers. In this mode, the wiki is not fully
+  rebuilt, unless you also add --rebuild.
+
+  Example, to enable some plugins:
+
+	ikiwiki --changesetup ~/ikiwiki.setup --plugin goodstuff --plugin calendar
+
 * --dumpsetup setupfile
 
   Causes ikiwiki to write to the specified setup file, dumping out
diff --git a/ikiwiki.in b/ikiwiki.in
index ac43044df..aa3337938 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -14,24 +14,32 @@ sub usage () {
 	    gettext("       ikiwiki --setup configfile"), "\n";
 }
 
+sub setup (@) {
+	require IkiWiki::Setup;
+	my $verbose=$config{verbose};
+	my $syslog=$config{syslog};
+	IkiWiki::Setup::load($_[1]);
+	$config{setupverbose}=$config{verbose};
+	$config{setupsyslog}=$config{syslog};
+	$config{verbose}=$verbose || $config{setupverbose};
+	$config{syslog}=$syslog;
+	$config{setup}=1;
+}
+
 sub getconfig () {
 	if (! exists $ENV{WRAPPED_OPTIONS}) {
 		%config=defaultconfig();
 		eval q{use Getopt::Long};
 		Getopt::Long::Configure('pass_through');
 		GetOptions(
-			"setup|s=s" => sub {
-				require IkiWiki::Setup;
-				my $verbose=$config{verbose};
-				my $syslog=$config{syslog};
-				IkiWiki::Setup::load($_[1]);
-				$config{setupverbose}=$config{verbose};
-				$config{setupsyslog}=$config{syslog};
-				$config{verbose}=$verbose || $config{setupverbose};
-				$config{syslog}=$syslog;
-				$config{setup}=1;
-			},
+			"setup|s=s" => \&setup,
 			"dumpsetup|s=s" => \$config{dumpsetup},
+			"changesetup|s=s" => sub {
+				$config{changesetup}=$_[1];
+				$config{genwrappers}=1;
+				$config{refresh}=1;
+				setup(@_);
+			},
 			"wikiname=s" => \$config{wikiname},
 			"verbose|v!" => \$config{verbose},
 			"syslog!" => \$config{syslog},
@@ -85,7 +93,8 @@ sub getconfig () {
 				$config{wrappermode}=possibly_foolish_untaint($_[1])
 			},
 			"plugin=s@" => sub {
-				push @{$config{add_plugins}}, $_[1];
+				push @{$config{add_plugins}}, $_[1]
+					unless grep { $_ eq $_[1] } @{$config{add_plugins}};
 			},
 			"disable-plugin=s@" => sub {
 				push @{$config{disable_plugins}}, $_[1];
@@ -181,6 +190,11 @@ sub main () {
 		}
 	}
 
+	if ($config{changesetup}) {
+		require IkiWiki::Setup;
+		IkiWiki::Setup::dump($config{changesetup});
+	}
+
 	if ($config{dumpsetup}) {
 		$config{srcdir}="" if ! defined $config{srcdir};
 		$config{destdir}="" if ! defined $config{destdir};
-- 
cgit v1.2.3


From 99f4056b989acfacf3590dbaec9a505a31420f88 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Fri, 9 Jul 2010 11:44:59 +0000
Subject: minor markup syntax

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

(limited to 'doc')

diff --git a/doc/plugins/rst/discussion.mdwn b/doc/plugins/rst/discussion.mdwn
index 38fbed6d6..3c3b03275 100644
--- a/doc/plugins/rst/discussion.mdwn
+++ b/doc/plugins/rst/discussion.mdwn
@@ -61,8 +61,8 @@ but the backlinks don't show up.
 
 I converted one of my pages to rst:
 
-Before: http://kaizer.se/wiki/kupfer-mdwn  
-After: http://kaizer.se/wiki/kupfer-rst  
+Before: <http://kaizer.se/wiki/kupfer-mdwn>  
+After: <http://kaizer.se/wiki/kupfer-rst>  
 
 I need help on a couple of points
 
-- 
cgit v1.2.3


From 1a7be8d403d162469b26f7272db283daa4eb551c Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Fri, 9 Jul 2010 20:31:10 +0000
Subject:

---
 doc/forum/html_source_pages_in_version_3.20100704.mdwn | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 doc/forum/html_source_pages_in_version_3.20100704.mdwn

(limited to 'doc')

diff --git a/doc/forum/html_source_pages_in_version_3.20100704.mdwn b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
new file mode 100644
index 000000000..b8cbb0f4e
--- /dev/null
+++ b/doc/forum/html_source_pages_in_version_3.20100704.mdwn
@@ -0,0 +1 @@
+Is this different from using the html/rawhtml plugins?
-- 
cgit v1.2.3


From 8a08345f168d367b072ff119b57016b5ef4a1a75 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 06:40:43 +0000
Subject:

---
 doc/forum/remove_css__63__.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/remove_css__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/remove_css__63__.mdwn b/doc/forum/remove_css__63__.mdwn
new file mode 100644
index 000000000..da434e3a1
--- /dev/null
+++ b/doc/forum/remove_css__63__.mdwn
@@ -0,0 +1,3 @@
+I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.
+Is this a bug or you are supposed to remove the css by hand?
+
-- 
cgit v1.2.3


From 787b4ee0d283d99521e4ebc79ec091d5f4f3906a Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 06:41:44 +0000
Subject:

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

(limited to 'doc')

diff --git a/doc/forum/remove_css__63__.mdwn b/doc/forum/remove_css__63__.mdwn
index da434e3a1..b90b3d864 100644
--- a/doc/forum/remove_css__63__.mdwn
+++ b/doc/forum/remove_css__63__.mdwn
@@ -1,3 +1,4 @@
-I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.
-Is this a bug or you are supposed to remove the css by hand?
+I removed a local.css file and pushed the changes to git but the 'compiled' wiki still shows the same css.  
+Is this a bug or you are supposed to remove the css by hand?  
+ikiwiki version 3.20100705
 
-- 
cgit v1.2.3


From 293e12bc0e5347d815da559142bf64dcb60cd7ab Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Sat, 10 Jul 2010 09:20:36 +0000
Subject: link to repolist plugin

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

(limited to 'doc')

diff --git a/doc/plugins/getsource/discussion.mdwn b/doc/plugins/getsource/discussion.mdwn
index 45a1d62b5..3e985948b 100644
--- a/doc/plugins/getsource/discussion.mdwn
+++ b/doc/plugins/getsource/discussion.mdwn
@@ -1 +1,3 @@
 It would be very cool if this plugin was enabled by default.  One of the best ways to learn how to do various advanced things is to be able to "view source" on other wiki's which do things you like.  -- [[AdamShand]]
+
+This plugin requires the cgi plugin.  If you run a static site, you may check the [[repolist]] plugin.  -- [[weakish]]
-- 
cgit v1.2.3


From 3cc0c8b065b8d7051d42d694f7884284e3b5b361 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 12:06:23 +0000
Subject:

---
 doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn

(limited to 'doc')

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn
new file mode 100644
index 000000000..86ed70fd2
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__.mdwn
@@ -0,0 +1,3 @@
+Is it possible to use php-markdown-extra with ikiwiki?
+
+Thanks.
-- 
cgit v1.2.3


From f7474a6e10d7b224764ad2038c128c7e5b448080 Mon Sep 17 00:00:00 2001
From: "http://weakish.myopenid.com/" <weakish@web>
Date: Sat, 10 Jul 2010 12:42:23 +0000
Subject: add my personal website

---
 doc/ikiwikiusers.mdwn | 1 +
 1 file changed, 1 insertion(+)

(limited to 'doc')

diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 6a323ade0..d38b1208b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -149,6 +149,7 @@ Personal sites and blogs
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
 * [Mukund](https://www.mukund.org/)
 * [Nicolas Schodet](http://ni.fr.eu.org/)
+* [weakish](http://weakish.github.com)
 
 Please feel free to add your own ikiwiki site!
 
-- 
cgit v1.2.3


From 281d03f5ab166b556eec7419a81735baf732dc85 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sat, 10 Jul 2010 12:44:15 +0000
Subject: Added a comment: PHP != Perl

---
 .../comment_1_66d48218361caa4c07bd714b82ed0021._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment

(limited to 'doc')

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment
new file mode 100644
index 000000000..af60ecbdb
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_1_66d48218361caa4c07bd714b82ed0021._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="60.241.8.244"
+ subject="PHP != Perl"
+ date="2010-07-10T12:44:15Z"
+ content="""
+Er, why?  IkiWiki is written in Perl.  Presumably php-markdown-extra is written in PHP, which is a completely different language.
+"""]]
-- 
cgit v1.2.3


From 470b33e6a643d07cdc2092481bfb8b7b8da5d0e8 Mon Sep 17 00:00:00 2001
From: 
 "https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
 <Dário@web>
Date: Sat, 10 Jul 2010 21:48:13 +0000
Subject: Added a comment

---
 .../comment_2_f2ee0a4dce571d329f795e52139084c0._comment           | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment

(limited to 'doc')

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment
new file mode 100644
index 000000000..ce60f4b3a
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_2_f2ee0a4dce571d329f795e52139084c0._comment
@@ -0,0 +1,8 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlzADDUvepOXauF4Aq1VZ4rJaW_Dwrl6xE"
+ nickname="Dário"
+ subject="comment 2"
+ date="2010-07-10T21:48:13Z"
+ content="""
+Because php-markdown-extra extends the basic markdown language (footnotes, etc.)
+"""]]
-- 
cgit v1.2.3


From 1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 Mon Sep 17 00:00:00 2001
From: "http://kerravonsen.dreamwidth.org/"
 <http://kerravonsen.dreamwidth.org/@web>
Date: Sun, 11 Jul 2010 07:18:35 +0000
Subject: Added a comment: I still don't get it

---
 .../comment_3_e388714f457ccb6ef73630179914558c._comment          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment

(limited to 'doc')

diff --git a/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment
new file mode 100644
index 000000000..72ce7bb6f
--- /dev/null
+++ b/doc/forum/use_php-markdown-extra_with_ikiwiki__63__/comment_3_e388714f457ccb6ef73630179914558c._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="http://kerravonsen.dreamwidth.org/"
+ ip="202.173.183.92"
+ subject="I still don't get it"
+ date="2010-07-11T07:18:35Z"
+ content="""
+But if you need the \"extra\" features of Markdown, all you have to do is turn on the \"multimarkdown\" option in your configuration.  It makes no sense to try to use PHP with Perl.
+
+"""]]
-- 
cgit v1.2.3