Merge branch 'master' into self-hosted

Author: philwareham

tags/article.md

@@ -35,14 +35,14 @@ This is equivalent to putting the contained statements into a form named `my_for
 
 The tag is context-sensitive, which means it will grab articles from the currently viewed section/category/author, etc.
 
-When used on the front page, article's context will include articles from all sections set to display via 'Section appears on front page?' settings (see the [Sections panel](/administration/sections-panel) for more information).
+When used on the front page, article's context will include articles from all sections set to display via 'Section appears on front page?' settings (see the Sections panel for more information).
 
 Note: `<txp:article />` is **not** the same as `<txp:article_custom />` - you can [check out the differences of that tag](/tags/article_custom) if you're unsure of the differences!
 {: .alert-block .information}
 
 ## Attributes
 
-Tag will accept content/behaviour and presentation attributes (**case-sensitive**):
+Tag will accept content/behaviour and presentation attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `allowoverride="boolean"`
 : Whether to use override forms for the generated article list.
@@ -67,7 +67,7 @@ Tag will accept content/behaviour and presentation attributes (**case-sensitive*
 : **Default:** `default`.
 
 `frontpage="boolean"`
-: Include only those articles with 'Section appears on front page?' set on the [Sections panel](/administration/sections-panel). If set to `0`, all articles are displayed.
+: Include only those articles with 'Section appears on front page?' set on the Sections panel. If set to `0`, all articles are displayed.
 : **Values:** `0` (no) or `1` (yes).
 : **Default:** `1`.
 
@@ -96,7 +96,7 @@ Tag will accept content/behaviour and presentation attributes (**case-sensitive*
 : **Default:** `0`.
 
 `searchall="boolean"`
-: When outputting search results, include only those articles with 'Include in site search' set on the [Sections panel](/administration/sections-panel). If set to `0`, only articles in the current section are displayed. See @@Fixing search results@@ for more.
+: When outputting search results, include only those articles with 'Include in site search' set on the Sections panel. If set to `0`, only articles in the current section are displayed. See @@Fixing search results@@ for more.
 : **Values:** `0` (no) or `1` (yes).
 : **Default:** `1`.
 
@@ -181,7 +181,7 @@ Here is the **article** tag responsible for the main content of the home page on
 <txp:article limit="5" />
 ~~~
 
-Calls the `default` article form, which may contain any variation of article output you want to create. The `default` form cannot be deleted; it is the form you see on first viewing the [Forms panel](/administration/forms-panel).
+Calls the `default` article form, which may contain any variation of article output you want to create. The `default` form cannot be deleted; it is the form you see on first viewing the Forms panel.
 
 Uses the `limit` attribute to specify the maximum number of articles displayed in article list context (if not specified, this defaults to `10`).
 

tags/article_custom.md

@@ -51,7 +51,7 @@ However, you can have the added features and functionality of `<txp:article_cust
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `allowoverride="boolean"`
 : Whether to use override forms for the generated article list.
@@ -73,7 +73,7 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Default:** unset.
 
 `category="category name"`
-: Restrict to articles from specified category/categories. Note: the category names may be different to the title you typed when you created the category, as the names are sanitized for URL use. Check the [Categories panel](/administration/categories-panel) to ensure you are using the correct names.
+: Restrict to articles from specified category/categories. Note: the category names may be different to the title you typed when you created the category, as the names are sanitized for URL use. Check the Categories panel to ensure you are using the correct names.
 : **Values:** (comma separated list of) category name(s).
 : **Default:** unset, retrieves from all categories.
 
@@ -101,7 +101,7 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Default:** `default`.
 
 `frontpage="boolean"`
-: Include only those articles with 'Section appears on front page?' set on the [Sections panel](/administration/sections-panel). If set to `1`, only such articles are displayed, otherwise they are all displayed.
+: Include only those articles with 'Section appears on front page?' set on the Sections panel. If set to `1`, only such articles are displayed, otherwise they are all displayed.
 : **Values:** `0` (no) or `1` (yes).
 : **Default:** `0`.
 

tags/article_id.md

@@ -25,7 +25,7 @@ The `article_id` tag is a *single* tag which returns the numeric ID of the artic
 
 ## Attributes
 
-This tag has no attributes.
+This tag has no attributes of its own. It accepts only the {% include atts-global-link.html %}.
 
 ## Examples
 

tags/article_image.md

@@ -24,11 +24,11 @@ tags:
 
 The **article_image** tag is a *single* tag. Textpattern will replace this tag with the `<img src="…">` HTML tag matching the numeric ID or URL assigned when the article is posted.
 
-The image to be associated with the tag is set in the [Write panel](/administration/write-panel). In the 'Article image' field enter either the URL of the image, or the Textpattern ID (a number set by Textpattern at upload) - most of the time you will use the image ID here. Note that although the 'Article image' field can accept a comma separated list of image IDs, you can only assign a single image to each article using this tag (the [images](/tags/images) tag allows greater flexibility for multiple article images).
+The image to be associated with the tag is set in the Write panel. In the 'Article image' field enter either the URL of the image, or the Textpattern ID (a number set by Textpattern at upload) - most of the time you will use the image ID here. Note that although the 'Article image' field can accept a comma separated list of image IDs, you can only assign a single image to each article using this tag (the [images](/tags/images) tag allows greater flexibility for multiple article images).
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `escape="html"` <span class="footnote warning">v4.0.4+</span>
 : Escape [HTML entities](https://developer.mozilla.org/en-US/docs/Glossary/Entity) such as `<`, `>` and `&` for the image's `alt` and `title` attributes.

tags/article_url_title.md

@@ -25,7 +25,7 @@ The **article_url_title** tag is a *single* tag which returns the dumbed-down 'U
 
 ## Attributes
 
-This tag has no attributes.
+This tag has no attributes of its own. It accepts only the {% include atts-global-link.html %}.
 
 ## Examples
 

tags/author.md

@@ -25,7 +25,7 @@ The **author** tag is a *single* tag that is used to return the name of the auth
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `escape="html"` <span class="footnote warning">v4.6.0+</span>
 : Escape [HTML entities](https://developer.mozilla.org/en-US/docs/Glossary/Entity) such as `<`, `>` and `&`.

tags/author_email.md

@@ -25,7 +25,7 @@ The **author_email** tag is a *single* tag that is used to return the email addr
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `escape="html"`
 : Escape [HTML entities](https://developer.mozilla.org/en-US/docs/Glossary/Entity) such as `<`, `>` and `&`.

tags/authors.md

@@ -22,7 +22,7 @@ tags:
 <txp:authors>
 ~~~
 
-The **authors** tag is a *single* or *container* tag that Textpattern will use to gather a list of authors designated within the Textpattern [Users panel](/administration/users-panel).
+The **authors** tag is a *single* or *container* tag that Textpattern will use to gather a list of authors designated within the Textpattern Users panel.
 
 If used as a *container* tag, it must be specified as an opening and closing pair of tags, like this:
 
@@ -34,7 +34,7 @@ If used as a *container* tag, it must be specified as an opening and closing pai
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `form="form name"`
 : Use specified form template to process each author.

tags/body.md

@@ -25,7 +25,7 @@ The **body** tag is a *single* tag which is used to return the text, or content,
 
 ## Attributes
 
-This tag has no attributes.
+This tag has no attributes of its own. It accepts only the {% include atts-global-link.html %}.
 
 ## Examples
 

tags/breadcrumb.md

@@ -27,7 +27,7 @@ The main part of the breadcrumb (as obtained with `label="" section=""` attribut
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `category="category name"` <span class="footnote warning">v4.7.0+</span>
 : Category to be used as the breadcrumb base.