Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:f/extend-faq into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Simon Fels]

Extend FAQ and document available snap configuration items

[Matteo Croce (teknoraver)]

review: Approve

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:2366c6a1cb1c9987baa8640efaf1d3ac703c87da
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1056/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/57
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/754
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/966/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/749

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1056/rebuild

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

Some changes needed, see below.

review: Needs Fixing

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:c2546b6b058916915c4813e6a91e2bc775345af0
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1059/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/60
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/756
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/967/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/755

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1059/rebuild

review: Approve (continuous-integration)

diff --git a/docs/faq.md b/docs/faq.md
index 34848d0..a2b705c 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -7,3 +7,22 @@ table_of_contents: True
 
 This section covers some of the most commonly encountered problems and attempts
 to resolve them.
+
+## Can I run an AP in parallel to being connected to another WiFi network?
+
+Yes this is possible. However, there are known limitations if the device only has
+one WiFi network device. (e.g. both need to operate on the same channel). See
+[Simultaneous STA / AP Mode](simultaneous-sta-ap-mode.md) for more details.
+
+## Why isn't the AP automatically enabled after I've installed the snap?
+
+Normally it should automatically come up if this isn't disabled through the
+device configuration inside the gadget snap. See
+[Snap Configuration](reference/snap-configuration.md#automatic-setup.disable)
+for more details.
+
+If the above doesn't help then its most likely that the automatic setup couldn't
+find a good configuration for your device and you have to manually configure the AP.
+See [Configuration](reference/configuration.md) for details on this.
+
+If this still doesn't help, feel free to file a [bug report](report-bug.md).
diff --git a/docs/metadata.yaml b/docs/metadata.yaml
index 903f24b..39d53b3 100644
--- a/docs/metadata.yaml
+++ b/docs/metadata.yaml
@@ -21,6 +21,8 @@ navigation:
         location: reference/commands.md
       - title: Configuration
         location: reference/configuration.md
+      - title: Snap Configuration
+        location: reference/snap-configuration.md
       - title: API Documentation
         location: reference/rest-api.md
         children:
diff --git a/docs/reference/snap-configuration.md b/docs/reference/snap-configuration.md
new file mode 100644
index 0000000..03e94fe
--- /dev/null
+++ b/docs/reference/snap-configuration.md
@@ -0,0 +1,48 @@
+---
+title: "Snap Configuration"
+table_of_contents: False
+---
+
+# Snap Configuration
+
+In parallel to its own configuration system the wifi-ap snap provides a set of
+snap configuration items which can be changed through the *snap set* system
+command. These allow customization of the default behaviour of the wifi-ap snap
+from a device [gadget snap](https://docs.ubuntu.com/core/en/reference/gadget).
+
+The available configuration items are documented in the following sections.
+
+## automatic-setup.disable
+
+The *automatic-setup.disable* option allows a device to disable the automatic
+AP setup that the wifi-ap snap comes with by default.
+
+Possible values are:
+
+ * *false (default):* The automatic setup of the AP on installation of the wifi-ap
+   snap is **enabled**.
+ * *true:* The automatic setup of the AP on installation of the wifi-ap snap is
+   **disabled**.
+
+Example:
+
+```
+$ snap set wifi-ap automatic-setup.disable=true
+```
+
+Please note that changing the configuration after installation of the wifi-ap
+snap does not change its behaviour anymore. The option only has influence on the
+snap when it is being installed. This can be used from a gadget snap by adding the
+following lines to the gadget.yaml file:
+
+```
+defaults:
+  # The alpha numeric key below is the id of the wifi-ap snap assigned in the
+  # Ubuntu Store. Specifying the snap name instead is not possible.
+  2rGgvyaY0CCzlWuKAPwFtCWrgwkM8lqS:
+    automatic-setup.disable: true
+```
+
+After this snippet is added to the gadget.yaml and an updated version of the
+gadget snap is deployed onto the device the automatic setup, of the AP is disabled
+once the wifi-ap is installed from the Ubuntu Store.