Revert spam commits.

12 files changed, 11 insertions, 10 deletions

diff --git a/doc/bugs/discussion.mdwn b/doc/bugs/discussion.mdwn
index 5a0da04d4..474e07564 100644
--- a/doc/bugs/discussion.mdwn
+++ b/doc/bugs/discussion.mdwn
@@ -15,4 +15,4 @@ the ikiwiki.cgi CGI wrapper. ..."
   to the user who owns the `source` and `destination` directories.
 
 > (emphasis mine). Anyway, if you have ideas to improve the man page, it's
-> over in [[Pagina]] --[[Joey]]
+> over in [[usage]] --[[Joey]]
diff --git a/doc/bugs/htmlscrubber_undoes_email_obfuscation_by_Text::Markdown.mdwn b/doc/bugs/htmlscrubber_undoes_email_obfuscation_by_Text::Markdown.mdwn
index 89df6789a..99cc1964c 100644
--- a/doc/bugs/htmlscrubber_undoes_email_obfuscation_by_Text::Markdown.mdwn
+++ b/doc/bugs/htmlscrubber_undoes_email_obfuscation_by_Text::Markdown.mdwn
@@ -1,4 +1,4 @@
-From the source of [[Pagina]]:
+From the source of [[usage]]:
 
     <a href="mailto:joey@ikiwiki.info">&#x6A;&#111;&#101;&#x79;&#64;i&#107;&#105;w&#105;&#107;&#x69;&#46;&#105;n&#x66;&#x6F;</a>
 
diff --git a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
index 1b9f0a039..b8e28e0a3 100644
--- a/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
+++ b/doc/forum/multi-user_setup_of_ikiwiki__44___gitosis_and_apache2_in_Debian_Sid.mdwn
@@ -36,7 +36,7 @@ I could not come up with a working set of users which are put into different gro
 
 > You can set the umask for ikiwiki itself, without changing the system umask, via the usmask setting in the setup file. --[[Joey]]
 
-In the end, I did the following. I created a directory /srv/ikiwiki/ which is owned by gitosis. The [[setup_file|/Pagina]] is also located there (/srv/ikiwiki/project.setup). I put the srcdir there too (srcdir => '/srv/ikiwiki/project/'). So now sudo -u gitosis ikiwiki --project.setup is able to create the post-update hook (git_wrapper => '/srv/gitosis/repositories/project.git/hooks/post-update'). Since this hook is called every time something is checked in over SSH, it is run by gitosis, so I did not set it suid. Or do I have to, because ikiwiki.cgi will be run as www-data?
+In the end, I did the following. I created a directory /srv/ikiwiki/ which is owned by gitosis. The [[setup_file|/usage]] is also located there (/srv/ikiwiki/project.setup). I put the srcdir there too (srcdir => '/srv/ikiwiki/project/'). So now sudo -u gitosis ikiwiki --project.setup is able to create the post-update hook (git_wrapper => '/srv/gitosis/repositories/project.git/hooks/post-update'). Since this hook is called every time something is checked in over SSH, it is run by gitosis, so I did not set it suid. Or do I have to, because ikiwiki.cgi will be run as www-data?
 
 > Generally, ikiwiki.cgi is run as the user who owns the wiki and repository, in this case, gitosis. The ikwiiki.cgi needs to be able to write to source files in the wiki; it needs to be able to commit changes,
 > and it needs to be able to generate and write the html files. If you don't want ikiwiki.cgi to run as gitosis, you will need to put gitosis and www-data in a group and give them both write access, with appropriate umask, etc. --[[Joey]]
diff --git a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
index 753e18ed2..a8d04a0ad 100644
--- a/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
+++ b/doc/forum/transition_from_handwritten_html_to_ikiwiki.mdwn
@@ -14,7 +14,7 @@ Thanks,
 > dest/foo.html, src/bar.mdwn becomes dest/bar.html, etc.
 > 
 > It sounds like you want `--no-usedirs`, or the corresponding `usedirs => 0,`
-> option in your setup file. See [[Pagina]] for more information. -- [[Jon]]
+> option in your setup file. See [[usage]] for more information. -- [[Jon]]
 
 Thanks, usedirs seems to be just the thing I need.
 
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 5f177ae7b..e33ed8f2b 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -194,6 +194,7 @@ Personal sites and blogs
 * [Salient Dream](http://www.salientdream.com/) - All Things Strange. 
 * [Anton Berezin's blog](http://blog.tobez.org/)
 * [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany.
+* [Frohdo](https://frohdo.de) - With raw food against back pain and other diseases
 * [[OscarMorante]]'s [personal site](http://oscar.morante.eu).
 * [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.  
 * [[LucaCapello]]'s [homepage](http://luca.pca.it)
diff --git a/doc/index.mdwn b/doc/index.mdwn
index 67745799b..e0e401656 100644
--- a/doc/index.mdwn
+++ b/doc/index.mdwn
@@ -15,7 +15,7 @@ site generator with some dynamic features.
 ## using ikiwiki
 
 [[Setup]] has a tutorial for setting up ikiwiki, or you can read the
-[[man_page|Pagina]]. There are some [[examples]] of things you can do
+[[man_page|usage]]. There are some [[examples]] of things you can do
 with ikiwiki, and some [[tips]].  Basic documentation for ikiwiki plugins
 and syntax is provided [[here|ikiwiki]]. The [[forum]] is open for
 discussions.
diff --git a/doc/plugins.mdwn b/doc/plugins.mdwn
index ff24e1bca..0bea33592 100644
--- a/doc/plugins.mdwn
+++ b/doc/plugins.mdwn
@@ -7,7 +7,7 @@ There's documentation if you want to [[write]] your own plugins, or you can
 [[install]] plugins [[contributed|contrib]] by others.
 
 To enable a plugin, use the `--plugin` switch described in
-[[Pagina]], or the equivalent `add_plugins` line in ikiwiki.setup.
+[[usage]], or the equivalent `add_plugins` line in ikiwiki.setup.
 Enable the [[goodstuff]] plugin to get a nice selection of plugins that
 will fit most uses of ikiwiki.
 
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 1839d0829..fa7a037ba 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -51,7 +51,7 @@ One setup that will work is to put all committers in a group (say,
 "ikiwiki"), and use permissions to allow that group to commit to the bare git
 repository. Make both the post-update hook and ikiwiki.cgi be setgid
 to the group, as well as suid to the user who admins the wiki. The
-`wrappergroup` [[setup_file_option|Pagina]] can be used to make the wrappers
+`wrappergroup` [[setup_file_option|usage]] can be used to make the wrappers
 be setgid to the right group. Then the srcdir, including its git
 repository, should only be writable by the wiki's admin, and *not* by the
 group. Take care that ikiwiki uses a umask that does not cause files in
diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 0d532f337..9fc37c0b1 100644
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -113,7 +113,7 @@ Alternatively, you can ask ikiwiki to change settings in the file for you:
 
 	% ikiwiki --changesetup foo.setup --plugin goodstuff
 
-See [[Pagina]] for more options.
+See [[usage]] for more options.
 
 ## Customizing file locations
 
diff --git a/doc/setup/byhand.mdwn b/doc/setup/byhand.mdwn
index 2b0defe64..6d0f37cd9 100644
--- a/doc/setup/byhand.mdwn
+++ b/doc/setup/byhand.mdwn
@@ -64,7 +64,7 @@ can copy in files from the [[examples]]. The examples are located in
 
 You can experiment with other ikiwiki parameters such as `--wikiname`
 and `--rebuild` too. Get comfortable with its command line (see
-[[Pagina]]).
+[[usage]]).
 
 ## Add a setup file.
 
@@ -83,7 +83,7 @@ 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 [[Pagina]]). `srcdir` and
+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.
diff --git a/doc/Pagina.html b/doc/usage.mdwn
index 4bfe2312c..4bfe2312c 100644
--- a/doc/Pagina.html
+++ b/doc/usage.mdwn
diff --git a/doc/Pagina/discussion.mdwn b/doc/usage/discussion.mdwn
index 189d74eb0..189d74eb0 100644
--- a/doc/Pagina/discussion.mdwn
+++ b/doc/usage/discussion.mdwn