Update settings.conf defaults and documentation.

This commit is contained in:
Teo Mrnjavac 2015-07-03 11:51:09 +02:00
parent 3326ec4ace
commit 009acfcf66

View File

@ -3,13 +3,16 @@
--- ---
# Modules can be job modules (with different interfaces) and QtWidgets view modules. # Modules can be job modules (with different interfaces) and QtWidgets view modules.
# They could all be placed in a number of different paths. # They could all be placed in a number of different paths.
# "local" is LIBDIR/calamares/modules with settings in SHARE/calamares/modules # "modules-search" is a list of strings, each of these can either be a full path to a
modules-search: [ local, /path/to/dir/with/more/modules ] # 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, # 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). # 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 # 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. # Phase 1 - prepare.
# View modules are shown as UI pages, jobs from job modules are executed immediately in # 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 # 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 # /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 # YAML file branding.desc which may reference additional resources (such as images or QML)
# paths relative to the current directory. # as paths relative to the current directory.
# Only the name of the branding component (directory) should be specified here, Calamares # Only the name of the branding component (directory) should be specified here, Calamares
# then takes care of finding it and loading the contents. # then takes care of finding it and loading the contents.
branding: default branding: default