Merge branch 'master' into self-hosted

Author: philwareham

_includes/atts-global.html

@@ -4,10 +4,12 @@ <h3 id="common-global-attributes">Common global attributes</h3>
 <p>These attributes are shared by all tags - and plugins, provided they do not override the functionality.</p>
 {% endif %}
 <dl>
-    <dt><code>break="value"</code></dt>
-    <dd>Where value is an HTML element, specified without brackets (e.g. <code>break="li"</code>) or some string to separate list items.</dd>
-    <dd><strong>Default:</strong> {% if include.break == null %}br{% else %}{{ include.break }}{% endif %} (see <a href="/tags/tag-attributes-cross-reference#break">break cross-reference</a>).</dd>
-    
+    {% unless include.break == "" %}
+        <dt><code>break="value"</code></dt>
+        <dd>Where value is an HTML element, specified without brackets (e.g. <code>break="li"</code>) or some string to separate list items.</dd>
+        <dd><strong>Default:</strong> {% if include.break == null %}br{% else %}{{ include.break }}{% endif %} (see <a href="/tags/tag-attributes-cross-reference#break">break cross-reference</a>).</dd>
+    {% endunless %}
+
     <dt><code>class="class name"</code></dt>
     <dd>HTML <code>class</code> to apply to the wrapper.</dd>
     <dd><strong>Values:</strong> Any valid string.</dd>

_includes/header.html

@@ -5,7 +5,7 @@
 <meta itemprop="accessibilityHazard" content="noSoundHazard">
 <meta itemprop="accessibilityAPI" content="ARIA">
 <a class="a--skip-link" href="#main">Go to main content</a>
-<div class="wrapper">
+<div id="dynamic-header">
     <header class="site-header" itemscope itemtype="https://schema.org/Organization">
         <h1 class="masthead" itemprop="name"><a rel="home" itemprop="url" href="https://textpattern.com/" title="Go to the Textpattern homepage">Textpattern CMS</a></h1>
         <meta itemprop="logo" content="https://textpattern.com/assets/img/branding/textpattern/textpattern.png">
@@ -34,4 +34,6 @@ <h1 class="masthead" itemprop="name"><a rel="home" itemprop="url" href="https://
             </ul>
         </nav>
     </div>
+</div>
+<div class="wrapper">
     <main id="main" aria-label="Main content">

tags/category1.md

@@ -3,7 +3,7 @@ layout: document
 category: Tags
 published: true
 title: Category1
-description: The category1 tag will display information of the category as defined by 'Category 1' of the article being displayed.
+description: The category1 tag will display the category as defined by 'Category 1' in the article being displayed.
 tags:
   - Article tags
   - Navigation tags
@@ -22,7 +22,7 @@ tags:
 <txp:category1 />
 ~~~
 
-The **category1** tag can be used as either a *single* tag or *container* tag. It will display information of the category as defined by **Category 1** of the article being displayed. When used as a containing tag, it will turn the contents into a link to that category. Otherwise, it will return plain text.
+The **category1** tag can be used as either a *single* tag or *container* tag. It will display the category as defined by **Category 1** in the article being displayed. When used as a container tag, it will turn the contents into a link to that category. Otherwise, it will return plain text.
 
 This tag may be used within either an article form, or in a page, wrapped in an [if_individual_article](/tags/if_individual_article) conditional tag.
 
@@ -50,17 +50,9 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Values:** `0` (no, allow from any section) or `1` (yes).
 : **Default:** `0`.
 
-### Common presentational attributes
+{% include atts-common.html breakby="" %}
 
-These attributes, which affect presentation, are shared by many tags. Note that default values can vary among tags.
-
-`class="class name"` <span class="footnote warning">v4.0.4+</span>
-: HTML `class attribute` to be applied to `wraptag`.
-: **Default:** unset (see [class cross-reference](/tags/tag-attributes-cross-reference#class)).
-
-`wraptag="tag"` <span class="footnote warning">v4.0.4+</span>
-: HTML tag to wrap around output, specified without brackets (e.g. `wraptag="p"`).
-: **Default:** unset (but see [wraptag cross-reference](/tags/tag-attributes-cross-reference#wraptag) for exceptions).
+{% include atts-global.html %}
 
 ## Examples
 
@@ -76,28 +68,36 @@ These attributes, which affect presentation, are shared by many tags. Note that
 
 ~~~ html
 <p>
-    <txp:category1 link="1" title="1" />
+    <txp:category1 link title />
 </p>
 ~~~
 
-If **category1** is 'General stuff', this tag will display the words 'General stuff' as a hyperlink to a list of articles in the same category.
+If **category1** is defined with a title 'Dogs', this tag will display the words 'Dogs' as a hyperlink to a list of articles in the same category.
+
+### Example 3: Category link using custom container content
+
+~~~ html
+<txp:category1 wraptag="p">Other articles in category:
+<txp:category1 title /></txp:category1>
+~~~
 
-### Example 3: Container example
+Might display this HTML:
 
 ~~~ html
 <p>
-    <txp:category1>Other articles in category:
-    <txp:category1 title="1" /></txp:category1>
-</p>
+    <a rel="tag" href="https://example.com/category/dogs/">
+        Other articles in category: Dogs
+    </a>
+<p>
 ~~~
 
 ### Example 4: Category 1 and 2
 
 ~~~ html
 <p>
-    Filed in: <txp:category1 link="1" title="1" />
+    Filed in: <txp:category1 link title />
     <txp:if_article_category number="2">
-        and <txp:category2 link="1" title="1" />
+        and <txp:category2 link title />
     </txp:if_article_category>
 </p>
 ~~~

tags/site_name.md

@@ -21,11 +21,13 @@ tags:
 <txp:site_name />
 ~~~
 
-The **site_name** tag is a *single* tag that returns the site's name as defined within the [Preferences panel](/administration/preferences-panel).
+The **site_name** tag is a *single* tag that returns the site's name as defined within the Preferences panel.
 
 ## Attributes
 
-This tag has no attributes
+This tag has no attributes of its own.
+
+{% include atts-global.html break="" %}
 
 ## Examples
 
@@ -36,3 +38,22 @@ This tag has no attributes
     <txp:site_name />
 </h1>
 ~~~
+
+### Example 2: Using global attributes to wrap and label the tag
+
+~~~ html
+<txp:site_name labeltag="h2" label="Welcome" wraptag="h3" class="heading" />
+~~~
+
+Would render this HTML:
+
+~~~ html
+<h2>Welcome</h2>
+<h3 class="heading">My site</h3>
+~~~
+
+## Genealogy
+
+### Version 4.0.6
+
+Tag renamed from `<txp:sitename />` to `<txp:site_name />`.

tags/site_slogan.md

@@ -21,13 +21,15 @@ tags:
 <txp:site_slogan />
 ~~~
 
-The **site_slogan** is a *single* tag which is used to output the site's tagline (labeled as 'Site slogan' in the [Preferences panel](/administration/preferences-panel)).
+The **site_slogan** is a *single* tag which is used to output the site's tagline (labeled as 'Site slogan' in the Preferences panel).
 
-The slogan is a brief (255 characters maximum) tagline or description of your site which can be used, for example, in XML feeds.
+The slogan is a brief (255 characters maximum) tagline or description of your site which can be used, for example, in XML feeds or site browser headers.
 
 ## Attributes
 
-This tag has no attributes.
+This tag has no attributes of its own.
+
+{% include atts-global.html break="" %}
 
 ## Examples
 

tags/site_url.md

@@ -21,7 +21,9 @@ tags:
 <txp:site_url />
 ~~~
 
-The **site_url** tag is a *single* tag which returns the full URL of the site (as defined in the [Preferences panel](/administration/preferences-panel)) as text. If you maintain local development versions of your live sites and import databases between them, then this tag is extremely valuable for ensuring your domain links are never confused (and thus broken) between the two locations (see example 1, below).
+The **site_url** tag is a *single* tag which returns the full URL of the site (as defined in the Preferences panel) as text. If you maintain local development versions of your live sites and import databases between them, then this tag is extremely valuable for ensuring your domain links are never confused (and thus broken) between the two locations (see example 1, below).
+
+For more general purpose access to URLs and their components, please see the [page_url](/tags/page_url) tag, which includes admin (back-end) site links for both regular and multi-site installations, theme links and paths, and URL parameters.
 
 ## Attributes
 
@@ -31,6 +33,8 @@ Tag will accept the following attribute (**case-sensitive**):
 : Specify this if you wish to return the URL to the admin-side instead of the public site.
 : **Default:** unset.
 
+{% include atts-global.html break="" %}
+
 ## Examples
 
 ### Example 1: Maintain accurate domain paths