From 979c69ffc3bc0290b316973eaa4ea479ef7a0af1 Mon Sep 17 00:00:00 2001
From: Andreas Ziegler <github@andreas-ziegler.de>
Date: Thu, 11 Jan 2018 03:59:47 +0100
Subject: [PATCH] docs: move GLUON_WLAN_MESH to site.rst & improve text
fixes an error and removes the focus on ath10k
---
docs/user/getting_started.rst | 9 ---------
docs/user/site.rst | 5 +++++
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst
index fa408f2de..bab214e3d 100644
--- a/docs/user/getting_started.rst
+++ b/docs/user/getting_started.rst
@@ -155,15 +155,6 @@ usually be set on the command line or in ``site.mk``.
Common variables
................
-GLUON_WLAN_MESH
- While Gluon does support some hardware with ath10k-based 5GHz WLAN. ath10k can't support IBSS and 11s
- meshing in the same image due to WLAN firmware restrictions.
-
- Setting GLUON_MESH_MESH to ``11s`` or ``ibss`` will enable generation of images for ath10k devices
- and install the firmware for the corresponding WLAN mode. Specifically setting to ``11s`` will also
- enable the generation of images for targets that are able to run only AP+11s but not AP+IBSS, like
- ralink or mediatek. Defaults to ``11s``.
-
GLUON_BRANCH
Sets the default branch of the autoupdater. If unset, the autoupdater is disabled
by default. For the ``make manifest`` command, GLUON_BRANCH defines the branch to
diff --git a/docs/user/site.rst b/docs/user/site.rst
index b1f46e24c..048e3f5e4 100644
--- a/docs/user/site.rst
+++ b/docs/user/site.rst
@@ -413,6 +413,11 @@ GLUON_LANGS
List of languages (as two-letter-codes) to be included in the web interface. Should always contain
``en``.
+GLUON_WLAN_MESH
+ Setting this to ``11s`` or ``ibss`` will enable generation of matching images for devices which don't
+ support both meshing modes, either at all (e.g. ralink and mediatek don't support AP+IBSS) or in the
+ same firmware (ath10k-based 5GHz). Defaults to ``11s``.
+
Features
^^^^^^^^
--
GitLab