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

4 files changed, 47 insertions, 1 deletions

diff --git a/doc/bugs/Site_title_not_clickable_while_adding_a_comment.mdwn b/doc/bugs/Site_title_not_clickable_while_adding_a_comment.mdwn
new file mode 100644
index 000000000..1347be4b0
--- /dev/null
+++ b/doc/bugs/Site_title_not_clickable_while_adding_a_comment.mdwn
@@ -0,0 +1,9 @@
+When I add a comment to a page, its title should be a hyperlink. This would make re-opening it to re-read parts of it, either.
+
+I.e. when adding a comment to this page, the last part should be a hyperlink, as well:
+
+    ikiwiki/ bugs/ creating Site title not clickable while adding a comment
+
+
+
+Richard
diff --git a/doc/bugs/ikiwiki_lacks_a_--quiet.mdwn b/doc/bugs/ikiwiki_lacks_a_--quiet.mdwn
index c9351c860..fc9644843 100644
--- a/doc/bugs/ikiwiki_lacks_a_--quiet.mdwn
+++ b/doc/bugs/ikiwiki_lacks_a_--quiet.mdwn
@@ -3,3 +3,18 @@ report errors would be nice. -- RichiH
 
 > Except for building wrappers, and possibly progress cruft output to
 > stderr by git (gag), ikiwiki is quiet by default. --[[Joey]]
+
+>> Correct, which means it's not quite quiet:
+
+    % ikiwiki --setup foo --rebuild
+    generating wrappers..
+    successfully generated foo
+    successfully generated foo
+    rebuilding wiki..
+    scanning [...]
+    [...]
+    building [...]
+    [...]
+    done
+
+Yes, I can simply redirect the output, but an option would be cleaner, imo. -- Richard
diff --git a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
index da8f494ff..df27fa481 100644
--- a/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
+++ b/doc/bugs/yaml_setup_file_does_not_support_UTF-8_if_XS_is_installed.mdwn
@@ -38,3 +38,25 @@ preferred one?
 >> Syck earlier.) So it appears the new YAML::Xs is the
 >> way to go longterm, and presumably YAML::Any will start depending on it
 >> in due course? --[[Joey]]
+
+>>> Right. Since this bug is fixed in current testing/sid, only
+>>> Squeeze needs to be taken care of. As far as Debian Squeeze is
+>>> concerned, I see two ways out of the current buggy situation:
+>>>
+>>> 1. Add `Conflicts: libyaml-libyaml-perl (< 0.34-1~)` to the
+>>>    ikiwiki packages uploaded to stable and squeeze-backports.
+>>>    Additionally uploading the newer, fixed `libyaml-libyaml-perl`
+>>>    to squeeze-backports would make the resulting situation a bit
+>>>    easier to deal with from the Debian stable user point of view.
+>>> 2. Patch the ikiwiki packages uploaded to stable and
+>>>    squeeze-backports:
+>>>    - either to workaround the bug by explicitly using YAML::Syck
+>>>      (yeah, it's deprecated, but it's Debian stable)
+>>>    - or to make the bug easier to workaround by the user, e.g. by
+>>>      warning her of possible problems in case YAML::Any has chosen
+>>>      YAML::XS as its preferred implementation (the
+>>>      `YAML::Any->implementation` module method can come in handy
+>>>      in this case).
+>>>
+>>> I tend to prefer the first aforementioned solution, but any of
+>>> these will anyway be kinda ugly, so...
diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index d0e0e7be7..8d904f5a3 100644
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -26,7 +26,7 @@ entries, while ignoring other pages that use those tags, you could use:
 
 Or to display a cloud of tags related to Linux, you could use:
 
-	\[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
+	\[[!pagestats pages="tags/* and !tags/linux" among="tagged(linux)"]]
 
 The optional `show` parameter limits display to the specified number of
 pages. For instance, to show a table of the top ten pages with the most