diff -Nru ikiwiki-3.01ubuntu1/auto-blog.setup ikiwiki-3.02ubuntu1/auto-blog.setup --- ikiwiki-3.01ubuntu1/auto-blog.setup 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/auto-blog.setup 2009-01-17 04:42:17.000000000 +0100 @@ -0,0 +1,49 @@ +#!/usr/bin/perl +# Ikiwiki setup automator -- blog version. +# +# This setup file causes ikiwiki to create a wiki, containing a blog, +# check it into revision control, generate a setup file for the new +# wiki, and set everything up. +# +# Just run: ikiwiki -setup /etc/ikiwiki/auto-blog.setup +# +# By default, it asks a few questions, and confines itself to the user's home +# directory. You can edit it to change what it asks questions about, or to +# modify the values to use site-specific settings. + +require IkiWiki::Setup::Automator; + +our $wikiname=IkiWiki::Setup::Automator::ask( + gettext("What will the blog be named?"), gettext("blog")); +our $rcs=IkiWiki::Setup::Automator::ask( + gettext("What revision control system to use?"), "git"); +our $admin=IkiWiki::Setup::Automator::ask( + gettext("What wiki user (or openid) will be admin?"), $ENV{USER}); +use Net::Domain q{hostfqdn}; +our $domain=hostfqdn() || ikiwiki::setup::automator::ask( + gettext("What is the domain name of the web server?"), ""); + +IkiWiki::Setup::Automator->import( + wikiname => $wikiname, + adminuser => [$admin], + rcs => $rcs, + srcdir => "$ENV{HOME}/$wikiname", + destdir => "$ENV{HOME}/public_html/$wikiname", + repository => "$ENV{HOME}/$wikiname.".($rcs eq "monotone" ? "mtn" : $rcs), + dumpsetup => "$ENV{HOME}/$wikiname.setup", + url => "http://$domain/~$ENV{USER}/$wikiname", + cgiurl => "http://$domain/~$ENV{USER}/$wikiname/ikiwiki.cgi", + cgi_wrapper => "$ENV{HOME}/public_html/$wikiname/ikiwiki.cgi", + adminemail => "$ENV{USER}\@$domain", + add_plugins => [qw{goodstuff websetup comments blogspam}], + disable_plugins => [qw{}], + libdir => "$ENV{HOME}/.ikiwiki", + rss => 1, + atom => 1, + syslog => 1, + + example => "blog", + comments_pagespec => "posts/* and !*/Discussion", + blogspam_pagespec => "postcomment(*)", + discussion => 0, +) diff -Nru ikiwiki-3.01ubuntu1/auto.setup ikiwiki-3.02ubuntu1/auto.setup --- ikiwiki-3.01ubuntu1/auto.setup 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/auto.setup 2009-01-13 02:03:55.000000000 +0100 @@ -17,7 +17,7 @@ our $rcs=IkiWiki::Setup::Automator::ask( gettext("What revision control system to use?"), "git"); our $admin=IkiWiki::Setup::Automator::ask( - gettext("What wiki user (or openid) will be wiki admin?"), $ENV{USER}); + gettext("What wiki user (or openid) will be admin?"), $ENV{USER}); use Net::Domain q{hostfqdn}; our $domain=hostfqdn() || ikiwiki::setup::automator::ask( gettext("What is the domain name of the web server?"), ""); @@ -40,5 +40,4 @@ rss => 1, atom => 1, syslog => 1, - hardlink => 1, ) diff -Nru ikiwiki-3.01ubuntu1/CHANGELOG ikiwiki-3.02ubuntu1/CHANGELOG --- ikiwiki-3.01ubuntu1/CHANGELOG 2009-01-06 13:17:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/CHANGELOG 2009-01-18 09:46:13.000000000 +0100 @@ -1,3 +1,39 @@ +ikiwiki (3.02ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #318374), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the generated elements causes /usr/bin/validate to attempt to + download a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Sun, 18 Jan 2009 09:40:58 +0100 + +ikiwiki (3.02) unstable; urgency=low + + * blogspam: New plugin, adding spam filtering for page editing / comment + posting using the BlogSpam.net API. + * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use + in blogging. + * checkcontent: New hook, can be used to implement arbitrary content + filters, including spam filters. + * table: Fix misparsed links in external files. + * table: Find links in external files in scan pass. + * rename: Show full names of affected pages. + * comments: Fix cache avoidance hack. + * repolist: New plugin to support the rel=vcs-* microformat. + * goodstuff: Include repolist by default. (But it does nothing until + configured with the repository locations.) + * comments: Add support for removing comments via web interface. (smcv) + * Consistently allow use of relative paths in all PageSpecs + that take a page name parameter. Previously, match_created_before(), + match_created_after(), match_sourcepage(), and match_destpage() + did not support that, and the docs were not clear. + * pinger: Get whole url, don't just head, avoids problems on + the nostromo web server. + * Recommend libterm-readline-gnu-perl since that makes auto.setup + behave better. + + -- Joey Hess Sat, 17 Jan 2009 18:19:39 -0500 + ikiwiki (3.01ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #314307), Ubuntu remaining changes: diff -Nru ikiwiki-3.01ubuntu1/debian/changelog ikiwiki-3.02ubuntu1/debian/changelog --- ikiwiki-3.01ubuntu1/debian/changelog 2009-01-06 13:18:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/debian/changelog 2009-01-18 09:46:13.000000000 +0100 @@ -1,3 +1,39 @@ +ikiwiki (3.02ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (LP: #318374), Ubuntu remaining changes: + - Remove wdg-html-validator from Build-Depends field. The xmlns set in + the generated elements causes /usr/bin/validate to attempt to + download a file from w3.org. This doesn't work without Internet access. + + -- Alessio Treglia Sun, 18 Jan 2009 09:40:58 +0100 + +ikiwiki (3.02) unstable; urgency=low + + * blogspam: New plugin, adding spam filtering for page editing / comment + posting using the BlogSpam.net API. + * Add auto-blog.setup, which will set up an ikiwiki instance tuned for use + in blogging. + * checkcontent: New hook, can be used to implement arbitrary content + filters, including spam filters. + * table: Fix misparsed links in external files. + * table: Find links in external files in scan pass. + * rename: Show full names of affected pages. + * comments: Fix cache avoidance hack. + * repolist: New plugin to support the rel=vcs-* microformat. + * goodstuff: Include repolist by default. (But it does nothing until + configured with the repository locations.) + * comments: Add support for removing comments via web interface. (smcv) + * Consistently allow use of relative paths in all PageSpecs + that take a page name parameter. Previously, match_created_before(), + match_created_after(), match_sourcepage(), and match_destpage() + did not support that, and the docs were not clear. + * pinger: Get whole url, don't just head, avoids problems on + the nostromo web server. + * Recommend libterm-readline-gnu-perl since that makes auto.setup + behave better. + + -- Joey Hess Sat, 17 Jan 2009 18:19:39 -0500 + ikiwiki (3.01ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #314307), Ubuntu remaining changes: diff -Nru ikiwiki-3.01ubuntu1/debian/control ikiwiki-3.02ubuntu1/debian/control --- ikiwiki-3.01ubuntu1/debian/control 2009-01-06 13:17:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/debian/control 2009-01-18 09:42:02.000000000 +0100 @@ -14,7 +14,7 @@ Package: ikiwiki Architecture: all Depends: ${perl:Depends}, libtext-markdown-perl | markdown, libhtml-scrubber-perl, libhtml-template-perl, libhtml-parser-perl, liburi-perl -Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl +Recommends: gcc | c-compiler, libc6-dev | libc-dev, subversion | git-core (>= 1:1.5.0) | tla | bzr (>= 0.91) | mercurial | monotone (>= 0.38), libxml-simple-perl, libnet-openid-consumer-perl, liblwpx-paranoidagent-perl, libtimedate-perl, libcgi-formbuilder-perl (>= 3.05), libcgi-session-perl (>= 4.14-1), libmail-sendmail-perl, libauthen-passphrase-perl, libterm-readline-gnu-perl Suggests: viewvc | gitweb | viewcvs, libsearch-xapian-perl, xapian-omega (>= 1.0.5), librpc-xml-perl, libtext-wikiformat-perl, python, python-docutils, polygen, tidy, libhtml-tree-perl, libxml-feed-perl, libmailtools-perl, perlmagick, libfile-mimeinfo-perl, libcrypt-ssleay-perl, liblocale-gettext-perl (>= 1.05-1), libtext-typography-perl, libtext-csv-perl, libdigest-sha1-perl, graphviz, libnet-amazon-s3-perl, sparkline-php, texlive, dvipng Conflicts: ikiwiki-plugin-table Replaces: ikiwiki-plugin-table diff -Nru ikiwiki-3.01ubuntu1/debian/preinst ikiwiki-3.02ubuntu1/debian/preinst --- ikiwiki-3.01ubuntu1/debian/preinst 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/debian/preinst 2009-01-13 01:39:17.000000000 +0100 @@ -14,3 +14,7 @@ fi fi fi +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt 3.02; then + # replaced by symlink + rm -rf /usr/share/doc/ikiwiki/examples +fi diff -Nru ikiwiki-3.01ubuntu1/debian/rules ikiwiki-3.02ubuntu1/debian/rules --- ikiwiki-3.01ubuntu1/debian/rules 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/debian/rules 2009-01-13 01:39:17.000000000 +0100 @@ -25,8 +25,9 @@ dh_clean -k $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki dh_installdocs html - dh_installexamples doc/examples/* + dh_link usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL + dh_installexamples dh_installchangelogs dh_compress -X html dh_fixperms diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn ikiwiki-3.02ubuntu1/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/entirely_negated_pagespec_matches_internal_pages.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -3,8 +3,8 @@ unexpected results, since it will match a bunch of recentchanges pages, etc. -Recall that internal-use pages are not matched by a glob. So "*" doesn't -match them. So if the pagespec is "* and !foo and !bar", it won't match +Recall that internal-use pages are not matched by a glob. So "\*" doesn't +match them. So if the pagespec is "\* and !foo and !bar", it won't match them. This is the much more common style. There's an odd inconsistency with entirely negated pagespecs. If "!foo" diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn ikiwiki-3.02ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._log_messages.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -8,3 +8,7 @@ > I don't see one, except for diffs that show all changes in the commit, > rather than only changes to a single file. This feels like a bug in > gitweb. --[[Joey]] + +This is fixed by using the new gitweb style urls. Which new gitweb +requires, but is a manual change you have to make in your setup. So, +[[done]] --[[Joey]] diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn ikiwiki-3.02ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/gitweb_deficiency_w.r.t._newly_created_pages.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -8,3 +8,6 @@ > I don't see any way to make gitweb do that. You can click on the filename > after the "diff -cc" to see the whole file output, but gitweb won't show > a diff for a newly added file. --[[Joey]] + +>> happily this, too, is fixed by using the new style gitweb urls. [[done]] +>> --[[Joey]] diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/links_misparsed_in_CSV_files.mdwn ikiwiki-3.02ubuntu1/doc/bugs/links_misparsed_in_CSV_files.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/links_misparsed_in_CSV_files.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/links_misparsed_in_CSV_files.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -12,6 +12,16 @@ (this is inside /usr/share/perl5/IkiWiki/Plugin/table.pm). +> To reproduce this bug, I had to install the old, broken markdown 1.0, +> instead of the now-default Text::Markdown. +> +> Why is linkify not called for external files? Well, I checked the +> history, and it's probably best to say "for historical reasons that no +> longer apply". So, changed as you suggest. [[done]] --[[Joey]] + I am rather confused what this check does, and the fact the comments are very different for CSV and DSV when the code is the same doesn't seem to help. +> The code is not the same; two operations are run in different orders for +> CSV and DSV, as the comments note. --[[Joey]] + -- Brian May diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn ikiwiki-3.02ubuntu1/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/output_of_successful_rename_should_list_the_full_path_to_affected_pages.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -10,3 +10,5 @@

discussion

... In this situation I think the link to pages should be expanded to show the entire path, since there is quite likely to be a lot of things like "discussion". -- [[users/Jon]] + +[[done]] diff -Nru ikiwiki-3.01ubuntu1/doc/bugs/table_external_file_links.mdwn ikiwiki-3.02ubuntu1/doc/bugs/table_external_file_links.mdwn --- ikiwiki-3.01ubuntu1/doc/bugs/table_external_file_links.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/bugs/table_external_file_links.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,9 @@ +If wikilinks are put in an external table file, those links are not seen at +scan time, and so ikiwiki does not know to update the page containing the +table when the pages the links point to change (are added, removed, etc). + +There seem only two solutions to that bug -- either really make wikilinks +in an external table file not work (probably by escaping them), +or run the preprocess code also in scan (expensive!). --[[Joey]] + +[[done]] diff -Nru ikiwiki-3.01ubuntu1/doc/examples/blog/index.mdwn ikiwiki-3.02ubuntu1/doc/examples/blog/index.mdwn --- ikiwiki-3.01ubuntu1/doc/examples/blog/index.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/examples/blog/index.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -1,14 +1,13 @@ -[[!meta title="example blog"]] - [[!pagestats pages="./tags/*"]] -Welcome to my blog. Have a look at the most recent posts below, or -browse the tag cloud on the right. An archive of all [[posts]] is also -available. +Welcome to my blog. + +Have a look at the most recent posts below, or browse the tag cloud on the +right. An archive of all [[posts]] is also available. [[!inline pages="./posts/* and !*/Discussion" show="10" actions=yes rootpage="posts"]] ---- -This wiki is powered by [ikiwiki](http://ikiwiki.info). +This blog is powered by [ikiwiki](http://ikiwiki.info). diff -Nru ikiwiki-3.01ubuntu1/doc/examples/blog/posts/first_post.mdwn ikiwiki-3.02ubuntu1/doc/examples/blog/posts/first_post.mdwn --- ikiwiki-3.01ubuntu1/doc/examples/blog/posts/first_post.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/examples/blog/posts/first_post.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -1,4 +1,4 @@ This is the first post to this example blog. To add new posts, just add -files to the blog/posts/ subdirectory, or use the web form. +files to the posts/ subdirectory, or use the web form. [[!tag tags/tech]] diff -Nru ikiwiki-3.01ubuntu1/doc/examples/blog.mdwn ikiwiki-3.02ubuntu1/doc/examples/blog.mdwn --- ikiwiki-3.01ubuntu1/doc/examples/blog.mdwn 2008-12-29 21:08:32.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/examples/blog.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -1,10 +1,11 @@ This is an [[example_blog|index]]. Just copy the blog subdirectory into -your wiki to quickly get started blogging with ikiwiki. +your wiki to quickly get started blogging with ikiwiki. -Some additional configuration you might want to do: +Or, run this command to set up a blog with ikiwiki. + + % ikiwiki -setup /etc/ikiwiki/auto-blog.setup -* Change the name of the blog, by editing `index.mdwn` and changing - the `title`. +Some additional configuration you might want to do: * Make sure to configure ikiwiki to generate RSS or Atom feeds. diff -Nru ikiwiki-3.01ubuntu1/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn ikiwiki-3.02ubuntu1/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn --- ikiwiki-3.01ubuntu1/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn 2009-01-13 02:00:03.000000000 +0100 @@ -43,7 +43,7 @@ ## cgi_wrapper -I do not understand those wrappers completely. The cgi is a script, which can be called by a webserver, e. g. [[Apache_2|/tips/apache_cgi]]. But www-data is normally not allowed to write to the source directory (which is owned by gitosis or push to the repository). Therefore it should be run as the user gitosis. And because cgi scripts can not be made suid, I wrapper (in this case a C program) is created (cgi\_wrapper) which can be made suid and therefore be run as the user gitosis. Is this correct? +I do not understand those wrappers completely. The cgi is a script, which can be called by a webserver, e. g. [[Apache_2|/tips/dot_cgi]]. But www-data is normally not allowed to write to the source directory (which is owned by gitosis or push to the repository). Therefore it should be run as the user gitosis. And because cgi scripts can not be made suid, I wrapper (in this case a C program) is created (cgi\_wrapper) which can be made suid and therefore be run as the user gitosis. Is this correct? > It seems to me like you understand the wrapper pretty well. It's main reson to exist is to safely be suid, yes. diff -Nru ikiwiki-3.01ubuntu1/doc/ikiwikiusers.mdwn ikiwiki-3.02ubuntu1/doc/ikiwikiusers.mdwn --- ikiwiki-3.01ubuntu1/doc/ikiwikiusers.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/ikiwikiusers.mdwn 2009-01-17 19:28:34.000000000 +0100 @@ -2,7 +2,6 @@ ======== * [This wiki](http://ikiwiki.info) (of course!) -* [UK Software Patents info page](http://www.softwarepatents.co.uk/) * [Planet Debian upstream](http://updo.debian.net/) * The [ion window manager homepage](http://modeemi.fi/~tuomov/ion/) * [Debian Mentors wiki](http://jameswestby.net/mentors/) @@ -22,7 +21,7 @@ * The [Debian Packaging Handbook project](http://packaging-handbook.alioth.debian.org/wiki/) * The [libkdtree project](http://libkdtree.alioth.debian.org) * The [pcc](http://pcc.ludd.ltu.se/) (Portable C Compiler) project. (Simple rcs backend) -* [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend. +* [The TOVA Company](http://www.tovatest.com) public site. We also use it for internal documentation and issue tracking, all with a [[rcs/Git]] backend. * Technical support websites for [Homebase](http://support.homebase.dk) and [Kaospilotene](http://support.kaospilot.no) (each with [source](http://source.homebase.dk/) [provided](http://source.kaospilot.no/)) * [CampusGrün Hamburg](http://www.campusgruen.org/) * The [awesome window manager homepage](http://awesome.naquadah.org/) @@ -40,6 +39,7 @@ * [monkeysphere](http://web.monkeysphere.info/) * [The Walden Effect](http://www.waldeneffect.org/) * The [Fortran Wiki](http://fortranwiki.org/) +* [Monotone](http://monotone.ca/wiki/FrontPage/) Personal sites and blogs ======================== diff -Nru ikiwiki-3.01ubuntu1/doc/news/version_3.01.mdwn ikiwiki-3.02ubuntu1/doc/news/version_3.01.mdwn --- ikiwiki-3.01ubuntu1/doc/news/version_3.01.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/news/version_3.01.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,21 @@ +News for ikiwiki 3.01: + + If your wiki uses git, and you have a `diffurl` configured in + its setup file, you should be aware that gitweb has stopped + supporting the url form commonly used for the `diffurl`. + You can change your setup to use the newer gitweb url form: + + http://git.example.com/gitweb.cgi?p=wiki.git;a=blobdiff;f=\[[file]];h=\[[sha1_to]];hp=\[[sha1_from]];hb=\[[sha1_commit]];hpb=\[[sha1_parent]] + + The changes from the old form are the addition of the `hpb` parameter, + and the change to the value used for the `hb` parameter. + +ikiwiki 3.01 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * ikiwiki-makerepo: Fix injecting of empty mercurial and bzr repositories. + Closes: #[510518](http://bugs.debian.org/510518) + * Fix documentation about git hook to use right name. Closes: #[510393](http://bugs.debian.org/510393) + * yesno: Always accept English even when localised. + * yesno: Also accept 1 and 0 as input. + * A recent change to gitweb removed support for the form of diffurl + that many ikiwiki setups use. Document how to use the new url form."""]] diff -Nru ikiwiki-3.01ubuntu1/doc/pagehistory.mdwn ikiwiki-3.02ubuntu1/doc/pagehistory.mdwn --- ikiwiki-3.01ubuntu1/doc/pagehistory.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/pagehistory.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -3,3 +3,6 @@ which is used to specify the URL to a web interface such as [[ViewVC]] (for Subversion) or [[Gitweb]]. In that url, "\[[file]]" is replaced with the name of the file to view. + +The [[plugins/repolist]] plugin can suppliment this information with +urls to the underlying repository of the wiki. diff -Nru ikiwiki-3.01ubuntu1/doc/plugins/blogspam.mdwn ikiwiki-3.02ubuntu1/doc/plugins/blogspam.mdwn --- ikiwiki-3.01ubuntu1/doc/plugins/blogspam.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/plugins/blogspam.mdwn 2009-01-17 05:06:59.000000000 +0100 @@ -0,0 +1,25 @@ +[[!template id=plugin name=blogspam author="[[Joey]]"]] +[[!tag type/auth]] + +This plugin adds antispam support to ikiwiki, using the +[blogspam.net](http://blogspam.net/) API. Both page edits and +[[comment|comments]] postings can be checked for spam. Currently, +detected spam is not saved for human review, it is just rejected. + +The plugin requires the [[!cpan RPC::XML]] perl module. + +You can control how content is tested via the `blogspam_options` setting. +The list of options is [here](http://blogspam.net/api/testComment.html#options). +By default, the options are configured in a way that is appropriate for +wiki content. This includes turning off some of the more problimatic tests. + +The `blogspam_pagespec` setting is a [[ikiwiki/PageSpec]] that can be +used to configure which pages are checked for spam. The default is to check +all edits. If you only want to check [[comments]] (not wiki page edits), +set it to "postcomment(*)". + +By default, the blogspam.net server is used to do the spam checking. To +change this, the `blogspam_server` option can be set to the url for a +different server implementing the same API. Note that content is sent +unencrypted over the internet to the server, and the server sees +the full text of the content. diff -Nru ikiwiki-3.01ubuntu1/doc/plugins/calendar.mdwn ikiwiki-3.02ubuntu1/doc/plugins/calendar.mdwn --- ikiwiki-3.01ubuntu1/doc/plugins/calendar.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/plugins/calendar.mdwn 2009-01-17 19:28:34.000000000 +0100 @@ -6,7 +6,7 @@ some blogs. Since ikiwiki is a wiki compiler, to keep the calendar up-to-date, -wikis that include it need to be preiodically refreshes, typically by cron +wikis that include it need to be periodically refreshes, typically by cron at midnight. Example crontab: 0 0 * * * ikiwiki -setup ~/ikiwiki.setup -refresh diff -Nru ikiwiki-3.01ubuntu1/doc/plugins/goodstuff.mdwn ikiwiki-3.02ubuntu1/doc/plugins/goodstuff.mdwn --- ikiwiki-3.01ubuntu1/doc/plugins/goodstuff.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/plugins/goodstuff.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -24,5 +24,6 @@ * [[template]] * [[toc]] * [[toggle]] +* [[repolist]] New plugins will be added to this bundle from time to time. diff -Nru ikiwiki-3.01ubuntu1/doc/plugins/repolist.mdwn ikiwiki-3.02ubuntu1/doc/plugins/repolist.mdwn --- ikiwiki-3.01ubuntu1/doc/plugins/repolist.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/plugins/repolist.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,17 @@ +[[!template id=plugin name=repolist author="[[Joey]]"]] +[[!tag type/useful]] + +This plugin allows you to configure ikiwiki with the location of +[[rcs]] repositories for your wiki's source. This is done via the +"repositories" setting in the setup file. Once you tell it where the source +to your wiki can be downloaded from, this information can be published on +your wiki in various ways. + +This plugin supports the [rel-vcs-*](http://kitenet.net/~joey/rfc/rel-vcs/) +microformat, and uses it to embed the repository location information in +every wiki page. + +By using this plugin, you will make [[Joey]] very happy, as he will be able +to easily check out the source of your wiki, for purposes of debugging and +general curiosity. More generally, making it easy for others to find the +repository for your wiki is just a Plain Good Idea(TM). diff -Nru ikiwiki-3.01ubuntu1/doc/plugins/write.mdwn ikiwiki-3.02ubuntu1/doc/plugins/write.mdwn --- ikiwiki-3.01ubuntu1/doc/plugins/write.mdwn 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/plugins/write.mdwn 2009-01-17 03:15:32.000000000 +0100 @@ -303,7 +303,7 @@ ### canedit - hook(type => "canedit", id => "foo", call => \&pagelocked); + hook(type => "canedit", id => "foo", call => \&canedit); This hook can be used to implement arbitrary access methods to control when a page can be edited using the web interface (commits from revision control @@ -321,6 +321,26 @@ since it's sometimes used to test to see which pages in a set of pages a user can edit. +### checkcontent + + hook(type => "checkcontent", id => "foo", call => \&checkcontent); + +This hook is called to check the content a user has entered on a page, +before it is saved, and decide if it should be allowed. + +It is passed named parameters: `content`, `page`, `cgi`, and `session`. If +the content the user has entered is a comment, it may also be passed some +additional parameters: `author`, `url`, and `subject`. The `subject` +parameter may also be filled with the user's comment about the change. + +Note: When the user edits an existing wiki page, the passed `content` will +include only the lines that they added to the page, or modified. + +The hook should return `undef` on success. If the content is disallowed, it +should return a message stating what the problem is, or a function +that can be run to perform whatever action is necessary to allow the user +to post the content. + ### editcontent hook(type => "editcontent", id => "foo", call => \&editcontent); diff -Nru ikiwiki-3.01ubuntu1/doc/sandbox/foobak.mdwn ikiwiki-3.02ubuntu1/doc/sandbox/foobak.mdwn --- ikiwiki-3.01ubuntu1/doc/sandbox/foobak.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/sandbox/foobak.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1 @@ +Foobaka bakfoo. diff -Nru ikiwiki-3.01ubuntu1/doc/sandbox/한글.mdwn ikiwiki-3.02ubuntu1/doc/sandbox/한글.mdwn --- ikiwiki-3.01ubuntu1/doc/sandbox/한글.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/sandbox/한글.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1 @@ +~를 어떻게 할까~ diff -Nru ikiwiki-3.01ubuntu1/doc/sandbox/한글페이지.mdwn ikiwiki-3.02ubuntu1/doc/sandbox/한글페이지.mdwn --- ikiwiki-3.01ubuntu1/doc/sandbox/한글페이지.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/sandbox/한글페이지.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,2 @@ + +Wow test diff -Nru ikiwiki-3.01ubuntu1/doc/sandbox.mdwn ikiwiki-3.02ubuntu1/doc/sandbox.mdwn --- ikiwiki-3.01ubuntu1/doc/sandbox.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/sandbox.mdwn 2009-01-17 19:28:34.000000000 +0100 @@ -1,9 +1,15 @@ -This is the SandBox, a page anyone can edit to try out ikiwiki. +This is the [[SandBox]], a page anyone can edit to try out ikiwiki. + +hello testing 1..2..3!! ---- +I am testing the edit box provided through ikiwiki.cgi. + +---- + Here's a paragraph. The following code block is pre-formatted: @@ -83,3 +89,13 @@ This SandBox is also a [[blog]]! [[!inline pages="sandbox/* and !*/Discussion" rootpage="sandbox" show="4" archive="yes"]] + +-------- + +This gives an example of inline code: `tar | netcat` is a nice way to transfer bulk files over the net + +But, of course, rsync is better. + +---- + +Let's see what happens... ~~ diff -Nru ikiwiki-3.01ubuntu1/doc/setup/byhand.mdwn ikiwiki-3.02ubuntu1/doc/setup/byhand.mdwn --- ikiwiki-3.01ubuntu1/doc/setup/byhand.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/setup/byhand.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,189 @@ +This tutorial will walk you through setting up a wiki with ikiwiki, +doing everything by hand. [[Setup]] has an easier method, but with less +control. + +[[!toc ]] + +## Decide where your wiki's files will go. + +As a wiki compiler, ikiwiki builds a wiki from files in a source directory, +and outputs the files to a destination directory. If you keep your wiki in +a version control system, the source directory will contain a working copy +checked out from the version control system. + +For the purposes of this tutorial, we'll set shell variables +for these locations, and use those variables in the commands that follow. + + SRCDIR=~/wikiwc + DESTDIR=~/public_html/wiki/ + +Note that ikiwiki owns the working copy directory; do not perform your own +edits in ikiwiki's working copy. + +## Create the beginnings of your wiki. + +This will create a simple main page for the wiki. + + mkdir $SRCDIR + cd $SRCDIR + $EDITOR index.mdwn + +In the editor, you could start by entering a simple page like +[[!toggle id=page text="this one"]]. +[[!toggleable id=page text=""" + Welcome to your new wiki. + + All wikis are supposed to have a \[[SandBox]], + so this one does too. + + ---- + + This wiki is powered by [ikiwiki](http://ikiwiki.info). +"""]] + +See [[ikiwiki/formatting]] for details about the markup language. + +Note that several [[standard_wiki_pages|basewiki]] will be added to your +wiki, from files in `/usr/share/ikiwiki/basewiki/`, so your wiki will +automatically get a [[SandBox]], and some other useful pages. + +## Build your wiki for the first time. + + ikiwiki --verbose $SRCDIR $DESTDIR --url=http://example.org/~you/wiki/ + +Replace the url with the real url to your wiki. You should now +be able to visit the url and see your wiki. + +## Add content to your wiki. + +Continue editing or adding pages and rebuilding the wiki. + +To quickly get started on a common task like blogging with ikiwiki, you +can copy in files from the [[examples]]. The examples are located in +`doc/examples/` in the ikiwiki source package. + +You can experiment with other ikiwiki parameters such as `--wikiname` +and `--rebuild` too. Get comfortable with its command line (see +[[usage]]). + +## Add a setup file. + +By now you should be getting tired of typing in all the command line +options each time you change something in your wiki's setup. Time to +introduce setup files. + +To generate a setup file, use `ikiwiki --dumpsetup`. You can pass +all the options have you been including at the command line, and they +will be stored in the setup file. + + ikiwiki $SRCDIR $DESTDIR --url=http://example.org/~you/wiki/ --dumpsetup ikiwiki.setup + +Note that this file should *not* be put in your wiki's directory with +the rest of the files. A good place to put it is in a ~/.ikiwiki/ +subdirectory. + +Most of the options, like `wikiname` in the setup file are the same as +ikiwiki's command line options (documented in [[usage]]. `srcdir` and +`destdir` are the two directories you specify when running ikiwiki by +hand. Make sure that these are pointing to the right directories, and +read through and configure the rest of the file to your liking. + +When you're satisfied, run `ikiwiki --setup ikiwiki.setup`, and it +will set everything up. + +## Turn on additional features. + +Now you have a basic wiki with a setup file. Time to experiment +with ikiwiki's many features. + +Let's first enable a key wiki feature and set up [[CGI]] to allow +editing the wiki from the web. Just edit ikiwiki.setup, uncomment the +settings for the `cgi_wrapper`, make sure the filename for the cgi wrapper +is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done! + +There are lots of other configuration options in ikiwiki.setup that you +can uncomment, configure, and enable by re-running +`ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the +[[plugins]].. + +## Put your wiki in revision control. + +At this point you might want to check your wiki in to a revision control +system so you can keep track of changes and revert edits. Depending +on the revision control system you choose, the way this is done varies. + +Note that the .ikiwiki subdirectory is where ikiwiki keeps its state, and +should be preserved, but not checked into revision control. + +The [[ikiwiki-makerepo]] command automates setting up a wiki in +revision control. + +[[!toggle id=subversion text="Subversion"]] +[[!toggleable id=subversion text=""" + REPOSITORY=~/wikirepo + ikiwiki-makerepo svn $SRCDIR $REPOSITORY +"""]] + +[[!toggle id=git text="Git"]] +[[!toggleable id=git text=""" + REPOSITORY=~/wiki.git + ikiwiki-makerepo git $SRCDIR $REPOSITORY + +Please see [[rcs/git]] for detailed documentation about how +ikiwiki uses git repositories, and some important caveats +about using the git repositories. +"""]] + +[[!toggle id=mercurial text="Mercurial"]] +[[!toggleable id=mercurial text=""" + REPOSITORY=$SRCDIR + ikiwiki-makerepo mercurial $SRCDIR +"""]] + +[[!toggle id=bazaar text="Bazaar"]] +[[!toggleable id=bazaar text=""" + REPOSITORY=$SRCDIR + ikiwiki-makerepo bzr $SRCDIR +"""]] + +[[!toggle id=tla text="TLA"]] +[[!toggleable id=tla text=""" + REPOSITORY=~/wikirepo + tla make-archive me@localhost--wiki $REPOSITORY + tla my-id "" + cd $SRCDIR + tla archive-setup me@localhost--wiki/wiki--0 + tla init-tree me@localhost--wiki/wiki--0 + # Edit {arch}/=tagging-method and change the precious + # line to add the .ikiwiki directory to the regexp. + tla add * + tla import +"""]] + +[[!toggle id=monotone text="Monotone"]] +[[!toggleable id=monotone text=""" + # This assumes that you have already used "mtn genkey you@hostname". + REPOSITORY=~/wiki.monotone + ikiwiki-makerepo monotone $SRCDIR $REPOSITORY +"""]] + +## Configure ikiwiki to use revision control. + +Once your wiki is checked in to the revision control system, you should +configure ikiwiki to use revision control. Edit your ikiwiki.setup, set +`rcs` to the the revision control system you chose to use. Be sure to set +`svnrepo` to the directory for your repository, if using subversion. +Uncomment the configuration for the wrapper for your revision control +system, and configure the wrapper path appropriately (for Git, it should be +the path to `hooks/post-update` inside the bare git repository). + +Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more. +Now you should be able to edit files in $SRCDIR, and use your revision +control system to commit them, and the wiki will automatically update. +And in the web interface, RecentChanges should work, and files changed +by web users will also be committed using revision control. + +## Enjoy your new wiki! + +Add yourself to [[IkiWikiUsers]]. And check out +the [[tips]] to find out how to get more out of ikiwiki. diff -Nru ikiwiki-3.01ubuntu1/doc/setup.mdwn ikiwiki-3.02ubuntu1/doc/setup.mdwn --- ikiwiki-3.01ubuntu1/doc/setup.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/setup.mdwn 2009-01-13 02:00:53.000000000 +0100 @@ -2,205 +2,132 @@ [[!toc ]] -## [[Download]] and [[install]] ikiwiki. +## Install ikiwiki If you're using Debian or Ubuntu, ikiwiki is an `apt-get install ikiwiki` away. If you're not, see the [[download]] and [[install]] pages. -## Quick start +## Create your wiki -If you'd like to set up a wiki now, and learn more later, and you have -ikiwiki 2.60 or better installed, just run this command and answer a couple -of questions. +All it takes to create a fully functional wiki using ikiwiki is running +one command. +[[!template id=note text=""" +For more control, advanced users may prefer to set up a wiki +[[by_hand|byhand]]. +"""]] % ikiwiki -setup /etc/ikiwiki/auto.setup - What will the wiki be named? mywiki - What revision control system to use? git - What wiki user (or openid) will be wiki admin? joey -Wait for it to tell you an url for your new wiki.. Done! +Or, set up a blog with ikiwiki, run this command instead. -(If the CGI doesn't seem to let you edit pages, you might need to -[[configure_apache|tips/apache_cgi]] or [[configure_lighttpd|tips/lighttpd_cgi]].) + % ikiwiki -setup /etc/ikiwiki/auto-blog.setup -## Decide where your wiki's files will go. +Either way, it will ask you a couple of questions. -As a wiki compiler, ikiwiki builds a wiki from files in a source directory, -and outputs the files to a destination directory. If you keep your wiki in -a version control system, the source directory will contain a working copy -checked out from the version control system. + What will the wiki be named? foo + What revision control system to use? git + What wiki user (or openid) will be admin? joey + Choose a password: -For the purposes of this tutorial, we'll set shell variables -for these locations, and use those variables in the commands that follow. +Then, wait for it to tell you an url for your new site.. - SRCDIR=~/wikiwc - DESTDIR=~/public_html/wiki/ + Successfully set up foo: + url: http://example.com/~joey/foo + srcdir: ~/foo + destdir: ~/public_html/foo + repository: ~/foo.git + To modify settings, edit ~/foo.setup and then run: + ikiwiki -setup ~/foo.setup -Note that ikiwiki owns the working copy directory; do not perform your own -edits in ikiwiki's working copy. +Done! -## Create the beginnings of your wiki. +## Using the web interface -This will create a simple main page for the wiki. +Now you can go to the url it told you, and edit pages in your new wiki +using the web interface. - mkdir $SRCDIR - cd $SRCDIR - $EDITOR index.mdwn +(If the web interface doesn't seem to allow editing or login, you may +need to configure [[configure_the_web_server|tips/dot_cgi]].) -In the editor, you could start by entering a simple page like -[[!toggle id=page text="this one"]]. -[[!toggleable id=page text=""" - Welcome to your new wiki. +## Checkout and edit wiki source - All wikis are supposed to have a \[[SandBox]], - so this one does too. +Part of the fun of using ikiwiki is not being limited to using the +web for editing pages, and instead using your favorite text editor and +[[Revision_Control_System|rcs]]. - ---- +To do this, you need to check out a copy of the source to your wiki. +(You should avoid making changes directly to the `srcdir`, as that +checkout is reserved for use by ikiwiki itself.) - This wiki is powered by [ikiwiki](http://ikiwiki.info). -"""]] - -See [[ikiwiki/formatting]] for details about the markup language. +Depending on which [[Revision_Control_System|rcs]] you chose to use, +you can run one of these commands to check out your own copy of your wiki's +source. (Remember to replace "foo" with the real directory name.) -Note that several [[standard_wiki_pages|basewiki]] will be added to your -wiki, from files in `/usr/share/ikiwiki/basewiki/`, so your wiki will -automatically get a [[SandBox]], and some other useful pages. + git clone foo.git foo.src + svn checkout file://`pwd`/foo.svn/trunk foo.src + bzr clone foo foo.src + hg clone foo foo.src + # TODO monotone, tla -## Build your wiki for the first time. +Now to edit pages by hand, go into the directory you checked out (ie, +"foo.src"), and fire up your text editor to edit `index.mdwn` or whatever +other page you want to edit. If you chose to set up a blog, there is even a +sample first post in `posts/first_post.mdwn` that you can edit. - ikiwiki --verbose $SRCDIR $DESTDIR --url=http://example.org/~you/wiki/ +Once you've edited a page, use your revision control system to commit +the changes. For distributed revision control systems, don't forget to push +your commit. -Replace the url with the real url to your wiki. You should now -be able to visit the url and see your wiki. +Once the commit reaches the repository, ikiwiki will notice it, and +automatically update the wiki with your changes. -## Add content to your wiki. +## Customizing the wiki -Continue editing or adding pages and rebuilding the wiki. - -To quickly get started on a common task like blogging with ikiwiki, you -can copy in files from the [[examples]]. The examples are located in -`doc/examples/` in the ikiwiki source package. - -You can experiment with other ikiwiki parameters such as `--wikiname` -and `--rebuild` too. Get comfortable with its command line (see -[[usage]]). +There are lots of things you can configure to customize your wiki. +These range from changing the wiki's name, to enabling [[plugins]], +to banning users and locking pages. -## Add a setup file. +If you log in as the admin user you configured earlier, and go to +your Preferences page, you can click on "Wiki Setup" to customize many +wiki settings and plugins. -By now you should be getting tired of typing in all the command line -options each time you change something in your wiki's setup. Time to -introduce setup files. +Some settings cannot be configured on the web, for security reasons or +because misconfiguring them could break the wiki. To change these settings, +you can manually edit the setup file, which is named something like +"foo.setup". The file lists all available configuration settings +and gives a brief description of each. -To generate a setup file, use `ikiwiki --dumpsetup`. You can pass -all the options have you been including at the command line, and they -will be stored in the setup file. +After making changes to this file, you need to tell ikiwiki to use it: - ikiwiki $SRCDIR $DESTDIR --url=http://example.org/~you/wiki/ --dumpsetup ikiwiki.setup + % ikiwiki -setup foo.setup -Note that this file should *not* be put in your wiki's directory with -the rest of the files. A good place to put it is in a ~/.ikiwiki/ -subdirectory. - -Most of the options, like `wikiname` in the setup file are the same as -ikiwiki's command line options (documented in [[usage]]. `srcdir` and -`destdir` are the two directories you specify when running ikiwiki by -hand. Make sure that these are pointing to the right directories, and -read through and configure the rest of the file to your liking. +## Customizing file locations -When you're satisfied, run `ikiwiki --setup ikiwiki.setup`, and it -will set everything up. +As a wiki compiler, ikiwiki builds a wiki from files in a source directory, +and outputs the files to a destination directory. The source directory is +a working copy checked out from the version control system repository. -## Turn on additional features. +When you used `auto.setup`, ikiwiki put the source directory, destination +directory, and repository in your home directory, and told you the location +of each. Those locations were chosen to work without customization, but you +might want to move them to different directories. -Now you have a basic wiki with a setup file. Time to experiment -with ikiwiki's many features. +First, move the destination directory and repository around. -Let's first enable a key wiki feature and set up [[CGI]] to allow -editing the wiki from the web. Just edit ikiwiki.setup, uncomment the -settings for the `cgi_wrapper`, make sure the filename for the cgi wrapper -is ok, run `ikiwiki --setup ikiwiki.setup`, and you're done! - -There are lots of other configuration options in ikiwiki.setup that you -can uncomment, configure, and enable by re-running -`ikiwiki --setup ikiwiki.setup`. Be sure to browse through all the -[[plugins]].. - -## Put your wiki in revision control. - -At this point you might want to check your wiki in to a revision control -system so you can keep track of changes and revert edits. Depending -on the revision control system you choose, the way this is done varies. - -Note that the .ikiwiki subdirectory is where ikiwiki keeps its state, and -should be preserved, but not checked into revision control. - -The [[ikiwiki-makerepo]] command automates setting up a wiki in -revision control. - -[[!toggle id=subversion text="Subversion"]] -[[!toggleable id=subversion text=""" - REPOSITORY=~/wikirepo - ikiwiki-makerepo svn $SRCDIR $REPOSITORY -"""]] + % mv public_html/foo /srv/web/foo.com + % mv foo.git /srv/git/foo.git -[[!toggle id=git text="Git"]] -[[!toggleable id=git text=""" - REPOSITORY=~/wiki.git - ikiwiki-makerepo git $SRCDIR $REPOSITORY - -Please see [[rcs/git]] for detailed documentation about how -ikiwiki uses git repositories, and some important caveats -about using the git repositories. -"""]] - -[[!toggle id=mercurial text="Mercurial"]] -[[!toggleable id=mercurial text=""" - REPOSITORY=$SRCDIR - ikiwiki-makerepo mercurial $SRCDIR -"""]] - -[[!toggle id=bazaar text="Bazaar"]] -[[!toggleable id=bazaar text=""" - REPOSITORY=$SRCDIR - ikiwiki-makerepo bzr $SRCDIR -"""]] - -[[!toggle id=tla text="TLA"]] -[[!toggleable id=tla text=""" - REPOSITORY=~/wikirepo - tla make-archive me@localhost--wiki $REPOSITORY - tla my-id "" - cd $SRCDIR - tla archive-setup me@localhost--wiki/wiki--0 - tla init-tree me@localhost--wiki/wiki--0 - # Edit {arch}/=tagging-method and change the precious - # line to add the .ikiwiki directory to the regexp. - tla add * - tla import -"""]] - -[[!toggle id=monotone text="Monotone"]] -[[!toggleable id=monotone text=""" - # This assumes that you have already used "mtn genkey you@hostname". - REPOSITORY=~/wiki.monotone - ikiwiki-makerepo monotone $SRCDIR $REPOSITORY -"""]] - -## Configure ikiwiki to use revision control. +If you moved the repository to a new location, checkouts pointing at the +old location won't work, and the easiest way to deal with this is to delete +them and re-checkout from the new repository location. + + % rm -rf foo + % git clone /src/git/foo.git -Once your wiki is checked in to the revision control system, you should -configure ikiwiki to use revision control. Edit your ikiwiki.setup, set -`rcs` to the the revision control system you chose to use. Be sure to set -`svnrepo` to the directory for your repository, if using subversion. -Uncomment the configuration for the wrapper for your revision control -system, and configure the wrapper path appropriately (for Git, it should be -the path to `hooks/post-update` inside the bare git repository). - -Once it's all set up, run `ikiwiki --setup ikiwiki.setup` once more. -Now you should be able to edit files in $SRCDIR, and use your revision -control system to commit them, and the wiki will automatically update. -And in the web interface, RecentChanges should work, and files changed -by web users will also be committed using revision control. +Finally, edit the setup file. Modify the settings for `srcdir`, `destdir`, +`url`, `cgiurl`, `cgi_wrapper`, `git_wrapper`, etc to reflect where +you moved things. Remember to run `ikiwiki -setup` after editing the +setup file. ## Enjoy your new wiki! diff -Nru ikiwiki-3.01ubuntu1/doc/tips/apache_cgi.mdwn ikiwiki-3.02ubuntu1/doc/tips/apache_cgi.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/apache_cgi.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/apache_cgi.mdwn 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -Many ikiwiki examples name the [[cgi]] "ikiwiki.cgi", and put it somewhere -like `~/public_html/ikiwiki.cgi`, or `/var/www/wiki/ikiwiki.cgi`. - -If you follow those examples, you may find that when trying to edit a page -in your wiki, you see the raw contents of the ikiwiki.cgi program. Or get a -permission denied problem. - -This is because apache is generally not configured to run cgi scripts -unless they're in `/usr/lib/cgi-bin/`. While you can put ikiwiki.cgi in -there if you like, here's how to configure apache (version 2) to run `.cgi` -programs from anywhere. - -These instructions are for Debian systems, but the basic apache -configuration should work anywhere. - -* Edit /etc/apache2/apache2.conf and add a line like this: - - AddHandler cgi-script .cgi - -* Find the "Options" line for the directory where you've put the - ikiwiki.cgi, and add "ExecCGI" to the list of options. For example, if - ikiwiki.cgi is in /var/www/, edit `/etc/apache2/sites-enabled/000-default` - and add it to the "Options" line in the "Directory /var/www/" stanza. - Or, if you've put it in a `~/public_html`, edit - `/etc/apache2/mods-available/userdir.conf`. diff -Nru ikiwiki-3.01ubuntu1/doc/tips/dot_cgi.mdwn ikiwiki-3.02ubuntu1/doc/tips/dot_cgi.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/dot_cgi.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/dot_cgi.mdwn 2009-01-13 01:59:26.000000000 +0100 @@ -0,0 +1,50 @@ +It's common to name the [[cgi]] "ikiwiki.cgi", and put it somewhere +like `~/public_html/ikiwiki.cgi`, or `/var/www/wiki/ikiwiki.cgi`. + +If you do that, you may find that when trying to edit a page in your wiki, +you see the raw contents of the ikiwiki.cgi program. Or get a permission +denied problem. + +This is because web servers are generally not configured to run cgi scripts +unless they're in `/usr/lib/cgi-bin/`. While you can put ikiwiki.cgi in +there if you like, it's better to configure your web server to +run `.cgi` programs from anywhere. + +These instructions are for Debian systems, but the basic +configuration changes should work anywhere. + +## apache 2 + +* Edit /etc/apache2/apache2.conf and add a line like this: + + AddHandler cgi-script .cgi + +* Find the "Options" line for the directory where you've put the + ikiwiki.cgi, and add "ExecCGI" to the list of options. For example, if + ikiwiki.cgi is in /var/www/, edit `/etc/apache2/sites-enabled/000-default` + and add it to the "Options" line in the "Directory /var/www/" stanza. + Or, if you've put it in a `~/public_html`, edit + `/etc/apache2/mods-available/userdir.conf`. + +## lighttpd + +Here is how to enable cgi on [lighttpd](http://www.lighttpd.net/) and +configure it in order to execute ikiwiki.cgi wherever it is located. + +* Activate cgi by linking `/etc/lighttpd/conf-available/10-cgi.conf` into `/etc/lighttpd/conf-enabled` ([doc](http://trac.lighttpd.net/trac/wiki/Docs%3AModCGI)). + +* Create `/etc/lighttpd/conf-available/90-ikiwiki-cgi.conf` and add a line like this: + + cgi.assign = ( "ikiwiki.cgi" => "", ) + +* Activate ikiwiki-cgi by linking `/etc/lighttpd/conf-available/90-ikiwiki-cgi.conf` into `/etc/lighttpd/conf-enabled`. + +* Restart lighttpd server with something like `/etc/init.d/lighttpd restart`. + +Note that the first part enables cgi server wide but depending on default +configuration, it may be not enough. The second part creates a specific +rule that allow `ikiwiki.cgi` to be executed. + +**Warning:** I only use this on my development server (offline). I am not +sure of how secure this approach is. If you have any thought about it, feel +free to let me know. diff -Nru ikiwiki-3.01ubuntu1/doc/tips/laptop_wiki_with_git.mdwn ikiwiki-3.02ubuntu1/doc/tips/laptop_wiki_with_git.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/laptop_wiki_with_git.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/laptop_wiki_with_git.mdwn 2009-01-13 02:00:23.000000000 +0100 @@ -15,7 +15,7 @@ Next, `git clone` the source (`$REPOSITORY`, not `$SRCDIR`) from the server to the laptop. -Now, set up a [[web_server|apache_cgi]] on your laptop, if it doesn't +Now, set up a [[web_server|dot_cgi]] on your laptop, if it doesn't already have one. Now you need to write a setup file for ikiwiki on the laptop. Mostly this diff -Nru ikiwiki-3.01ubuntu1/doc/tips/lighttpd_cgi.mdwn ikiwiki-3.02ubuntu1/doc/tips/lighttpd_cgi.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/lighttpd_cgi.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/lighttpd_cgi.mdwn 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -Here is how to enable cgi on [lighttpd](http://www.lighttpd.net/) and configure it in order to execute ikiwiki.cgi wherever it is located. - -* Activate cgi by linking `/etc/lighttpd/conf-available/10-cgi.conf` into `/etc/lighttpd/conf-enabled` ([doc](http://trac.lighttpd.net/trac/wiki/Docs%3AModCGI)). - -* Create `/etc/lighttpd/conf-available/90-ikiwiki-cgi.conf` and add a line like this: - - cgi.assign = ( "ikiwiki.cgi" => "", ) - -* Activate ikiwiki-cgi by linking `/etc/lighttpd/conf-available/90-ikiwiki-cgi.conf` into `/etc/lighttpd/conf-enabled`. - -* Restart lighttpd server with something like `/etc/init.d/lighttpd restart`. - -Note that the first part enables cgi server wide but depending on default configuration, it may be not enough. The second part creates a specific rule that allow `ikiwiki.cgi` to be executed. - -**Warning:** I only use this on my development server (offline). I am not sure of how secure this approach is. If you have any thought about it, feel free to let me know. diff -Nru ikiwiki-3.01ubuntu1/doc/tips/markdown_and_eclipse.mdwn ikiwiki-3.02ubuntu1/doc/tips/markdown_and_eclipse.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/markdown_and_eclipse.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/markdown_and_eclipse.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,4 @@ +For people that were not born with GNU emacs fingers, +there is a markdown editor (with preview and outline) +for [eclipse](http://www.eclipse.org) available +[here](http://www.winterwell.com/software/markdown-editor.php). diff -Nru ikiwiki-3.01ubuntu1/doc/tips/upgrade_to_3.0.mdwn ikiwiki-3.02ubuntu1/doc/tips/upgrade_to_3.0.mdwn --- ikiwiki-3.01ubuntu1/doc/tips/upgrade_to_3.0.mdwn 2008-12-31 21:27:35.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/tips/upgrade_to_3.0.mdwn 2009-01-13 01:39:17.000000000 +0100 @@ -37,8 +37,8 @@ prefix_directives => 0, -To convert to the new syntax, run -`ikiwiki-transition prefix_directives your.setup` +To convert to the new syntax, make sure that your setup file does *not* +contain the above, then run `ikiwiki-transition prefix_directives your.setup` (And then commit the changes it makes to pages in your srcdir.) diff -Nru ikiwiki-3.01ubuntu1/doc/todo/allow_disabling_backlinks.mdwn ikiwiki-3.02ubuntu1/doc/todo/allow_disabling_backlinks.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/allow_disabling_backlinks.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/allow_disabling_backlinks.mdwn 2009-01-13 01:39:18.000000000 +0100 @@ -0,0 +1,18 @@ +This patch allows disabling the backlinks in the config file by setting nobacklinks to 0. + +It is backwards compatible, and by default enables backlinks in the generated pages. + +

+--- IkiWiki/Render.pm.orig2	2009-01-06 14:54:01.000000000 +1300
++++ IkiWiki/Render.pm	2009-01-06 14:55:08.000000000 +1300
+@@ -107,7 +107,8 @@
+ 		$template->param(have_actions => 1);
+ 	}
+ 
+-	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page);
++	my @backlinks=sort { $a->{page} cmp $b->{page} } backlinks($page)
++		unless defined $config{nobacklinks} && $config{nobacklinks} == 0;
+ 	my ($backlinks, $more_backlinks);
+ 	if (@backlinks <= $config{numbacklinks} || ! $config{numbacklinks}) {
+ 		$backlinks=\@backlinks;
+

diff -Nru ikiwiki-3.01ubuntu1/doc/todo/anti-spam_protection.mdwn ikiwiki-3.02ubuntu1/doc/todo/anti-spam_protection.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/anti-spam_protection.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/anti-spam_protection.mdwn 2009-01-17 04:25:27.000000000 +0100 @@ -17,3 +17,14 @@ You might look at the Wikipedia page on "Spam\_in\_blogs" for more ideas. In particular, would it be possible to force a subset of the pages (by regex, but you'd choose the regex to match those pages which are publicly writable) to use rel="nofollow" in all links. > I just wanted to leave a link here to the [[todo/require_CAPTCHA_to_edit]] plugin patch. Unfortunately that plugin currently interacts badly with the openid plugin. -- [[Will]] + + +--- + +Ikiwiki now has a checkcontent hook that plugins can use to see content +that is being entered and check it for spam/whatever. + +There is a blogspam plugin that uses the blogspam.org service +to check for common spam signatures. --[[Joey]] + +[[done]] diff -Nru ikiwiki-3.01ubuntu1/doc/todo/comments.mdwn ikiwiki-3.02ubuntu1/doc/todo/comments.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/comments.mdwn 2008-12-29 21:08:32.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/comments.mdwn 2009-01-13 01:39:18.000000000 +0100 @@ -10,19 +10,6 @@ > it's hard enough to get some people to title their blog posts :-) > --[[smcv]] -* If a spammer posts a comment, it is either impossible or hard to clean - up via the web. Would be nice to have some kind of link on the comment - that allows trusted users to remove it (using the remove plugin of - course). - - > Won't the remove plugin refuse to remove internal pages? This would be - > a good feature to have, though. --[[smcv]] - - > Here, FWIW, is the first ikiwiki comment spam I've seen: - > - > So that took about 10 days... - > --[[Joey]] - ## Patches pending merge * There is some common code cargo-culted from other plugins (notably inline and editpage) which @@ -147,3 +134,22 @@ first. --[[smcv]] > done --[[Joey]] + +* If a spammer posts a comment, it is either impossible or hard to clean + up via the web. Would be nice to have some kind of link on the comment + that allows trusted users to remove it (using the remove plugin of + course). + + > Won't the remove plugin refuse to remove internal pages? This would be + > a good feature to have, though. --[[smcv]] + + > Here, FWIW, is the first ikiwiki comment spam I've seen: + > + > So that took about 10 days... + > --[[Joey]] + + >> Implemented in my 'comments' branch, please review. It turns out + >> [[plugins/remove]] is happy to remove internal pages, so it was quite + >> easy to do. --[[smcv]] + + >>> done --[[Joey]] diff -Nru ikiwiki-3.01ubuntu1/doc/todo/configurable_timezones.mdwn ikiwiki-3.02ubuntu1/doc/todo/configurable_timezones.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/configurable_timezones.mdwn 2008-12-23 22:24:15.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/configurable_timezones.mdwn 2009-01-15 01:32:17.000000000 +0100 @@ -3,3 +3,8 @@ This is nice for shared hosting, and other situation where the user doesn't have control over the server timezone. > [[done]] via the ENV setting in the setup file. --[[Joey]] + + +Example (ikiwiki.setup): + + ENV => { TZ => "Europe/Sofia" } diff -Nru ikiwiki-3.01ubuntu1/doc/todo/pingback_support.mdwn ikiwiki-3.02ubuntu1/doc/todo/pingback_support.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/pingback_support.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/pingback_support.mdwn 2009-01-14 20:08:47.000000000 +0100 @@ -0,0 +1,22 @@ +A "pingback" is a system whereby URLs you might reference in a blog post are +contacted by the blog publishing software at publishing time (i.e., once) so +that they might update a list of "pingbacks" to the URL. The originating +URL's blog software might then display a list of pingbacks, or an excerpt of +the text from your blog, perhaps interleaved with comments, etc. + +At a technical level, external URLs are extracted from your blog post by the +blogging software, fetched, inspected for information to determine whether the +remote server is configured to support pingbacks (look for link tags, or HTTP +headers) and the relevant pingback URL sent an XML-RPC packet. + +There are other technologies to achieve the same thing: trackbacks predate +pingbacks but are more vulnerable to spam due to design problems. + +The spec for pingbacks is at . + +I would like to somehow use pingbacks in conjunction with ikiwiki. I suppose +this could be achieved using a commit hook and some external software in which +case I will consider this done with an entry in [[tips]]; otherwise a +[[plugins|plugin]] to implement pingbacks would be great. + +-- [[Jon]] (Wed Jan 14 13:48:47 GMT 2009) diff -Nru ikiwiki-3.01ubuntu1/doc/todo/relative_pagespec_deficiency.mdwn ikiwiki-3.02ubuntu1/doc/todo/relative_pagespec_deficiency.mdwn --- ikiwiki-3.01ubuntu1/doc/todo/relative_pagespec_deficiency.mdwn 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/doc/todo/relative_pagespec_deficiency.mdwn 2009-01-13 01:39:18.000000000 +0100 @@ -0,0 +1,8 @@ +While a relative pagespec like `./posts/*` will work, when used in a page +such as `bdale/blog`, you cannot do +`created_after(./posts/foo)` -- only `glob()` supports relative page +references. + +The other pagespec functions should too, where appropriate. + +[[done]] diff -Nru ikiwiki-3.01ubuntu1/docwiki.setup ikiwiki-3.02ubuntu1/docwiki.setup --- ikiwiki-3.01ubuntu1/docwiki.setup 2008-12-24 01:10:28.000000000 +0100 +++ ikiwiki-3.02ubuntu1/docwiki.setup 2009-01-13 01:39:18.000000000 +0100 @@ -15,5 +15,7 @@ userdir => "users", usedirs => 0, prefix_directives => 1, + cgiurl => "http://me", + url => "http://me", add_plugins => [qw{goodstuff version haiku polygen fortune}], } diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/blogspam.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/blogspam.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/blogspam.pm 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/blogspam.pm 2009-01-17 21:33:28.000000000 +0100 @@ -0,0 +1,113 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::blogspam; + +use warnings; +use strict; +use IkiWiki 3.00; + +my $defaulturl='http://test.blogspam.net:8888/'; + +sub import { + hook(type => "getsetup", id => "blogspam", call => \&getsetup); + hook(type => "checkcontent", id => "blogspam", call => \&checkcontent); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => 0, + }, + blogspam_pagespec => { + type => 'pagespec', + example => 'postcomment(*)', + description => 'PageSpec of pages to check for spam', + link => 'ikiwiki/PageSpec', + safe => 1, + rebuild => 0, + }, + blogspam_options => { + type => "string", + example => "blacklist=1.2.3.4,blacklist=8.7.6.5,max-links=10", + description => "options to send to blogspam server", + link => "http://blogspam.net/api/testComment.html#options", + safe => 1, + rebuild => 0, + }, + blogspam_server => { + type => "string", + default => $defaulturl, + description => "blogspam server XML-RPC url", + safe => 1, + rebuild => 0, + }, +} + +sub checkcontent (@) { + my %params=@_; + + eval q{ + use RPC::XML; + use RPC::XML::Client; + }; + if ($@) { + warn($@); + return undef; + } + + if (exists $config{blogspam_pagespec}) { + return undef + if ! pagespec_match($params{page}, $config{blogspam_pagespec}, + location => $params{page}); + } + + my $url=$defaulturl; + $url = $params{blogspam_server} if exists $params{blogspam_server}; + my $client = RPC::XML::Client->new($url); + + my @options = split(",", $params{blogspam_options}) + if exists $params{blogspam_options}; + + # Allow short comments and whitespace-only edits, unless the user + # has overridden min-words themselves. + push @options, "min-words=0" + unless grep /^min-words=/i, @options; + # Wiki pages can have a lot of urls, unless the user specifically + # wants to limit them. + push @options, "exclude=lotsaurls" + unless grep /^max-links/i, @options; + # Unless the user specified a size check, disable such checking. + push @options, "exclude=size" + unless grep /^(?:max|min)-size/i, @options; + # This test has absurd false positives on words like "alpha" + # and "buy". + push @options, "exclude=stopwords"; + + my $res = $client->send_request('testComment', { + ip => $ENV{REMOTE_ADDR}, + comment => $params{content}, + subject => defined $params{subject} ? $params{subject} : "", + name => defined $params{author} ? $params{author} : "", + link => exists $params{url} ? $params{url} : "", + options => join(",", @options), + site => $config{url}, + version => "ikiwiki ".$IkiWiki::version, + }); + + if (! ref $res || ! defined $res->value) { + debug("failed to get response from blogspam server ($url)"); + return undef; + } + elsif ($res->value =~ /^SPAM:(.*)/) { + return gettext("Sorry, but that looks like spam to blogspam: ").$1; + } + elsif ($res->value ne 'OK') { + debug(gettext("blogspam server failure: ").$res->value); + return undef; + } + else { + return undef; + } +} + +1 diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/comments.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/comments.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/comments.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/comments.pm 2009-01-17 03:57:58.000000000 +0100 @@ -343,8 +343,6 @@ error(gettext("bad page name")); } - # FIXME: is this right? Or should we be using the candidate subpage - # (whatever that might mean) as the base URL? my $baseurl = urlto($page, undef, 1); $form->title(sprintf(gettext("commenting on %s"), @@ -469,9 +467,21 @@ } if ($form->submitted eq POST_COMMENT && $form->validate) { - my $file = "$location._comment"; - IkiWiki::checksessionexpiry($cgi, $session); + + $postcomment=1; + IkiWiki::check_content(content => $form->field('editcontent'), + subject => $form->field('subject'), + $config{comments_allowauthor} ? ( + author => $form->field('author'), + url => $form->field('url'), + ) : (), + page => $location, + cgi => $cgi, session => $session + ); + $postcomment=0; + + my $file = "$location._comment"; # FIXME: could probably do some sort of graceful retry # on error? Would require significant unwinding though @@ -508,7 +518,7 @@ # Jump to the new comment on the page. # The trailing question mark tries to avoid broken # caches and get the most recent version of the page. - IkiWiki::redirect($cgi, urlto($page, undef, 1)."#$location?updated"); + IkiWiki::redirect($cgi, urlto($page, undef, 1)."?updated#$location"); } else { @@ -604,6 +614,12 @@ } } + # everything below this point is only relevant to the comments + # themselves + if (!exists $commentstate{$page}) { + return; + } + if ($template->query(name => 'commentuser')) { $template->param(commentuser => $commentstate{$page}{commentuser}); @@ -628,6 +644,14 @@ $template->param(commentauthorurl => $commentstate{$page}{commentauthorurl}); } + + if ($template->query(name => 'removeurl') && + IkiWiki::Plugin::remove->can("check_canremove") && + length $config{cgiurl}) { + $template->param(removeurl => IkiWiki::cgiurl(do => 'remove', + page => $page)); + $template->param(have_actions => 1); + } } package IkiWiki::PageSpec; diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/conditional.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/conditional.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/conditional.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/conditional.pm 2009-01-13 01:39:17.000000000 +0100 @@ -87,6 +87,8 @@ shift; my $glob=shift; my %params=@_; + + $glob=derel($glob, $params{location}); return IkiWiki::FailReason->new("cannot match sourcepage") unless exists $params{sourcepage}; if (match_glob($params{sourcepage}, $glob, @_)) { @@ -102,6 +104,8 @@ my $glob=shift; my %params=@_; + $glob=derel($glob, $params{location}); + return IkiWiki::FailReason->new("cannot match destpage") unless exists $params{destpage}; if (match_glob($params{destpage}, $glob, @_)) { return IkiWiki::SuccessReason->new("destpage matches $glob"); diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/editpage.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/editpage.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/editpage.pm 2008-12-23 22:32:56.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/editpage.pm 2009-01-17 02:41:06.000000000 +0100 @@ -78,7 +78,43 @@ } } }); - return $canedit; + return defined $canedit ? $canedit : 1; +} + +sub check_content (@) { + my %params=@_; + + return 1 if ! exists $hooks{checkcontent}; # optimisation + + if (exists $pagesources{$params{page}}) { + my @diff; + my %old=map { $_ => 1 } + split("\n", readfile(srcfile($pagesources{$params{page}}))); + foreach my $line (split("\n", $params{content})) { + push @diff, $line if ! exists $old{$_}; + } + $params{content}=join("\n", @diff); + } + + my $ok; + run_hooks(checkcontent => sub { + return if defined $ok; + my $ret=shift->(%params); + if (defined $ret) { + if ($ret eq "") { + $ok=1; + } + elsif (ref $ret eq 'CODE') { + $ret->(); + $ok=0; + } + elsif (defined $ret) { + error($ret); + } + } + + }); + return defined $ok ? $ok : 1; } sub cgi_editpage ($$) { @@ -368,8 +404,17 @@ showform($form, \@buttons, $session, $q, forcebaseurl => $baseurl); exit; } + + my $message=""; + if (defined $form->field('comments') && + length $form->field('comments')) { + $message=$form->field('comments'); + } my $content=$form->field('editcontent'); + check_content(content => $content, page => $page, + cgi => $q, session => $session, + subject => $message); run_hooks(editcontent => sub { $content=shift->( content => $content, @@ -403,12 +448,6 @@ my $conflict; if ($config{rcs}) { - my $message=""; - if (defined $form->field('comments') && - length $form->field('comments')) { - $message=$form->field('comments'); - } - if (! $exists) { rcs_add($file); } diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/goodstuff.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/goodstuff.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/goodstuff.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/goodstuff.pm 2009-01-13 01:39:17.000000000 +0100 @@ -22,6 +22,7 @@ template toc toggle + repolist }; sub import { diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/mercurial.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/mercurial.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/mercurial.pm 2008-12-23 22:32:56.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/mercurial.pm 2009-01-17 19:39:41.000000000 +0100 @@ -217,7 +217,7 @@ push @ret, { rev => $info->{"changeset"}, user => $user, - committype => "mercurial", + committype => "hg", when => str2time($info->{"date"}), message => [@message], pages => [@pages], diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/monotone.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/monotone.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/monotone.pm 2008-12-23 22:32:56.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/monotone.pm 2009-01-17 19:39:21.000000000 +0100 @@ -559,7 +559,7 @@ if ($cert->{key} eq $config{mtnkey}) { $committype = "web"; } else { - $committype = "monotone"; + $committype = "mtn"; } } elsif ($cert->{name} eq "date") { $when = str2time($cert->{value}, 'UTC'); diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/pinger.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/pinger.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/pinger.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/pinger.pm 2009-01-13 01:39:17.000000000 +0100 @@ -106,7 +106,7 @@ # will still be avoided. next if $url=~/^\Q$config{cgiurl}\E/; - $ua->head($url); + $ua->get($url); } exit 0; diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/rename.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/rename.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/rename.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/rename.pm 2009-01-13 01:39:17.000000000 +0100 @@ -390,22 +390,8 @@ $template->param(error => $rename->{error}); if ($rename->{src} ne $rename->{dest}) { $template->param(brokenlinks_checked => 1); - $template->param(brokenlinks => [ - map { - { - page => htmllink($rename->{dest}, $rename->{dest}, $_, - noimageinline => 1) - } - } @{$rename->{brokenlinks}} - ]); - $template->param(fixedlinks => [ - map { - { - page => htmllink($rename->{dest}, $rename->{dest}, $_, - noimageinline => 1) - } - } @{$rename->{fixedlinks}} - ]); + $template->param(brokenlinks => linklist($rename->{dest}, $rename->{brokenlinks})); + $template->param(fixedlinks => linklist($rename->{dest}, $rename->{fixedlinks})); } $renamesummary.=$template->output; } @@ -419,6 +405,23 @@ exit 0; } } + +sub linklist { + # generates a list of links in a form suitable for FormBuilder + my $dest=shift; + my $list=shift; + # converts a list of pages into a list of links + # in a form suitable for FormBuilder. + + [map { + { + page => htmllink($dest, $dest, $_, + noimageinline => 1, + linktext => pagetitle($_), + ) + } + } @{$list}] +} sub renamepage_hook ($$$$) { my ($page, $src, $dest, $content)=@_; diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/repolist.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/repolist.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/repolist.pm 1970-01-01 01:00:00.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/repolist.pm 2009-01-13 01:39:17.000000000 +0100 @@ -0,0 +1,51 @@ +#!/usr/bin/perl +package IkiWiki::Plugin::repolist; + +use warnings; +use strict; +use IkiWiki 3.00; + +sub import { + hook(type => "getsetup", id => "repolist", call => \&getsetup); + hook(type => "checkconfig", id => "repolist", call => \&checkconfig); +} + +sub getsetup () { + return + plugin => { + safe => 1, + rebuild => undef, + }, + repositories => { + type => "string", + example => ["svn://svn.example.org/wiki/trunk"], + description => "URIs of repositories containing the wiki's source", + safe => 1, + rebuild => undef, + }, +} + +my $relvcs; + +sub checkconfig () { + if (defined $config{rcs} && $config{repositories}) { + $relvcs=join("\n", map { + s/"//g; # avoid quotes just in case + qq{} + } @{$config{repositories}}); + + hook(type => "pagetemplate", id => "repolist", call => \&pagetemplate); + } +} + +sub pagetemplate (@) { + my %params=@_; + my $page=$params{page}; + my $template=$params{template}; + + if (defined $relvcs && $template->query(name => "relvcs")) { + $template->param(relvcs => $relvcs); + } +} + +1 diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/skeleton.pm.example ikiwiki-3.02ubuntu1/IkiWiki/Plugin/skeleton.pm.example --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/skeleton.pm.example 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/skeleton.pm.example 2009-01-17 03:07:35.000000000 +0100 @@ -6,7 +6,7 @@ use warnings; use strict; -use IkiWiki 2.00; +use IkiWiki 3.00; sub import { hook(type => "getopt", id => "skeleton", call => \&getopt); @@ -30,6 +30,7 @@ hook(type => "auth", id => "skeleton", call => \&auth); hook(type => "sessioncgi", id => "skeleton", call => \&sessioncgi); hook(type => "canedit", id => "skeleton", call => \&canedit); + hook(type => "checkcontent", id => "skeleton", call => \&checkcontent); hook(type => "editcontent", id => "skeleton", call => \&editcontent); hook(type => "formbuilder_setup", id => "skeleton", call => \&formbuilder_setup); hook(type => "formbuilder", id => "skeleton", call => \&formbuilder); @@ -89,7 +90,7 @@ return $params{content}; } -sub scan (@) { #{{{a +sub scan (@) { my %params=@_; debug("skeleton plugin running as scan"); @@ -180,6 +181,12 @@ debug("skeleton plugin running in canedit"); } +sub checkcontent (@) { + my %params=@_; + + debug("skeleton plugin running in checkcontent"); +} + sub editcontent ($$$) { my %params=@_; diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Plugin/table.pm ikiwiki-3.02ubuntu1/IkiWiki/Plugin/table.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Plugin/table.pm 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Plugin/table.pm 2009-01-13 01:39:17.000000000 +0100 @@ -8,7 +8,7 @@ sub import { hook(type => "getsetup", id => "table", call => \&getsetup); - hook(type => "preprocess", id => "table", call => \&preprocess); + hook(type => "preprocess", id => "table", call => \&preprocess, scan => 1); } sub getsetup () { @@ -27,13 +27,31 @@ ); if (exists $params{file}) { - if (! $pagesources{$params{file}}) { + if (! exists $pagesources{$params{file}}) { error gettext("cannot find file"); } $params{data} = readfile(srcfile($params{file})); add_depends($params{page}, $params{file}); } + if (! defined wantarray) { + # scan mode -- if the table uses an external file, need to + # scan that file too. + return unless exists $params{file}; + + IkiWiki::run_hooks(scan => sub { + shift->( + page => $params{page}, + content => $params{data}, + ); + }); + + # Preprocess in scan-only mode. + IkiWiki::preprocess($params{page}, $params{page}, $params{data}, 1); + + return; + } + if (lc $params{format} eq 'auto') { # first try the more simple format if (is_dsv_data($params{data})) { @@ -50,22 +68,18 @@ defined $params{delimiter} ? $params{delimiter} : ",",); # linkify after parsing since html link quoting can # confuse CSV parsing - if (! exists $params{file}) { - @data=map { - [ map { - IkiWiki::linkify($params{page}, - $params{destpage}, $_); - } @$_ ] - } @data; - } + @data=map { + [ map { + IkiWiki::linkify($params{page}, + $params{destpage}, $_); + } @$_ ] + } @data; } elsif (lc $params{format} eq 'dsv') { # linkify before parsing since wikilinks can contain the # delimiter - if (! exists $params{file}) { - $params{data} = IkiWiki::linkify($params{page}, - $params{destpage}, $params{data}); - } + $params{data} = IkiWiki::linkify($params{page}, + $params{destpage}, $params{data}); @data=split_dsv($params{data}, defined $params{delimiter} ? $params{delimiter} : "|",); } diff -Nru ikiwiki-3.01ubuntu1/IkiWiki/Setup/Automator.pm ikiwiki-3.02ubuntu1/IkiWiki/Setup/Automator.pm --- ikiwiki-3.01ubuntu1/IkiWiki/Setup/Automator.pm 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki/Setup/Automator.pm 2009-01-13 01:39:17.000000000 +0100 @@ -73,8 +73,18 @@ print "\n\nSetting up $config{wikiname} ...\n"; - # Set up the repository. + # Set up the srcdir. mkpath($config{srcdir}) || die "mkdir $config{srcdir}: $!"; + # Copy in example wiki. + if (exists $config{example}) { + # cp -R is POSIX + # Another reason not to use -a is so that pages such as blog + # posts will not have old creation dates on this new wiki. + system("cp -R $IkiWiki::installdir/share/ikiwiki/examples/$config{example}/* $config{srcdir}"); + delete $config{example}; + } + + # Set up the repository. delete $config{repository} if ! $config{rcs} || $config{rcs}=~/bzr|mercurial/; if ($config{rcs}) { my @params=($config{rcs}, $config{srcdir}); diff -Nru ikiwiki-3.01ubuntu1/IkiWiki.pm ikiwiki-3.02ubuntu1/IkiWiki.pm --- ikiwiki-3.01ubuntu1/IkiWiki.pm 2009-01-03 18:48:05.000000000 +0100 +++ ikiwiki-3.02ubuntu1/IkiWiki.pm 2009-01-13 01:39:17.000000000 +0100 @@ -26,7 +26,7 @@ %pagesources %destsources); our $VERSION = 3.00; # plugin interface version, next is ikiwiki version our $version='unknown'; # VERSION_AUTOREPLACE done by Makefile, DNE -my $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE +our $installdir=''; # INSTALLDIR_AUTOREPLACE done by Makefile, DNE # Optimisation. use Memoize; @@ -1807,19 +1807,25 @@ package IkiWiki::PageSpec; +sub derel ($$) { + my $path=shift; + my $from=shift; + + if ($path =~ m!^\./!) { + $from=~s#/?[^/]+$## if defined $from; + $path=~s#^\./##; + $path="$from/$path" if length $from; + } + + return $path; +} + sub match_glob ($$;@) { my $page=shift; my $glob=shift; my %params=@_; - my $from=exists $params{location} ? $params{location} : ''; - - # relative matching - if ($glob =~ m!^\./!) { - $from=~s#/?[^/]+$##; - $glob=~s#^\./##; - $glob="$from/$glob" if length $from; - } + $glob=derel($glob, $params{location}); my $regexp=IkiWiki::glob2re($glob); if ($page=~/^$regexp$/i) { @@ -1844,15 +1850,9 @@ my $link=lc(shift); my %params=@_; + $link=derel($link, $params{location}); my $from=exists $params{location} ? $params{location} : ''; - # relative matching - if ($link =~ m!^\.! && defined $from) { - $from=~s#/?[^/]+$##; - $link=~s#^\./##; - $link="$from/$link" if length $from; - } - my $links = $IkiWiki::links{$page}; return IkiWiki::FailReason->new("$page has no links") unless $links && @{$links}; my $bestlink = IkiWiki::bestlink($from, $link); @@ -1880,6 +1880,9 @@ sub match_created_before ($$;@) { my $page=shift; my $testpage=shift; + my %params=@_; + + $testpage=derel($testpage, $params{location}); if (exists $IkiWiki::pagectime{$testpage}) { if ($IkiWiki::pagectime{$page} < $IkiWiki::pagectime{$testpage}) { @@ -1897,6 +1900,9 @@ sub match_created_after ($$;@) { my $page=shift; my $testpage=shift; + my %params=@_; + + $testpage=derel($testpage, $params{location}); if (exists $IkiWiki::pagectime{$testpage}) { if ($IkiWiki::pagectime{$page} > $IkiWiki::pagectime{$testpage}) { diff -Nru ikiwiki-3.01ubuntu1/Makefile.PL ikiwiki-3.02ubuntu1/Makefile.PL --- ikiwiki-3.01ubuntu1/Makefile.PL 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/Makefile.PL 2009-01-13 01:39:17.000000000 +0100 @@ -69,6 +69,15 @@ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \ fi \ done + + # Install example sites. + for dir in `cd doc/examples; find -type d ! -regex '.*\.svn.*'`; do \ + install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$dir; \ + done + for file in `cd doc/examples; find -type f ! -regex '.*\.svn.*'`; do \ + cp -aL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file || \ + install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \ + done for dir in `find templates -follow -type d ! -regex '.*\.svn.*'`; do \ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \ @@ -111,6 +120,7 @@ -install -d $(DESTDIR)/etc/ikiwiki -install -m 0644 wikilist $(DESTDIR)/etc/ikiwiki -install -m 0644 auto.setup $(DESTDIR)/etc/ikiwiki + -install -m 0644 auto-blog.setup $(DESTDIR)/etc/ikiwiki } } diff -Nru ikiwiki-3.01ubuntu1/pm_filter ikiwiki-3.02ubuntu1/pm_filter --- ikiwiki-3.01ubuntu1/pm_filter 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/pm_filter 2009-01-13 01:39:18.000000000 +0100 @@ -7,7 +7,7 @@ } if (/INSTALLDIR_AUTOREPLACE/) { - $_=qq{my \$installdir="$prefix";}; + $_=qq{our \$installdir="$prefix";}; } elsif (/VERSION_AUTOREPLACE/) { $_=qq{our \$version="$ver";}; diff -Nru ikiwiki-3.01ubuntu1/po/fr.po ikiwiki-3.02ubuntu1/po/fr.po --- ikiwiki-3.01ubuntu1/po/fr.po 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/po/fr.po 2009-01-17 20:56:47.000000000 +0100 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: ikiwiki 2.71 \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-20 18:07-0500\n" +"POT-Creation-Date: 2009-01-05 18:53-0500\n" "PO-Revision-Date: 2008-12-29 17:57+0100\n" "Last-Translator: Philippe Batailler \n" "Language-Team: French \n" @@ -25,7 +25,7 @@ msgid "login failed, perhaps you need to turn on cookies?" msgstr "Échec de l'identification, vous devez autoriser les cookies." -#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:310 +#: ../IkiWiki/CGI.pm:163 ../IkiWiki/CGI.pm:280 msgid "Your login session has expired." msgstr "Session d'authentification expirée." @@ -41,87 +41,87 @@ msgid "Admin" msgstr "Administrateur" -#: ../IkiWiki/CGI.pm:253 +#: ../IkiWiki/CGI.pm:226 msgid "Preferences saved." msgstr "Les préférences ont été enregistrées." -#: ../IkiWiki/CGI.pm:271 +#: ../IkiWiki/CGI.pm:241 msgid "You are banned." msgstr "Vous avez été banni." -#: ../IkiWiki/CGI.pm:401 ../IkiWiki/CGI.pm:402 ../IkiWiki.pm:1204 +#: ../IkiWiki/CGI.pm:371 ../IkiWiki/CGI.pm:372 ../IkiWiki.pm:1204 msgid "Error" msgstr "Erreur" -#: ../IkiWiki/Plugin/aggregate.pm:80 +#: ../IkiWiki/Plugin/aggregate.pm:84 msgid "Aggregation triggered via web." msgstr "Agrégation déclenchée par le web" -#: ../IkiWiki/Plugin/aggregate.pm:89 +#: ../IkiWiki/Plugin/aggregate.pm:93 msgid "Nothing to do right now, all feeds are up-to-date!" msgstr "Rien à faire pour le moment, tous les flux sont à jour !" -#: ../IkiWiki/Plugin/aggregate.pm:216 +#: ../IkiWiki/Plugin/aggregate.pm:220 #, perl-format msgid "missing %s parameter" msgstr "Paramètre %s manquant" -#: ../IkiWiki/Plugin/aggregate.pm:251 +#: ../IkiWiki/Plugin/aggregate.pm:255 msgid "new feed" msgstr "Nouveau flux" -#: ../IkiWiki/Plugin/aggregate.pm:265 +#: ../IkiWiki/Plugin/aggregate.pm:269 msgid "posts" msgstr "Articles" -#: ../IkiWiki/Plugin/aggregate.pm:267 +#: ../IkiWiki/Plugin/aggregate.pm:271 msgid "new" msgstr "Nouveau" -#: ../IkiWiki/Plugin/aggregate.pm:431 +#: ../IkiWiki/Plugin/aggregate.pm:435 #, perl-format msgid "expiring %s (%s days old)" msgstr "Fin de validité de %s (date de %s jours)" -#: ../IkiWiki/Plugin/aggregate.pm:438 +#: ../IkiWiki/Plugin/aggregate.pm:442 #, perl-format msgid "expiring %s" msgstr "Fin de validité de %s" -#: ../IkiWiki/Plugin/aggregate.pm:465 +#: ../IkiWiki/Plugin/aggregate.pm:469 #, perl-format msgid "last checked %s" msgstr "dernière vérification : %s" -#: ../IkiWiki/Plugin/aggregate.pm:469 +#: ../IkiWiki/Plugin/aggregate.pm:473 #, perl-format msgid "checking feed %s ..." msgstr "Vérification du flux %s..." -#: ../IkiWiki/Plugin/aggregate.pm:474 +#: ../IkiWiki/Plugin/aggregate.pm:478 #, perl-format msgid "could not find feed at %s" msgstr "Impossible de trouver de flux à %s" -#: ../IkiWiki/Plugin/aggregate.pm:493 +#: ../IkiWiki/Plugin/aggregate.pm:497 msgid "feed not found" msgstr "Flux introuvable " -#: ../IkiWiki/Plugin/aggregate.pm:504 +#: ../IkiWiki/Plugin/aggregate.pm:508 #, perl-format msgid "(invalid UTF-8 stripped from feed)" msgstr "(chaîne UTF-8 non valable supprimée du flux)" -#: ../IkiWiki/Plugin/aggregate.pm:512 +#: ../IkiWiki/Plugin/aggregate.pm:516 #, perl-format msgid "(feed entities escaped)" msgstr "(échappement des entités de flux)" -#: ../IkiWiki/Plugin/aggregate.pm:520 +#: ../IkiWiki/Plugin/aggregate.pm:524 msgid "feed crashed XML::Feed!" msgstr "Plantage du flux XML::Feed !" -#: ../IkiWiki/Plugin/aggregate.pm:601 +#: ../IkiWiki/Plugin/aggregate.pm:605 #, perl-format msgid "creating new page %s" msgstr "Création de la nouvelle page %s" @@ -156,15 +156,15 @@ msgid "there is already a page named %s" msgstr "Il existe déjà une page nommée %s" -#: ../IkiWiki/Plugin/attachment.pm:82 +#: ../IkiWiki/Plugin/attachment.pm:65 msgid "prohibited by allowed_attachments" msgstr "Action interdite par allowed_attachments" -#: ../IkiWiki/Plugin/attachment.pm:190 +#: ../IkiWiki/Plugin/attachment.pm:140 msgid "bad attachment filename" msgstr "Nom de la pièce jointe incorrect" -#: ../IkiWiki/Plugin/attachment.pm:232 +#: ../IkiWiki/Plugin/attachment.pm:182 msgid "attachment upload" msgstr "Envoi de la pièce jointe" @@ -188,12 +188,12 @@ msgid "There are no broken links!" msgstr "Aucun lien cassé !" -#: ../IkiWiki/Plugin/comments.pm:119 ../IkiWiki/Plugin/format.pm:23 +#: ../IkiWiki/Plugin/comments.pm:120 ../IkiWiki/Plugin/format.pm:23 #, perl-format msgid "unsupported page format %s" msgstr "Format de page non reconnu %s" -#: ../IkiWiki/Plugin/comments.pm:124 +#: ../IkiWiki/Plugin/comments.pm:125 msgid "comment must have content" msgstr "Un commentaire doit avoir un contenu." @@ -201,44 +201,44 @@ msgid "Anonymous" msgstr "Anonyme" -#: ../IkiWiki/Plugin/comments.pm:243 ../IkiWiki/Plugin/recentchanges.pm:101 +#: ../IkiWiki/Plugin/comments.pm:252 ../IkiWiki/Plugin/recentchanges.pm:110 msgid "missing page" msgstr "Page manquante" -#: ../IkiWiki/Plugin/comments.pm:245 ../IkiWiki/Plugin/recentchanges.pm:103 +#: ../IkiWiki/Plugin/comments.pm:254 ../IkiWiki/Plugin/recentchanges.pm:112 #, perl-format msgid "The page %s does not exist." msgstr "La page %s n'existe pas." -#: ../IkiWiki/Plugin/comments.pm:334 ../IkiWiki/Plugin/editpage.pm:124 +#: ../IkiWiki/Plugin/comments.pm:343 ../IkiWiki/Plugin/editpage.pm:124 msgid "bad page name" msgstr "Nom de page incorrect" -#: ../IkiWiki/Plugin/comments.pm:341 +#: ../IkiWiki/Plugin/comments.pm:350 #, perl-format msgid "commenting on %s" msgstr "Faire un commentaire sur %s" -#: ../IkiWiki/Plugin/comments.pm:359 +#: ../IkiWiki/Plugin/comments.pm:368 #, perl-format msgid "page '%s' doesn't exist, so you can't comment" msgstr "La page '%s' n'existe pas, commentaire impossible." -#: ../IkiWiki/Plugin/comments.pm:366 +#: ../IkiWiki/Plugin/comments.pm:375 #, perl-format msgid "comments on page '%s' are closed" msgstr "Le commentaire pour la page '%s' est terminé." -#: ../IkiWiki/Plugin/comments.pm:468 +#: ../IkiWiki/Plugin/comments.pm:483 msgid "Added a comment" msgstr "Commentaire ajouté" -#: ../IkiWiki/Plugin/comments.pm:472 +#: ../IkiWiki/Plugin/comments.pm:487 #, perl-format msgid "Added a comment: %s" msgstr "Commentaire ajouté : %s" -#: ../IkiWiki/Plugin/comments.pm:565 +#: ../IkiWiki/Plugin/comments.pm:601 msgid "Comments" msgstr "Commentaires" @@ -329,10 +329,6 @@ msgid "Failed to parse url, cannot determine domain name" msgstr "Impossible d'analyser l'url, pas de nom de domaine" -#: ../IkiWiki/Plugin/googlecalendar.pm:32 -msgid "failed to find url in html" -msgstr "Impossible de trouver une URL dans le code HTML" - #: ../IkiWiki/Plugin/graphviz.pm:67 msgid "failed to run graphviz" msgstr "Échec du lancement de graphviz" @@ -406,7 +402,7 @@ msgid "failed to run dot" msgstr "Échec du lancement de dot" -#: ../IkiWiki/Plugin/lockedit.pm:49 ../IkiWiki/Plugin/lockedit.pm:66 +#: ../IkiWiki/Plugin/lockedit.pm:47 #, perl-format msgid "%s is locked and cannot be edited" msgstr "%s est verrouillé et ne peut être modifié" @@ -1027,7 +1023,7 @@ msgid "preprocessing loop detected on %s at depth %i" msgstr "Une boucle de pré traitement a été détectée sur %s à hauteur de %i" -#: ../IkiWiki.pm:1688 +#: ../IkiWiki.pm:1661 msgid "yes" msgstr "oui" @@ -1051,6 +1047,9 @@ msgid "What is the domain name of the web server?" msgstr "Nom de domaine du serveur HTTP :" +#~ msgid "failed to find url in html" +#~ msgstr "Impossible de trouver une URL dans le code HTML" + #~ msgid "processed ok at %s" #~ msgstr "A été correctement traité à %s" diff -Nru ikiwiki-3.01ubuntu1/po/ikiwiki.pot ikiwiki-3.02ubuntu1/po/ikiwiki.pot --- ikiwiki-3.01ubuntu1/po/ikiwiki.pot 2008-12-31 19:33:10.000000000 +0100 +++ ikiwiki-3.02ubuntu1/po/ikiwiki.pot 2009-01-17 20:56:47.000000000 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-28 15:01-0500\n" +"POT-Creation-Date: 2009-01-06 14:31-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -237,7 +237,7 @@ msgid "Added a comment: %s" msgstr "" -#: ../IkiWiki/Plugin/comments.pm:598 +#: ../IkiWiki/Plugin/comments.pm:601 msgid "Comments" msgstr "" diff -Nru ikiwiki-3.01ubuntu1/templates/comment.tmpl ikiwiki-3.02ubuntu1/templates/comment.tmpl --- ikiwiki-3.01ubuntu1/templates/comment.tmpl 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/templates/comment.tmpl 2009-01-13 01:39:18.000000000 +0100 @@ -39,4 +39,15 @@ — + + +

Remove comment

+ + diff -Nru ikiwiki-3.01ubuntu1/templates/page.tmpl ikiwiki-3.02ubuntu1/templates/page.tmpl --- ikiwiki-3.01ubuntu1/templates/page.tmpl 2008-12-22 22:43:52.000000000 +0100 +++ ikiwiki-3.02ubuntu1/templates/page.tmpl 2009-01-13 01:39:18.000000000 +0100 @@ -13,6 +13,7 @@ +