From 5573af675e0fa37f94e738b6c460f8119d95d1fe Mon Sep 17 00:00:00 2001
From: Thomas Heartman <thomas.heartman+git@gmail.com>
Date: Fri, 7 Jan 2022 08:03:49 +0100
Subject: [PATCH] docs: restructure startup import section to group actions by
 intent

This groups ways of importing together and ways of dropping together
instead of grouping the instructions by whether they use env variables
or command line options.

Should (?) make it easier to find what you want, but most importantly:
means we only need to explain the database drops once.
---
 website/docs/deploy/import-export.md | 52 +++++++++++++---------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/website/docs/deploy/import-export.md b/website/docs/deploy/import-export.md
index 5a8745983cd..63f4b00aa13 100644
--- a/website/docs/deploy/import-export.md
+++ b/website/docs/deploy/import-export.md
@@ -118,39 +118,35 @@ Unleash lets you do this both via configuration parameters and environment varia
 | `importFile`       | `IMPORT_FILE`               | none    | path to the configuration file                          |
 | `dropBeforeImport` | `IMPORT_DROP_BEFORE_IMPORT` | `false` | whether to clean the database before importing the file |
 
-### Import files via config parameter {#import-files-via-config-parameter}
+### Importing files
 
-To import strategies and toggles from a file (`configuration.yml` in the examples), you use the `importFile` parameter:
+To import strategies and toggles from a file (called `configuration.yml` in the examples below), either
+- use the `importFile` parameter to point to the file (you can also passed this into the `unleash.start()` entry point)
+   ``` shell
+   unleash-server --databaseUrl [...] \
+   	       --importFile configuration.yml
+   ```
 
-``` shell
-unleash-server --databaseUrl [...] \
-	       --importFile configuration.yml
-```
+- set the `IMPORT_FILE` environment variable to the path of the file before starting Unleash
 
-To clean the database before import (all strategies and features will be removed), add the `dropBeforeImport` flag:
+   ``` shell
+   IMPORT_FILE=configuration.yml
+   ```
 
+### Drop before import
 :::caution
 You should never use this in production environments.
 :::
 
-``` shell
-unleash-server --databaseUrl [...] \
-	       --importFile configuration.yml \
-	       --dropBeforeImport
-```
-
-You can also pass these options into the `unleash.start()` entry point.
-
-### Import files via environment variables
-
-Use the `IMPORT_FILE` environment variable to set the path to the import file. For instance:
-
-``` shell
-IMPORT_FILE=configuration.yml
-```
-
-To clean the database before import, set the `IMPORT_DROP_BEFORE_IMPORT` (note the leading `IMPORT_`) variable to `true`, `t`, or `1`. The variable is case-sensitive.
-
-``` shell
-IMPORT_DROP_BEFORE_IMPORT=true
-```
+To remove pre-existing feature toggles and strategies in the database before importing the new ones, either:
+- add the `dropBeforeImport` flag to the `unleash-server` command (or to `unleash.start()`)
+   ``` shell
+   unleash-server --databaseUrl [...] \
+   	       --importFile configuration.yml \
+   	       --dropBeforeImport
+   ```
+- set the `IMPORT_DROP_BEFORE_IMPORT` environment variable (note the leading `IMPORT_`) to `true`, `t`, or `1`. The variable is case-sensitive.
+
+   ``` shell
+   IMPORT_DROP_BEFORE_IMPORT=true
+   ```