Merge branch 'master' into self-hosted

Author: philwareham

tags/category_list.md

@@ -43,7 +43,7 @@ Tag will accept the following attributes (**case-sensitive**) as well as the {%
 : **Default:** `1`.
 
 `exclude="category name(s)"` <span class="footnote warning">v4.0.4+</span>
-: List of category names which will be excluded from the list. `categories` takes precedence over `exclude`.
+: List of category names which will be excluded from the list.
 : **Default:** unset.
 
 `form="form name"` <span class="footnote warning">v4.0.7+</span>

tags/if_individual_article.md

@@ -58,7 +58,7 @@ This tag has no attributes of its own. It accepts only the {% include atts-globa
 
 <txp:if_article_list>
     <p>
-        <txp:olde>
+        <txp:older>
             Previous
         </txp:older>
         <txp:newer>