Merge pull request #1099 from ExpressionEngine/7.dev

Pushing live change from enable_frontedit_links to allow_frontedit_links in docs

Author: TomJaeger

docs/advanced-usage/front-end/frontend.md

@@ -58,7 +58,7 @@ This special conditional allows you to display content if front-end editing is e
 ## Enable/Disable The Front Edit Link
 
 There are several ways to disable front-end editing links:
- - Globally with [configuration overrides](/general/system-configuration-overrides.md#enable_frontedit_links) or in [General Settings](/control-panel/settings/front-end-editing.md#enable-automatic-front-end-editing-links)
+ - Globally with [configuration overrides](/general/system-configuration-overrides.md#automatic_frontedit_links) or in [General Settings](/control-panel/settings/front-end-editing.md#enable-automatic-front-end-editing-links)
  - Per field in the [field settings](control-panel/field-manager/field-manager-settings.md)
  - Via the Dock on the front-end by toggling Edit Mode on/off.
  - In the template by using [ExpressionEngine template comments](#expressionengine-comment), [HTML comments](#html-comment), or [field parameter](#field-tag-parameter)

docs/control-panel/settings/front-end-editing.md

@@ -24,5 +24,7 @@ Enabling the Dock controls whether ExpressionEngine Pro is turned on for the fro
 Enabling front-end editing allows users with respective permissions to edit channel entries and content on the front-end of your website using provided edit links ( <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/pro_edit.png" alt="pro edit icon"> ) .
 
 ## **Enable automatic front-end editing links**
-(Default: On, Matching Config Override: [`enable_frontedit_links`](general/system-configuration-overrides.md#enable_frontedit_links))
-By default ExpressionEngine Pro automatically inserts edit links ( <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/pro_edit.png" alt="pro edit icon"> ) where editable content is found in templates. These can be disabled on a per field basis or globally when using this toggle. When toggled off, ExpressionEngine Pro will no longer automatically generate edit links and links will need to be [added manually](/advanced-usage/front-end/frontend.md#customizing-the-link-location) where needed in templates.
+(Default: On, Matching Config Override: [`automatic_frontedit_links`](general/system-configuration-overrides.md#automatic_frontedit_links))
+
+By default ExpressionEngine Pro automatically inserts edit links ( <img style="margin-bottom: 0px; vertical-align: middle; display:inline-block;" src="../../_images/pro_edit.png" alt="pro edit icon"> ) where editable content is found in templates. These can be disabled on a per field basis or globally when using this toggle. When toggled off, ExpressionEngine Pro will no longer automatically generate edit links and links will need to be [added manually](/advanced-usage/front-end/frontend.md#customizing-the-link-location) where needed in templates.
+

docs/general/system-configuration-overrides.md

@@ -1283,7 +1283,7 @@ Example Usage:
 
     $config['enable_frontedit'] = 'n';
 
-## `enable_frontedit_links`
+## `automatic_frontedit_links`
 
 When set to `n`, disables automatic creation of content management links on front-end. The links can still be [added manually](advanced-usage/front-end/frontend.md#customizing-the-link-location).
 
@@ -1294,7 +1294,7 @@ When set to `n`, disables automatic creation of content management links on fron
 
 Example Usage:
 
-    $config['enable_frontedit_links'] = 'y';
+    $config['automatic_frontedit_links'] = 'y';
 
 ## `enable_hit_tracking`
 

docs/troubleshooting/front-end-content-management.md

@@ -40,7 +40,7 @@ There are several settings that could prevent the Dock from showing on the front
 
 - Automatic front-end editing links are disabled via settings or config override. By default, ExpressionEngine automatically generates front edit links for all entry fields. This can be turned on or off, requiring a developer to [manually insert front edit links](advanced-usage/front-end/frontend.md#customizing-the-link-location) via template tags. If only manually inserted links are showing, this could be the cause.
     - Via Pro's [general settings](control-panel/settings/front-end-editing.md), ensure that the "Enable automatic front-end editing links" setting is toggled on.
-    - Via the [`enable_frontedit_links` config override](general/system-configuration-overrides.md#enable_frontedit_links). If in use, this override must be set to `'y'` to automatically insert front edit links.
+    - Via the [`automatic_frontedit_links` config override](general/system-configuration-overrides.md#automatic_frontedit_links). If in use, this override must be set to `'y'` to automatically insert front edit links.
 
 - Front edit links are disabled via HTML comments, EE template comments, or `disable` parameter. There are 3 ways to disable Pro's automatic generation of front edit links. Ensure that the template code your inspecting isn't surrounded by template comments or wrapped in a field tag using `disable="frontedit`. For details on these methods read the [docs regarding disabling front-edit links](advanced-usage/front-end/frontend.md#enabledisable-the-front-edit-link)