Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

2 files changed, 13 insertions, 1 deletions

diff --git a/doc/plugins/recentchanges/discussion.mdwn b/doc/plugins/recentchanges/discussion.mdwn
new file mode 100644
index 000000000..69145435e
--- /dev/null
+++ b/doc/plugins/recentchanges/discussion.mdwn
@@ -0,0 +1,12 @@
+Thanks for that one, again, it's great!
+
+One minor thing I noticed, seen on <http://www.bddebian.com/~wiki/recent_changes/>:
+The links to user pages of e.g. *MichaelBanck* or *GianlucaGuida* don't work, as they're
+being linked to <http://www.bddebian.com/~wiki/user/MichaelBanck>, whereas it should be
+<http://www.bddebian.com/~wiki/user/michaelbanck>.
+
+Another one.  If you change the *recentchangespage* configuration option, (it seems to me)
+that the pages from the old hierarchy will not be removed from the disk.  But then, changing
+this should be a rather uncommon thing.
+
+--[[tschwinge]]
diff --git a/doc/rcs/git.mdwn b/doc/rcs/git.mdwn
index 38a418a5b..f97131742 100644
--- a/doc/rcs/git.mdwn
+++ b/doc/rcs/git.mdwn
@@ -22,7 +22,7 @@ but it works the best for typical ikiwiki use.
 and git.
 
 It is **paramount** that you **never** push to the non-bare repository
-([this FAQ entry explains why](http://git.or.cz/gitwiki/GitFaq#head-b6a3d85f677763313159eb39f7dbf4579d4ee28b)).
+([this FAQ entry explains why](http://git.or.cz/gitwiki/GitFaq#head-b96f48bc9c925074be9f95c0fce69bcece5f6e73)).
 Instead, if you want to work on the wiki from a remote machine, clone
 the bare repository, using either the `git` transport (if available), or
 `ssh`.