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

diff --git a/doc/bugs/Another_UTF-8_problem.mdwn b/doc/bugs/Another_UTF-8_problem.mdwn
new file mode 100644 (file)
index 0000000..8887785
--- /dev/null
+++ b/doc/bugs/Another_UTF-8_problem.mdwn
@@ -0,0 +1,3 @@
+Web-edit the [[Sandbox]], select *Preview* and watch all UTF-8 character
+getting garbled (would also get committed like this).  Or is it a problem
+with my pretty standard Ubuntu gutsy Firefox installation?  --[[tschwinge]]

diff --git a/doc/plugins/passwordauth/discussion.mdwn b/doc/plugins/passwordauth/discussion.mdwn
index 4636e918c36756b482a77d22f3c58e77160c0bc0..f1896bc16cc167f9b9f9998dd93c9747db2253fe 100644 (file)
--- a/doc/plugins/passwordauth/discussion.mdwn
+++ b/doc/plugins/passwordauth/discussion.mdwn
@@ -1 +1,7 @@
 moved to [[bugs/password_deletion]] --[[Joey]]
+
+---
+
+It's a bit inconvenient that one also has to type in the
+*Login - Confirm Password* if one only wants to change
+the *Preferences -- Subscriptions*.  --[[tschwinge]]