From 009acfcf66fd9a383e2fe89946653797ea2a014d Mon Sep 17 00:00:00 2001
From: Teo Mrnjavac <teo@kde.org>
Date: Fri, 3 Jul 2015 11:51:09 +0200
Subject: [PATCH] Update settings.conf defaults and documentation.

---
 settings.conf | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/settings.conf b/settings.conf
index fac673e84b..5dc42f54b5 100644
--- a/settings.conf
+++ b/settings.conf
@@ -3,13 +3,16 @@
 ---
 # Modules can be job modules (with different interfaces) and QtWidgets view modules.
 # They could all be placed in a number of different paths.
-# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules
-modules-search: [ local, /path/to/dir/with/more/modules ]
+# "modules-search" is a list of strings, each of these can either be a full path to a
+# directory or the keyword "local".
+# "local" means LIBDIR/calamares/modules with settings in SHARE/calamares/modules or
+# /etc/calamares/modules.
+modules-search: [ local ]
 
 # We define the module names in the order they should show up (QtWidget view modules,
 # with one or more pages) OR be executed if enqueued (all other modules).
 # Pages can also enqueue jobs for delayed execution in the order specified for the
-# install phase.
+# install phase, so a viewmodule name can appear in more than one phase.
 
 # Phase 1 - prepare.
 # View modules are shown as UI pages, jobs from job modules are executed immediately in
@@ -61,8 +64,8 @@ postinstall:
 
 # A branding component is a directory, either in SHARE/calamares/branding or in
 # /etc/calamares/branding (the latter takes precedence). The directory must contain a
-# YAML file branding.desc which may reference additional resources (such as images) as
-# paths relative to the current directory.
+# YAML file branding.desc which may reference additional resources (such as images or QML)
+# as paths relative to the current directory.
 # Only the name of the branding component (directory) should be specified here, Calamares
 # then takes care of finding it and loading the contents.
 branding: default
-- 
GitLab