summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzimoun <zimon.toutoune@gmail.com>2021-03-26 07:01:38 +0100
committerGuix Patches Tester <>2021-03-26 06:03:08 +0000
commit972b9298110558857bebe47ae675630094bd5b06 (patch)
treea7d1b7c26a740c241d5b2e824f07379e556522e2
parentf21075f039be2afb86f0735f151b94050a3d41bd (diff)
downloadguix-patches-972b9298110558857bebe47ae675630094bd5b06.tar
guix-patches-972b9298110558857bebe47ae675630094bd5b06.tar.gz
doc: Mention value /etc to sysconfdir option.series-7437
* doc/contributing.texi (Building from Git): Mention value /etc to sysconfdir option.
-rw-r--r--doc/contributing.texi8
-rw-r--r--doc/guix.texi2
2 files changed, 7 insertions, 3 deletions
diff --git a/doc/contributing.texi b/doc/contributing.texi
index 58c4dafb9b..53840d81cc 100644
--- a/doc/contributing.texi
+++ b/doc/contributing.texi
@@ -228,8 +228,12 @@ necessary to support this, including @env{PATH} and @env{GUILE_LOAD_PATH}.
Note that @command{./pre-inst-env guix pull} does @emph{not} upgrade the
local source tree; it simply updates the @file{~/.config/guix/current}
symlink (@pxref{Invoking guix pull}). Run @command{git pull} instead if
-you want to upgrade your local source tree.
-
+you want to upgrade your local source tree. Moreover, note also that
+@command{guix pull} preserves the settings of the host Guix. For
+instance, regular Guix passes @code{--sysconfdir=/etc/}, whereas the GNU
+Coding Standards sets by default @var{prefix} to @file{/usr/local} and
+@var{sysconfdir} to @file{$prefix/etc} (@pxref{Directory Variables,,,
+standards, GNU Coding Standards}).
@node The Perfect Setup
@section The Perfect Setup
diff --git a/doc/guix.texi b/doc/guix.texi
index c23d044ff5..3f2cf4d6e1 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -69,8 +69,8 @@ Copyright @copyright{} 2019 Jakob L. Kreuze@*
Copyright @copyright{} 2019 Kyle Andrews@*
Copyright @copyright{} 2019 Alex Griffin@*
Copyright @copyright{} 2019, 2020 Guillaume Le Vaillant@*
+Copyright @copyright{} 2019, 2020, 2021 Simon Tournier@*
Copyright @copyright{} 2020 Leo Prikler@*
-Copyright @copyright{} 2019, 2020 Simon Tournier@*
Copyright @copyright{} 2020 Wiktor Żelazny@*
Copyright @copyright{} 2020 Damien Cassou@*
Copyright @copyright{} 2020 Jakub Kądziołka@*