Merge remote branch 'remotes/origin/master'

27 files changed, 334 insertions, 23 deletions

diff --git a/doc/bugs/More_permission_checking.mdwn b/doc/bugs/More_permission_checking.mdwn
new file mode 100644
index 000000000..e56cda98b
--- /dev/null
+++ b/doc/bugs/More_permission_checking.mdwn
@@ -0,0 +1,9 @@
+I'm often confused about permissions and I wish ikiwiki could stamp it's foot down and ensure all the permissions are correctly (canonically?) setup.
+
+I keep ending up having to `sudo chown -R :www-data` and `sudo chmod -R g+w` on srcdir, destdir. I'm never quite sure what is the best practice for the srcdirs' `/srv/git/` is. Currently everything looks like `hendry:www-data` with ug+rw.
+
+I think I've triggered these problems by (not thinking and) running `ikiwiki --rebuild --setup /home/hendry/.ikiwiki/mywiki.setup` as my user.
+
+I don't know if there can be some lookup with `/etc/ikiwiki/wikilist`.  Though shouldn't everything be under the `www-data` group in reality?
+
+Also when I use `sudo ikiwiki -setup /etc/ikiwiki/auto.setup`, I think I create a ton of problems for myself since everything is created as the root user, right? And `/etc/ikiwiki/wikilist` doesn't seem to have the latest created wiki added. I have to reluctantly manually do this.
diff --git a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn
index 10ba15066..e7797765f 100644
--- a/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn
+++ b/doc/bugs/class_parameter_of_img_directive_behave_not_as_documented.mdwn
@@ -27,3 +27,5 @@ I would prefer if the `img` class were only added if no class attribute is
 passed.
 
 If you keep the current behaviour, please document it.
+
+> [[done]] --[[Joey]] 
diff --git a/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn
new file mode 100644
index 000000000..35f624f78
--- /dev/null
+++ b/doc/bugs/monotone_backend_does_not_support_srcdir_in_subdir.mdwn
@@ -0,0 +1,5 @@
+The [[rcs/monotone]] backend does not currently support putting the ikiwiki srcdir
+in a subdirectory of the repository.  It must be at the top. Git has
+special code to handle this case. --[[Joey]] 
+
+[[done]]
diff --git a/doc/bugs/web_reversion_on_ikiwiki.info.mdwn b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
new file mode 100644
index 000000000..6f18cfcba
--- /dev/null
+++ b/doc/bugs/web_reversion_on_ikiwiki.info.mdwn
@@ -0,0 +1,14 @@
+I created [[sandbox/revert me]] and then tried the revert button on
+[[recentchanges]], but I was not allowed to revert it. The specific error
+was
+
+    Error: you are not allowed to change sandbox/revert_me.mdwn
+
+I've just tried reading through the revert code, and I haven't figured out
+what permission I am lacking.  Perhaps the error message could be a little
+clearer on that. The error might have been thrown by git_parse_changes in
+git.pm or check_canchange in IkiWiki.pm, via IkiWiki::Receive. -- Jon
+
+[[fixed|done]] --[[Joey]]
+
+: Brilliant, many thanks. -- [[Jon]]
diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn
new file mode 100644
index 000000000..8d6700651
--- /dev/null
+++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__.mdwn
@@ -0,0 +1,7 @@
+I have been mucking about with ikiwiki for two whole days now. 
+
+I like many things about it. Even though I've been spending most of my time wrestling with css I did manage to write a whole lot of blog posts and love what ikiwiki is doing for the "revise" part of my writing cycle. And I like the idea of integrating the wiki and the blog into one unifying architecture....
+
+But... I would like very much to have different page templates for blogging and wiki-ing, some way of specifying that for stuff in the "/posts" directory I'd rather use blogpost.tmpl rather than page.tmpl. I just spent a few minutes looking at the perl for this (I assume Render.pm) and my mind dumped core...
+
+(generically, some way to specify output formatting on a subdirectory basis would be good) 
diff --git a/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment
new file mode 100644
index 000000000..e92f4107d
--- /dev/null
+++ b/doc/forum/Different_templates_for_subdirectories__63_____40__Blogging_and_Wiki_pages__41__/comment_1_15651796492a6f04a19f4a481947c97c._comment
@@ -0,0 +1,16 @@
+[[!comment format=mdwn
+ username="https://www.google.com/accounts/o8/id?id=AItOawlY5yDefnXSHvWGbJ9kvhnAyQZiAAttENk"
+ nickname="Javier"
+ subject="comment 1"
+ date="2010-10-21T15:00:50Z"
+ content="""
+You can do what you want with the [[ikiwiki/directive/pagetemplate]] directive, but in a slightly cumbersome way, because you have to say what template you want in every page that differs from the default.
+
+See also: [[templates]]
+
+And, a perhaps more proper solution to your problem, although I don't fully understand the way of tackling it, in [[todo/multiple_template_directories]].
+
+If you could create a proper page in this wiki, centralizing all the knowledge dispersed in those pages, it would be nice ;)
+
+--[[jerojasro]]
+"""]]
diff --git a/doc/forum/Discussion_PageSpec__63__.mdwn b/doc/forum/Discussion_PageSpec__63__.mdwn
new file mode 100644
index 000000000..2860d0d17
--- /dev/null
+++ b/doc/forum/Discussion_PageSpec__63__.mdwn
@@ -0,0 +1,3 @@
+I've looked around but haven't found it. Can you set a Discussion PageSpec so only certain pages allow discussion?
+
+> Not currently, sorry. --[[Joey]] 
diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn
new file mode 100644
index 000000000..fcffe690f
--- /dev/null
+++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links.mdwn
@@ -0,0 +1,3 @@
+Map Plugin, would like to add ?updated to all links created.
+
+When I edit a page and then click that page in a map in a sidebar Safari always shows me a cached page. 
diff --git a/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment
new file mode 100644
index 000000000..ce1a78584
--- /dev/null
+++ b/doc/forum/Map_Plugin__44___would_like_to_add___63__updated_to_all_links/comment_1_3fe4c5967e704355f9b594aed46baf67._comment
@@ -0,0 +1,13 @@
+[[!comment format=mdwn
+ username="justint"
+ ip="24.182.207.250"
+ subject="skip it"
+ date="2010-10-13T05:30:50Z"
+ content="""
+skip it, I added 
+
+    <meta http-equiv=\"expires\" value=\"Thu, 16 Mar 2000 11:00:00 GMT\" />
+    <meta http-equiv=\"pragma\" content=\"no-cache\" />
+
+to my page.tmpl and the problem went away.
+"""]]
diff --git a/doc/forum/PageSpec_results_from_independent_checkout.mdwn b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
new file mode 100644
index 000000000..6b2fd6df0
--- /dev/null
+++ b/doc/forum/PageSpec_results_from_independent_checkout.mdwn
@@ -0,0 +1,5 @@
+I'd like to be able to do PageSpec matches independent of the Ikiwiki checkout, but at best I'm currently restricted to copying over and using whatever is in the indexdb with this approach:
+
+    perl -MIkiWiki -le '$config{wikistatedir}=".ikiwiki"; IkiWiki::loadindex(); print foreach pagespec_match_list("", shift)' "bugs/*"
+
+I get the impression there's a way to build up enough state to run pagespec matches without doing any rendering, but I don't know how. Any ideas? -- JoeRayhawk
diff --git a/doc/ikiwiki/directive/template.mdwn b/doc/ikiwiki/directive/template.mdwn
index 6c50fa32e..9e3ae54df 100644
--- a/doc/ikiwiki/directive/template.mdwn
+++ b/doc/ikiwiki/directive/template.mdwn
@@ -34,11 +34,15 @@ large chunks of marked up text to be embedded into a template:
 The template is a regular wiki page, located in the `templates/`
 subdirectory inside the source directory of the wiki.
 
-(Alternatively, templates can be stored in a directory outside the wiki,
+Alternatively, templates can be stored in a directory outside the wiki,
 as files with the extension ".tmpl".
-By default, these are searched for in `/usr/share/ikiwiki/templates`;
+By default, these are searched for in `/usr/share/ikiwiki/templates`,
 the `templatedir` setting can be used to make another directory be searched
-first.)
+first.  When referring to templates outside the wiki source directory, the "id"
+parameter is not interpreted as a pagespec, and you must include the full filename
+of the template page, including the ".tmpl" extension. E.g.:
+
+    \[[!template id=blogpost.tmpl]]
 
 The template uses the syntax used by the [[!cpan HTML::Template]] perl
 module, which allows for some fairly complex things to be done. Consult its
diff --git a/doc/ikiwiki/pagespec.mdwn b/doc/ikiwiki/pagespec.mdwn
index 6aec561ae..fe1af4c15 100644
--- a/doc/ikiwiki/pagespec.mdwn
+++ b/doc/ikiwiki/pagespec.mdwn
@@ -32,6 +32,7 @@ Some more elaborate limits can be added to what matches using these functions:
   tags matched by a glob)
 * "`backlink(page)`" - matches only pages that a given page links to
 * "`creation_month(month)`" - matches only files created on the given month
+  number
 * "`creation_day(mday)`" - or day of the month
 * "`creation_year(year)`" - or year
 * "`created_after(page)`" - matches only files created after the given page
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 2f70c67b7..2836d96e5 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -154,7 +154,7 @@ Personal sites and blogs
 * [Ertug Karamatli](http://pages.karamatli.com)
 * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day.
 * [Daniel Wayne Armstrong](http://circuidipity.com/)
-* [Mukund](https://www.mukund.org/)
+* [Mukund](https://mukund.org/)
 * [Nicolas Schodet](http://ni.fr.eu.org/)
 * [weakish](http://weakish.github.com)
 * [Thomas Kane](http://planetkane.org/)
diff --git a/doc/news/openid.mdwn b/doc/news/openid.mdwn
index 025a07802..05991ff72 100644
--- a/doc/news/openid.mdwn
+++ b/doc/news/openid.mdwn
@@ -10,4 +10,4 @@ log back in, try out the OpenID signup process if you don't already have an
 OpenID, and see how OpenID works for you. And let me know your feelings about
 making such a switch. --[[Joey]]
 
-[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 37 "Accept both"]]
+[[!poll 67 "Accept only OpenID for logins" 21 "Accept only password logins" 38 "Accept both"]]
diff --git a/doc/news/version_3.20100804.mdwn b/doc/news/version_3.20100804.mdwn
deleted file mode 100644
index be85cb949..000000000
--- a/doc/news/version_3.20100804.mdwn
+++ /dev/null
@@ -1,14 +0,0 @@
-ikiwiki 3.20100804 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * template: Fix dependency tracking. Broken in version 3.20100427.
-   * po: The po\_slave\_languages setting is now a list, so the order of
-     translated languages can be controlled. (intrigeri)
-   * git: Fix gitweb historyurl examples so "diff to current" links work.
-     (Thanks jrayhawk)
-   * meta: Allow syntax closer to html meta to be used.
-   * Add new disable hook, allowing plugins to perform cleanup after they
-     have been disabled.
-   * Use Digest::SHA built into perl rather than external Digest::SHA1
-     to simplify dependencies. Closes: #[591040](http://bugs.debian.org/591040)
-   * Fixes a bug that prevented matching deleted pages when using the page()
-     PageSpec."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20100815.mdwn b/doc/news/version_3.20100815.mdwn
deleted file mode 100644
index 1073933a1..000000000
--- a/doc/news/version_3.20100815.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-ikiwiki 3.20100815 released with [[!toggle text="these changes"]]
-[[!toggleable text="""
-   * Fix po test suite to not assume ikiwiki's underlay is already installed.
-     Closes: #[593047](http://bugs.debian.org/593047)"""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101019.mdwn b/doc/news/version_3.20101019.mdwn
new file mode 100644
index 000000000..86c302e25
--- /dev/null
+++ b/doc/news/version_3.20101019.mdwn
@@ -0,0 +1,20 @@
+ikiwiki 3.20101019 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix test suite failure on other side of date line.
+   * htmltidy: Allow configuring tidy parameters in setup file.
+     (W. Trevor King)
+   * Updated French program translation. Closes: #[598918](http://bugs.debian.org/598918)
+   * git: Added new rcs\_revert and rcs\_preprevert hooks.
+   * recentchanges: Add revert buttons to RecentChanges page, and
+     implement web-based reversion interface.
+   * Thanks to Peter Gammie for his assistance with the web-based reversion
+     feature.
+   * actiontabs: More consistent styling of Hn tags.
+   * websetup: Fix saving of advanced mode changes.
+   * websetup: Fix defaults of checkboxes in advanced mode.
+   * monotone: Fix recentchanges page when the srcdir is not at the top
+     of the monotone workspace. Thanks, tommyd.
+   * img: If a class is specified, don't also put the img in the img
+     class.
+   * auto-blog.setup: Don't enable opendiscussion by default; require users be
+     logged in to post comments."""]]
\ No newline at end of file
diff --git a/doc/news/version_3.20101023.mdwn b/doc/news/version_3.20101023.mdwn
new file mode 100644
index 000000000..44bed6be6
--- /dev/null
+++ b/doc/news/version_3.20101023.mdwn
@@ -0,0 +1,4 @@
+ikiwiki 3.20101023 released with [[!toggle text="these changes"]]
+[[!toggleable text="""
+   * Fix typo that broke anonymous git push.
+   * Fix web reversion when the srcdir is in a subdir of the git repo."""]]
\ No newline at end of file
diff --git a/doc/plugins/aggregate/discussion.mdwn b/doc/plugins/aggregate/discussion.mdwn
index 1a9844577..77005a6a1 100644
--- a/doc/plugins/aggregate/discussion.mdwn
+++ b/doc/plugins/aggregate/discussion.mdwn
@@ -89,3 +89,30 @@ New bug: new posts aren't getting displayed (or cached for aggregation). After f
 >>> mind having a copy to investigate. --[[Joey]]
 
 >>>> Didn't think of that, will keep a copy if there's a next time. -- [[schmonz]]
+
+-----
+
+In a corporate environment where feeds are generally behind
+authentication, I need to prime the aggregator's `LWP::UserAgent`
+with some cookies. What I've done is write a custom plugin to populate
+`$config{cookies}` with an `HTTP::Cookies` object, plus this diff:
+
+    --- /var/tmp/pkg/lib/perl5/vendor_perl/5.10.0/IkiWiki/Plugin/aggregate.pm  2010-06-24 13:03:33.000000000 -0400
+    +++ aggregate.pm    2010-06-24 13:04:09.000000000 -0400
+    @@ -488,7 +488,11 @@
+                        }
+                        $feed->{feedurl}=pop @urls;
+                }
+    -           my $res=URI::Fetch->fetch($feed->{feedurl});
+    +           my $res=URI::Fetch->fetch($feed->{feedurl},
+    +                                     UserAgent => LWP::UserAgent->new(
+    +                                           cookie_jar => $config{cookies},
+    +                                     ),
+    +           );
+                if (! $res) {
+                        $feed->{message}=URI::Fetch->errstr;
+                        $feed->{error}=1;
+
+It works, but I have to remember to apply the diff whenever I update
+ikiwiki.  Can you provide a more elegant means of allowing cookies and/or
+the user agent to be programmatically manipulated? --[[schmonz]]
diff --git a/doc/plugins/theme.mdwn b/doc/plugins/theme.mdwn
index 7149cc163..2622abc88 100644
--- a/doc/plugins/theme.mdwn
+++ b/doc/plugins/theme.mdwn
@@ -9,3 +9,6 @@ inside `/usr/share/ikiwiki/themes/`.
 A theme provides, via the underlay, an enhanced version of the regular
 [[style.css]]. This leaves [[local.css]] free for you to further
 customise. Themes can also provide header and background images.
+
+You can set the theme via the **theme** option in your config file (after
+enabling the plugin). Refresh the wiki after changing it to see the changes.
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index a3a20fd78..c665e67f0 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -53,6 +53,7 @@ Bulleted list
 * [[different_name_for_a_WikiLink|ikiwiki/WikiLink]]
 * <http://www.gnu.org/>
 * [GNU](http://www.gnu.org/)
+* <a href="http://kitenet.net/~joey/">Joey's blog</a>
 
 ----
 
diff --git a/doc/sandbox/hey.mdwn b/doc/sandbox/hey.mdwn
new file mode 100644
index 000000000..a955185ef
--- /dev/null
+++ b/doc/sandbox/hey.mdwn
@@ -0,0 +1 @@
+* Hello
diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn
new file mode 100644
index 000000000..2b1cd2f94
--- /dev/null
+++ b/doc/sandbox/revert_me.mdwn
@@ -0,0 +1 @@
+this looks good
diff --git a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
index d67a9131b..4a7163eae 100644
--- a/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
+++ b/doc/tips/convert_mediawiki_to_ikiwiki/discussion.mdwn
@@ -6,6 +6,10 @@
 
 ----
 
+I wrote a script that will download all the latest revisions of a mediawiki site. In short, it does a good part of the stuff required for the migration: it downloads the goods (ie. the latest version of every page, automatically) and commits the resulting structure. There's still a good few pieces missing for an actual complete conversion to ikiwiki, but it's a pretty good start. It only talks with mediawiki through HTTP, so no special access is necessary. The downside of that is that it will not attempt to download every revision for performance reasons. The code is here: http://anarcat.ath.cx/software/mediawikigitdump.git/ See header of the file for more details and todos. -- [[users/Anarcat]] 2010-10-15
+
+----
+
 The u32 page is excellent, but I wonder if documenting the procedure here
 would be worthwhile. Who knows, the remote site might disappear. But also
 there are some variations on the approach that might be useful:
diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
new file mode 100644
index 000000000..8b649156d
--- /dev/null
+++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard.mdwn
@@ -0,0 +1,184 @@
+These are some notes on installing ikiwiki on Mac OS X Snow Leopard. I have a three year old machine with a lot of stuff on it so it took quite a while, YMMV. 
+
+The best part of installing ikiwiki was learning how to use git. I never used source control before but its pretty slick.
+
+
+## installing git:
+
+cd /opt/ikiwiki/install
+
+curl http://kernel.org/pub/software/scm/git/git-(latest version).tar.gz -O
+
+tar xzvf git-(latest version).tar.gz
+
+cd git-(latest version)
+
+./configure --prefix=/usr/local 
+
+make prefix=/usr/local all
+
+sudo make install
+
+
+git config --global user.name "firstname lastname" 
+
+git config --global user.email "email here"
+
+git config --global color.ui "auto" 
+
+
+curl http://www.kernel.org/pub/software/scm/git/git-manpages-1.7.3.1.tar.gz | sudo tar -xzC /usr/local/share/man/
+
+
+## installing ikiwiki:
+I had terrible trouble installing ikiwiki. It turned out I had accidentally installed Perl through ports. Uninstalling that made everything install nicely.
+I got an error on msgfmt. Turns out this is a program in gettext. I installed that and it fixed the error.
+
+cd ..
+
+git clone git://git.ikiwiki.info/
+
+cd git.ikiwiki.info/
+
+perl Makefile.PL  LIB=/Library/Perl/5.10.0
+
+make
+
+sudo make install
+
+when you make ikiwiki it gives you a .git folder with the ikiwiki files. Stay out of this folder. You want to learn how to create a clone and make all your changes in the clone. When you push the changes ikiwiki will update. I moved a file in this folder by accident because I named my working file the same and I couldn't get into the setup page. I had apparently messed up my ikiwiki git repository. I did a pull into my clone, deleted the repository and webserver/ cgi folders and ran a new setup. Then I did a git clone and dragged all my old files into the new clone. Did the git dance and did git push. Then the angels sang.
+
+
+## using git from inside a git folder:
+
+start with git clone, then learn to do the git dance like this.
+
+git pull
+
+make your changes to your clone
+
+git commit -a -m "message here"
+
+git push
+
+
+When you can't get into the setup page or you get strange behavior after a setup update the Utilities > Console app is your friend.
+
+## installing gitweb
+
+cd ../git-1.7.3.1/gitweb
+
+make GITWEB_PROJECTROOT="/opt/ikiwiki/" GITWEB_CSS="/gitweb.css" GITWEB_LOGO="/git-logo.png" GITWEB_FAVICON="/git-favicon.png" 
+
+cp gitweb.cgi /Library/WebServer/CGI-Executables/
+
+cp /usr/local/share/gitweb/static/git-favicon.png /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/git-logo.png /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/gitweb.css /Library/WebServer/Documents/
+
+cp /usr/local/share/gitweb/static/gitweb.js /Library/WebServer/Documents/
+
+
+sudo chmod 2755 /Library/WebServer/CGI-Executables/gitweb.cgi
+
+sudo chmod 2755 /Library/WebServer/Documents/git-favicon.png
+
+sudo chmod 2755 /Library/WebServer/Documents/git-logo.png
+
+sudo chmod 2755 /Library/WebServer/Documents/gitweb.css
+
+sudo chmod 2755 /Library/WebServer/Documents/gitweb.js
+
+
+## installing xapian:
+
+download xapian and omega
+
+I needed pcre: sudo ports install pcre
+
+./configure
+
+make
+
+sudo make install
+
+
+## installing omega:
+
+I had a build error do to libiconv undefined symbols. sudo port deactivate libiconv took care of it. After install I had trouble with ikiwiki so I did a sudo port install libiconv and ikiwiki came back.
+
+./configure
+
+make
+
+sudo make install
+
+
+## installing Search::Xapian from CPAN
+
+for some reason this wouldn't install using CPAN console so I went to CPAN online and downloaded the source.
+
+perl Makefile.PL
+
+make
+
+make test
+
+sudo make install
+
+it installed without issue so I'm baffled why it didn't install from command line.
+
+ 
+ ## setup file
+    _!/usr/bin/perl
+    _ Ikiwiki setup automator.
+    
+    _ This setup file causes ikiwiki to create a wiki, check it into revision
+    _ control, generate a setup file for the new wiki, and set everything up.
+    
+    _ Just run: ikiwiki -setup /etc/ikiwiki/auto.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="your wiki";
+    our $wikiname_short="yourwiki";
+    our $rcs="git";
+    our $admin="your name";
+    use Net::Domain q{hostfqdn};
+    our $domain="your.domain";                    
+    
+    IkiWiki::Setup::Automator->import(
+    wikiname => $wikiname,
+    adminuser => [$admin],
+    rcs => $rcs,
+    srcdir => "/opt/ikiwiki/$wikiname_short",
+    destdir => "/Library/WebServer/Documents/$wikiname_short",
+    repository => "/opt/ikiwiki/$wikiname_short.".($rcs eq "monotone" ? "mtn" : $rcs),
+    dumpsetup => "/opt/ikiwiki/$wikiname_short.setup",
+    url => "http://$domain/$wikiname_short",
+    cgiurl => "http://$domain/cgi-bin/$wikiname_short/ikiwiki.cgi",
+    cgi_wrapper => "/Library/WebServer/CGI-Executables/$wikiname_short/ikiwiki.cgi",
+    adminemail => "your\@email.com",
+    add_plugins => [qw{goodstuff websetup}],
+    disable_plugins => [qw{}],
+    libdir => "/opt/ikiwiki/.ikiwiki",
+    rss => 1,
+    atom => 1,
+    syslog => 1,
+    )
+ 
+
+## turning on search plugin:
+
+I turned on the plugin from the setup page in ikiwiki but it gave an error when I went to search. Error "Error: /usr/lib/cgi-bin/omega/omega failed: No such file or directory".
+I did a  "find / -name "omega" -print" and found the omega program in "/usr/local/lib/xapian-omega/bin/omega".
+
+Then I went into the 2wiki.setup file and replaced the bad path, updated and badda-boom badda-bing.
+
+
+
diff --git a/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn
new file mode 100644
index 000000000..ae3969879
--- /dev/null
+++ b/doc/tips/ikiwiki_on_Mac_OS_X_Snow_Leopard/discussion.mdwn
@@ -0,0 +1 @@
+If you want do a bunch of manual labor, this is good, but most people probably want to get ikiwiki via a package system. My Mac laptop's ikiwiki is installed from pkgsrc.  --[[schmonz]]
diff --git a/doc/users/anarcat.wiki b/doc/users/anarcat.wiki
new file mode 100644
index 000000000..7ef474ed6
--- /dev/null
+++ b/doc/users/anarcat.wiki
@@ -0,0 +1 @@
+Hello! I'm anarcat. See [[https://wiki.koumbit.net/TheAnarcat]] to know more about me.