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

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

1 files changed, 49 insertions, 48 deletions

diff --git a/packaging/installer/UNINSTALL.md b/packaging/installer/UNINSTALL.md
index c7de90d95..87fe93955 100644
--- a/packaging/installer/UNINSTALL.md
+++ b/packaging/installer/UNINSTALL.md
@@ -1,77 +1,76 @@
 # Uninstall Netdata
 
-> ### Note 
-> 
-> If you're having trouble updating Netdata, moving from one installation method to another, or generally having
-> issues with your Netdata Agent installation, consider our [reinstalling Netdata](/packaging/installer/REINSTALL.md) instead of removing the Netdata Agent entirely.
+## UNIX
 
-The recommended method to uninstall Netdata on a system is to use our kickstart installer script with the `--uninstall` option like so:
+> **Note**
+>
+> This method assumes you installed Netdata using the `kickstart.sh` or `netdata-installer.sh` script.
+> If you used a different method, it might not work and could complicate the removal process.
 
-```sh
+Similarly with our documentation on updating Netdata, you need to [determine your installation type](/packaging/installer/UPDATE.md).
+
+**If your installation type indicates a native package, then proceed to uninstall Netdata using your package manager.**
+
+The recommended way to uninstall Netdata is to use the same script you used for installation. Just add the `--uninstall` flag:
+
+```bash
 wget -O /tmp/netdata-kickstart.sh https://get.netdata.cloud/kickstart.sh && sh /tmp/netdata-kickstart.sh --uninstall
 ```
 
-Or (if you have curl but not wget):
+<details>
+<summary>if you have curl but not wget</summary>
 
 ```sh
 curl https://get.netdata.cloud/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh --uninstall
 ```
 
-This will work in most cases without you needing to do anything more other than accepting removal of configuration
-and data files.
+</details>
 
-If you used a non-standard installation prefix, you may need to specify that prefix using the `--old-install-prefix`
-option when uninstalling this way.
 
-## Unofficial installs
+**What to Expect**:
 
-If you used a third-party package to install Netdata, then the above method will usually not work, and you will
-need to use whatever mechanism you used to originally install Netdata to uninstall it.
+In most cases, these commands will guide you through the uninstallation process and remove configuration and data files automatically.
 
-## Uninstalling manually
+**Non-Standard Installations**:
 
-Most official installs of Netdata include an uninstaller script that can be manually invoked instead of using the
-kickstart script (internally, the kickstart script also uses this uninstaller script, it just handles the process
-outlined below for you).
+If you installed Netdata with a custom prefix (different directory location), you may need to specify the original prefix during uninstallation with the `--old-install-prefix` option.
 
-This uninstaller script is self-contained other than requiring a `.environment` file that was generated during
-installation. In most cases, this will be found in `/etc/netdata/.environment`, though if you used a non-standard
-installation prefix it will usually be located in a similar place under that prefix.
+### Uninstalling manually
 
-A workflow for uninstallation looks like this:
+Most official installations of Netdata include an uninstaller script that can be manually invoked instead of using the kickstart script (internally, the kickstart script also uses this uninstaller script, it just handles the process outlined below for you).
 
-1.  Find your `.environment` file, which is usually `/etc/netdata/.environment` in a default installation.
-2.  If you cannot find that file and would like to uninstall Netdata, then create a new file with the following content:
+This uninstaller script is self-contained, other than requiring a `.environment` file that was generated during installation. In most cases, this will be found in `/etc/netdata/.environment`, though if you used a custom installation prefix it be located under that directory.
 
-```sh
-NETDATA_PREFIX="<installation prefix>"   # put what you used as a parameter to shell installed `--install-prefix` flag. Otherwise it should be empty
-NETDATA_ADDED_TO_GROUPS="<additional groups>"  # Additional groups for a user running the Netdata process
-```
+1. Find your `.environment` file
+2. If you can’t find that file and would like to uninstall Netdata, then create a new file with the following content:
+
+    ```sh
+    NETDATA_PREFIX="<installation prefix>"   # put what you used as a parameter to shell installed `--install-prefix` flag. Otherwise it should be empty
+    NETDATA_ADDED_TO_GROUPS="<additional groups>"  # Additional groups for a user running the Netdata process
+    ```
 
-3.  Run `netdata-uninstaller.sh` as follows
+3. Run `netdata-uninstaller.sh` as follows
 
-    3.1 **Interactive mode (Default)**
+    - **Interactive mode (Default)**
 
-    The default mode in the uninstaller script is **interactive**. This means that the script provides you
-    the option to reply with "yes" (`y`/`Y`) or "no" (`n`/`N`) to control the removal of each Netdata asset in
-    the filesystem.
+      The default mode in the uninstaller script is **interactive**. This means that the script provides you the option to reply with "yes" (`y`/`Y`) or "no" (`n`/`N`) to control the removal of each Netdata asset in the filesystem.
 
-    ```sh
-    ${NETDATA_PREFIX}/usr/libexec/netdata/netdata-uninstaller.sh --yes --env <environment_file>
-    ```
+         ```sh
+         ${NETDATA_PREFIX}/usr/libexec/netdata/netdata-uninstaller.sh --yes --env <environment_file>
+         ```
 
-    3.2 **Non-interactive mode**
+    - **Non-interactive mode**
 
-    If you are sure and you know what you are doing, you can speed up the removal of the Netdata assets from the
-    filesystem without any questions by using the force option (`-f`/`--force`). This option will remove all the
-    Netdata assets in a **non-interactive** mode.
+      If you’re sure, and you know what you’re doing, you can speed up the removal of the Netdata assets from the filesystem without any questions by using the force option (`-f`/`--force`). This option will remove all the
+      Netdata assets in a **non-interactive** mode.
 
-    ```sh
-    ${NETDATA_PREFIX}/usr/libexec/netdata/netdata-uninstaller.sh --yes --force --env <environment_file>
-    ```
+         ```sh
+         ${NETDATA_PREFIX}/usr/libexec/netdata/netdata-uninstaller.sh --yes --force --env <environment_file>
+         ```
 
-Note: Existing installations may still need to download the file if it's not present. To execute uninstall in that case,
-run the following commands:
+> **Note**
+>
+> Existing installations may still need to download the file if it's not present. To execute the uninstaller in that case, run the following commands:
 
 ```sh
 wget https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/netdata-uninstaller.sh
@@ -79,7 +78,9 @@ chmod +x ./netdata-uninstaller.sh
 ./netdata-uninstaller.sh --yes --env <environment_file>
 ```
 
-The default `environment_file` is `/etc/netdata/.environment`.
+## Windows
+
+Currently, the Windows version of Netdata is in beta. To uninstall Netdata on Windows:
 
-> Note: This uninstallation method assumes previous installation with `netdata-installer.sh` or the kickstart script.
-> Using it when Netdata was installed in some other way will usually not work correctly, and may make it harder to uninstall Netdata.
+1. Locate the `Uninstall.exe` file in your Netdata installation directory.
+2. Double-click the `Uninstall.exe` file and follow the on-screen instructions.