Merge branch '5.x' into Rita_main

Author: RCheesley

docs/channels/emails.rst

@@ -276,15 +276,19 @@ For example:
 Unsubscribing
 *************
 
-Mautic has a built in means of allowing a Contact to unsubscribe from Email communication. You can insert the tokens ``{unsubscribe_text}`` or ``{unsubscribe_url}`` into your Email to have the text or the URL show at your desired location. The unsubscribe text token inserts a sentence with a link instructing the Contact to click to unsubscribe. 
+Mautic has a built in means of allowing a Contact to unsubscribe from Email communication. You can insert various tokens into your Email to provide unsubscribe options at your desired location:
+- ``{unsubscribe_text}``: Inserts a sentence with a link instructing the Contact to click to unsubscribe.
+- ``{unsubscribe_url}``: Inserts the URL to the preferences center when it's activated, or to the unsubscribe page if not.
+- ``{dnc_url}``: Inserts the URL to unsubscribe from all marketing messages when the preference center is activated.
 
 The unsubscribe URL token inserts the URL into your custom written instructions. 
 
 For example:
 
 .. code-block:: html
 
-        <a href="{unsubscribe_url}" target="_blank">Want to unsubscribe?</a>
+        <a href="{unsubscribe_url}" target="_blank">Manage your email preferences</a>
+        <a href="{dnc_url}" target="_blank">Unsubscribe from all emails</a>
 
 You can find the configuration of the unsubscribe text in the global settings.
 

docs/components/forms.rst

@@ -105,7 +105,7 @@ To add a new field to your Form:
 
    - **Hidden** - This field won't be visible on the Form, but include default values, saved along with the Form submission, for reporting or internal tagging purposes.
 
-   - **List - Country** - This populates Mautic's default, non-editable country list. To use a custom list you should make use of the Select field type and manually enter the countries you would like to include.
+   - **Select: Country** - This populates Mautic's default, non-editable country list. To use a custom list you should make use of the Select field type and manually enter the countries you would like to include.
 
    - **Page break** - This allows marketers to break up the Form into multiple parts or field groupings.
 
@@ -117,13 +117,13 @@ To add a new field to your Form:
 
    - **Radio group** - This field provides a group of single-select options with a radio button, sometimes referred to as an option button group.
 
-   - **Select** - This option shows a dropdown list where a visitor may choose one option. This field also allows multiple selections, which changes the display to a box with the options listed. On a mobile device, a single select box shows a dialog box with radio buttons, and with checkboxes for a multi-select field.
+   - **Select: Single or multiple choices** - This option shows a dropdown list where a visitor may choose one option. This field also allows multiple selections, which changes the display to a box with the options listed. On a mobile device, a single select box shows a dialog box with radio buttons, and with checkboxes for a multi-select field.
 
    - **Social login** - This allows the visitor to connect their Twitter, Facebook or LinkedIn profiles with their Contact record. You must configure the Plugin for the social network before using this field.
 
-   - **Text** - This field shows a text box with 255 characters available. Common uses include specifying the visitor's first name, last name, city, and so forth.
+   - **Text: Short answer** - This field shows a text box with 255 characters available. Common uses include specifying the visitor's first name, last name, city, and so forth.
 
-   - **Text area** - Similar to the text field, but without the 255 character limitation. The text area field has a character limit of 65,535 characters.
+   - **Text: Paragraph** - Similar to the text field, but without the 255 character limitation. The text area field has a character limit of 65,535 characters.
 
    - **URL** - This field validates the entry as being in the expected format for a URL, including ``https://`` or ``http://``
 

docs/index.rst

@@ -167,7 +167,6 @@ There are different types of documentation available to help you navigate your w
    plugins/clearbit
    plugins/connectwise
    plugins/fullcontact
-   plugins/gmail
    plugins/hubspot
    plugins/icontact
    plugins/mailchimp