Merging upstream version 2.0.3+dfsg (Closes: #923993, #1042533, #1045145).

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 13 insertions, 7 deletions

diff --git a/docs/netdata-agent/configuration/README.md b/docs/netdata-agent/configuration/README.md
index 097fb9310..abe511313 100644
--- a/docs/netdata-agent/configuration/README.md
+++ b/docs/netdata-agent/configuration/README.md
@@ -1,21 +1,28 @@
 # Netdata Agent Configuration
 
-The main Netdata agent configuration is `netdata.conf`.
+> **Info**
+>
+> Netdata Cloud lets you configure Agents on the fly. Check the [Dynamic Configuration Manager](/docs/netdata-agent/configuration/dynamic-configuration.md) documentation for details.
+
+The main Netdata Agent configuration is `netdata.conf`.
 
 ## The Netdata config directory
 
-On most Linux systems, by using our [recommended one-line installation](/packaging/installer/README.md#install-on-linux-with-one-line-installer), the **Netdata config
+On most Linux systems, the **Netdata config
 directory** will be `/etc/netdata/`. The config directory contains several configuration files with the `.conf` extension, a
 few directories, and a shell script named `edit-config`.
 
 > Some operating systems will use `/opt/netdata/etc/netdata/` as the config directory. If you're not sure where yours
 > is, navigate to `http://NODE:19999/netdata.conf` in your browser, replacing `NODE` with the IP address or hostname of
-> your node, and find the `# config directory = ` setting. The value listed is the config directory for your system.
+> your node, and find the `# config directory =` setting. The value listed is the config directory for your system.
 
 All of Netdata's documentation assumes that your config directory is at `/etc/netdata`, and that you're running any scripts from inside that directory.
 
+## Edit a configuration file using `edit-config`
+
+We recommend the use of the `edit-config` script for configuration changes.
 
-## edit `netdata.conf`
+It exists inside your config directory (read above) and helps manage and safely edit configuration files.
 
 To edit `netdata.conf`, run this on your terminal:
 
@@ -28,9 +35,9 @@ Your editor will open.
 
 ## downloading `netdata.conf`
 
-The running version of `netdata.conf` can be downloaded from a running Netdata agent, at this URL:
+The running version of `netdata.conf` can be downloaded from a running Netdata Agent, at this URL:
 
-```
+```url
 http://agent-ip:19999/netdata.conf
 ```
 
@@ -40,4 +47,3 @@ You can save and use this version, using these commands:
 cd /etc/netdata 2>/dev/null || cd /opt/netdata/etc/netdata
 curl -ksSLo /tmp/netdata.conf.new http://localhost:19999/netdata.conf && sudo mv -i /tmp/netdata.conf.new netdata.conf 
 ```
-