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

2 files changed, 17 insertions, 1 deletions

diff --git a/doc/ikiwiki/directive/comment.mdwn b/doc/ikiwiki/directive/comment.mdwn
index 21386dfc3..693a92770 100644
--- a/doc/ikiwiki/directive/comment.mdwn
+++ b/doc/ikiwiki/directive/comment.mdwn
@@ -32,7 +32,7 @@ metadata of the comment.
 * `ip` - Can be used to record the IP address of a commenter,
   if they posted anonymously.
 * `claimedauthor` - Records the name that the user entered,
-  if anonmous commenters are allowed to enter their (unverified)
+  if anonymous commenters are allowed to enter their (unverified)
   name.
 
 [[!meta robots="noindex, follow"]]
diff --git a/doc/ikiwiki/directive/inline/discussion.mdwn b/doc/ikiwiki/directive/inline/discussion.mdwn
index be0665d04..e5cfeb91c 100644
--- a/doc/ikiwiki/directive/inline/discussion.mdwn
+++ b/doc/ikiwiki/directive/inline/discussion.mdwn
@@ -124,3 +124,19 @@ My index page has:
 Else can you please suggest a smarter way of getting certain data out from pages for a inline index?
 
 --[[hendry]]
+
+---
+
+## Interaction of `show` and `feedshow`
+
+Reading the documentation I would think that `feedshow` does not
+influence `show`.
+
+	 [[!inline pages="./blog/*" archive=yes quick=yes feedshow=10 sort=title reverse=yes]]
+
+Only ten pages are listed in this example although `archive` is set to
+yes. Removing `feedshow=10` all matching pages are shown.
+
+Is that behaviour intended?
+
+--[[PaulePanter]]