diff --git a/Makefile b/Makefile index c25f82f5c96e3f4ba95bf034e05c25999b7a3123..e3aa596f5a404498f9b5e52058b77aa58e954266 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ include $(GLUON_SITEDIR)/site.mk GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line) -GLUON_DEPRECATED ?= $(error GLUON_DEPRECATED not set. Please consult the documentation) +GLUON_DEPRECATED ?= 0 ifneq ($(GLUON_BRANCH),) $(warning *** Warning: GLUON_BRANCH has been deprecated, please set GLUON_AUTOUPDATER_BRANCH and GLUON_AUTOUPDATER_ENABLED instead.) diff --git a/docs/multidomain-site-example/site.mk b/docs/multidomain-site-example/site.mk index df282a53c7f12a4919c1481412993afe9b78801e..64ce6fa136b9191d48326d5c77113a2df287823a 100644 --- a/docs/multidomain-site-example/site.mk +++ b/docs/multidomain-site-example/site.mk @@ -58,6 +58,3 @@ GLUON_REGION ?= eu # Languages to include GLUON_LANGS ?= en de - -# Do not build images for deprecated devices -GLUON_DEPRECATED ?= 0 diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk index cff175234d36d00f817feb58c04608f2b7c0ad57..30671b181dedaa7204dab55d5b261f7eb85af3eb 100644 --- a/docs/site-example/site.mk +++ b/docs/site-example/site.mk @@ -55,6 +55,3 @@ GLUON_REGION ?= eu # Languages to include GLUON_LANGS ?= en de - -# Do not build images for deprecated devices -GLUON_DEPRECATED ?= 0 diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst index 01e01b5424b4c033b5f4e72ac238652cdc1e95cb..57ffe83bf74ad130cfa94e0ab6cbd32afb93a3cf 100644 --- a/docs/user/getting_started.rst +++ b/docs/user/getting_started.rst @@ -213,7 +213,7 @@ GLUON_DEPRECATED Usually, devices are deprecated because their flash size is insufficient to support future Gluon versions. The recommended setting is ``0`` for new sites, and ``upgrade`` for existing configurations (where upgrades for existing - deployments of low-flash devices are required). + deployments of low-flash devices are required). Defaults to ``0``. GLUON_LANGS Space-separated list of languages to include for the config mode/advanced settings. Defaults to ``en``. diff --git a/docs/user/site.rst b/docs/user/site.rst index bd2f9c3c493e28decca7db0b2b79484d15068903..28297e38e7bd111be74355954906ed08bb8413d1 100644 --- a/docs/user/site.rst +++ b/docs/user/site.rst @@ -562,7 +562,7 @@ GLUON_DEPRECATED Usually, devices are deprecated because their flash size is insufficient to support future Gluon versions. The recommended setting is ``0`` for new sites, and ``upgrade`` for existing configurations (where upgrades for existing - deployments of low-flash devices are required). + deployments of low-flash devices are required). Defaults to ``0``. GLUON_FEATURES Defines a list of features to include. Depending on the device, the feature list