Merge branch 'master' into self-hosted

Author: philwareham

_includes/atts-common.html

@@ -0,0 +1 @@
+<a href="https://docs.textpattern.com/tags/learning/#global-attributes-list">{% if include.text == null %}global attributes{% else %}{% include.text %}{% endif %}</a>

_includes/atts-global-link.html

@@ -167,7 +167,7 @@ These types of strings are uniquely preferences labels (a.k.a. settings) in the
 Widowed words happen when the last word of a title wraps to a new line by itself. You may not like it. Prevent widowed words from happening by selecting ‘Yes’ for the *Prevent widowed words in article titles?* preference in the Publish section of the Preferences panel.
 {:.example}
 
-As in earlier examples, additional strings are used (correctly) and lots of context is involved to make them clear. The string were concerned with here is the preference label posed as a question, distinguished by emphasized text. Without the emphasis, the string would be much harder to see and understand.
+As in earlier examples, additional strings are used (correctly) and lots of context is involved to make them clear. The string we're concerned with here is the preference label posed as a question, distinguished by emphasized text. Without the emphasis, the string would be much harder to see and understand.
 
 ### Option strings
 

brand/user-docs-guide.md

@@ -0,0 +1,75 @@
+---
+layout: document
+category: Construction and Presentation
+published: false
+title: Content types
+description: Core content types, custom content types, and designing site architectures with these kinds of content needs in mind.
+---
+
+# Content Types
+
+Intro...
+
+**Contents**
+
+* Table of contents
+{:toc}
+
+## Articles
+
+## Images
+
+## Files
+
+## Links
+
+## Comments
+
+## Authors
+
+## Categories
+
+## Custom fields
+
+Custom fields enable you to add site-specific content to your articles that extend the scope of the core fields defined above.
+
+### Defining custom fields
+
+On the Preferences panel, click the **Custom fields** item to see input text boxes for defining up to ten fields that will appear on the Write panel when defined.
+
+#### Important notes on creating custom field names
+
+Custom field names may include letters (uppercase or lowercase), numbers, and under scores, but no spaces or other special characters should be used. For example, `custom1`, `Custom1`, `Custom_1`, `Location` and `Project_name` are all valid name constructs, while `custom 1`, `custom !` and `Project name` are not.
+
+Also, there are certain names **reserved** by Textpattern, which should *not* be used to name custom fields. Doing so will likely cause your site to not work as expected.
+
+**Do not use the following for custom field names**:
+
+* annotate
+* article_image
+* authorid
+* body
+* category
+* category1
+* category2
+* comments_count
+* comments_invite
+* excerpt
+* form
+* id
+* keywords
+* limit
+* offset
+* posted
+* section
+* sort
+* status
+* thisid
+* title
+* url_title
+* Or any other [tag attribute](/tags/tag-attributes-cross-reference), just in case!
+
+A symptom of a name clash is when you go to check or display the contents of a custom field in an article and receive unexpected (or no) output. In this case, make sure your custom field names are not any of the reserved names listed above.
+
+To remove a custom field, simply clear its name and save the changes.
+

build/content-types.md

@@ -48,6 +48,10 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Values:** `lazy` (defers loading the image until it reaches a calculated distance from the viewport, as defined by the browser), `eager` (loads the image immediately, regardless of whether or not the image is currently within the visible viewport).
 : **Default:** unset.
 
+`style="style rule"`
+: Inline CSS `style` rule. It's recommended that you assign CSS rules via the `class` attribute instead.
+: **Default:** unset.
+
 `thumbnail="boolean"` <span class="footnote warning">v4.0.4+</span>
 : Use the thumbnail rather than full-size image.
 : **Values:** `0` (no) or `1` (yes).
@@ -57,21 +61,7 @@ Tag will accept the following attributes (**case-sensitive**):
 : Specify an image `width` which overrides the value stored in the database. Use `width="0"` to turn off the output of a width attribute in the `<img>` tag (thus the browser will scale the width if a height is used).
 : **Default:** width of image stored in the database.
 
-### Common presentational attributes
-
-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>
-: CSS `class` attribute to apply to the image (or to the `wraptag`, if set).
-: **Default:** unset (see [class cross-reference](/tags/tag-attributes-cross-reference#class)).
-
-`style="style rule"`
-: Inline CSS `style` rule. It's recommended that you assign CSS rules via `class` attribute instead.
-: **Default:** unset.
-
-`wraptag="tag"` <span class="footnote warning">v4.0.4+</span>
-: HTML tag to be used to wrap the `<img>` tag, 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
 

tags/article_image.md

@@ -28,7 +28,7 @@ This tag may be used within either an article form, or in a page, wrapped in an
 
 ## 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 %}:
 
 `link="boolean"`
 : Whether to link to articles from the same category. Works only in the *single* tag.
@@ -50,10 +50,6 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Values:** `0` (no, allow from any section) or `1` (yes).
 : **Default:** `0`.
 
-{% include atts-common.html breakby="" %}
-
-{% include atts-global.html %}
-
 ## Examples
 
 ### Example 1: Category name in plain text

tags/category1.md

@@ -3,7 +3,7 @@ layout: document
 category: Tags
 published: true
 title: Category2
-description: The category2 tag will display information of the category as defined by 'Category 2' of the article being displayed.
+description: The category2 tag will display the category as defined by 'Category 2' in the article being displayed.
 tags:
   - Article tags
   - Navigation tags
@@ -22,13 +22,13 @@ tags:
 <txp:category2 />
 ~~~
 
-The **category2** tag can be used as either a *single* tag or *container* tag. It will display information of the category as defined by **Category 2** 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 **category2** tag can be used as either a *single* tag or *container* tag. It will display the category as defined by **Category 2** 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.
 
 ## 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 %}:
 
 `link="boolean"`
 : Whether to link to articles from the same category. Works only in the *single* tag.
@@ -50,18 +50,6 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Values:** `0` (no, allow from any section) or `1` (yes).
 : **Default:** `0`.
 
-### Common presentational attributes
-
-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).
-
 ## Examples
 
 ### Example 1: Category name in plain text
@@ -76,28 +64,36 @@ These attributes, which affect presentation, are shared by many tags. Note that
 
 ~~~ html
 <p>
-    <txp:category2 link="1" title="1" />
+    <txp:category2 link title />
 </p>
 ~~~
 
-If **category2** is 'Specific stuff', this tag will display the words 'Specific stuff' as a hyperlink to a list of articles in the same category.
+If **category2** is defined with a title 'Security advice', this tag will display the words 'Security advice' as a hyperlink to a list of articles in the same category.
+
+### Example 3: Category link using custom container content
 
-### Example 3: Container example
+~~~ html
+<txp:category2 wraptag="p">Other articles in category:
+<txp:category2 title /></txp:category2>
+~~~
+
+Might display this HTML:
 
 ~~~ html
 <p>
-    <txp:category2>Other articles in category:
-    <txp:category2 title="1" /></txp:category2>
-</p>
+    <a rel="tag" href="https://example.com/category/security-advice/">
+        Other articles in category: Security advice
+    </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/category2.md

@@ -23,24 +23,13 @@ tags:
 
 The **custom_field** tag is a *single* tag and used to display the contents of a custom field.
 
-Custom fields are useful when you need to output content having a consistent structure, usually in context to a particular type of article. Custom fields are defined in the [Preferences panel](/administration/preferences-panel), and used in the [Write panel](/administration/write-panel). There are conditions to be aware of in each case, so be sure to read the following sections, respectively:
-
-1. [Defining custom fields](/administration/preferences-panel#custom-fields-preferences)
-2. @@Adding custom field data@@
+Custom fields are useful when you need to output content having a consistent structure, usually in context to a particular type of article. Custom fields are defined in the Preferences panel, and used in the Write panel. There are conditions to be aware of in each case, so be sure to read the [Defining custom fields](/build/content-types#defining-custom-fields) information.
 
 Also see the [if_custom_field](/tags/if_custom_field) conditional tag, which provides more flexibility and power using custom fields.
 
 ## Attributes
 
-Tag will accept the following attributes (**case-sensitive**):
-
-`default="value"`
-: Default value to use when field is empty.
-
-`escape="html"`
-: Escape [HTML entities](https://developer.mozilla.org/en-US/docs/Glossary/Entity) such as `<`, `>` and `&` prior to echoing the field contents.
-: **Values:** See the [tag escaping](/tags/learning/#tag-escaping) documentation for all possible values.
-: **Default:** `html`.
+Tag will accept the following attributes (**case-sensitive**) as well as the {% include atts-global-link.html %}:
 
 `name="fieldname"`
 : Display specified custom field.
@@ -74,14 +63,14 @@ HTML returned would be:
 </p>
 ~~~
 
-### Example 2: Power A linklog
+### Example 2: Power a linklog
 
-With an article title of `Textpattern`, an excerpt of `Textpattern is awesome!`, a custom field named `link` containing `https://textpattern.com/`, and an 'article' type form like the following:
+With an article title of `Textpattern`, an excerpt of `Textpattern is awesome!`, a custom field named `Link_url` containing `https://textpattern.com/`, and an 'article' type form like the following:
 
 ~~~ html
 <article class="linklog-entry">
     <h1>
-        <a href="<txp:custom_field name="Link" />"><txp:title /></a>
+        <a href="<txp:custom_field name="Link_url" />"><txp:title /></a>
     </h1>
     <p>
         <time datetime="<txp:posted format="iso8601" />" itemprop="datePublished">

tags/custom_field.md

@@ -25,7 +25,7 @@ The **expires** tag is a *single* tag used to indicate when an article should no
 
 ## 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 %}:
 
 `format="format string"`
 : Override the default date format set in the Preferences panel.
@@ -42,8 +42,6 @@ Tag will accept the following attributes (**case-sensitive**):
 : **Values:** locales adhere to [ISO-639](https://en.wikipedia.org/wiki/ISO_639-2).
 : **Default:** unset (time format set in the Preferences panel.
 
-{% include atts-global.html %}
-
 ## Examples
 
 ### Example 1: Custom format date setting

tags/expires.md

@@ -55,6 +55,10 @@ Tag will accept the following attributes (**case-sensitive**):
 `name="image name"`
 : Specifies which image to display by its image `name` as shown on the Images panel.
 
+`style="style rule"`
+: Inline CSS `style` rule. It's recommended that you assign CSS rules via the `class` attribute instead.
+: **Default:** unset.
+
 `thumbnail="boolean"` <span class="footnote warning">v4.8.0+</span>
 : Whether to display the full-size (0) or thumbnail-size (1) image.
 : **Default:** 0.
@@ -66,21 +70,7 @@ Tag will accept the following attributes (**case-sensitive**):
 : Specify an image `width` which overrides the value stored in the database. Use `width="0"` to turn off the output of a width attribute in the `<img>` tag (thus the browser will scale the width if a height is used).
 : **Default:** width of image stored in the database.
 
-### Common presentational attributes
-
-These attributes, which affect presentation, are shared by many tags. Note that default values can vary among tags.
-
-`class="class name"`
-: HTML `class` to apply to the `wraptag` attribute value, if set, otherwise to the `<img>` tag.
-: **Default:** unset (see [class cross-reference](/tags/tag-attributes-cross-reference#class)).
-
-`style="style rule"`
-: Inline CSS `style` rule. It's recommended that you assign CSS rules via `class` attribute instead.
-: **Default:** unset.
-
-`wraptag="element"` <span class="footnote warning">v4.0.4+</span>
-: HTML tag to be used to wrap the `<img>` tag, specified without brackets (e.g. `wraptag="ul"`).
-: **Default:** unset (but see [wraptag cross-reference](/tags/tag-attributes-cross-reference#wraptag) for exceptions).
+{% include atts-global.html %}
 
 ## Examples