summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/main.tex3
-rw-r--r--doc/quilt.1.in7
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/main.tex b/doc/main.tex
index 24f863e..363d6f6 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -672,7 +672,8 @@ the series file in this case.
\section{Customizing Quilt}
Upon startup, quilt evaluates the file \textsf{.quiltrc} in the user's
-home directory, or the file specified with the \textsf{-{}-quiltrc} option.
+home directory, \textsf{/etc/quilt.quiltrc} if the former file does not
+exist, or the file specified with the \textsf{-{}-quiltrc} option.
This file is a regular bash script. Default options can be passed to
any command by defining a \textsf{QUILT\_\textit{COMMAND}\_ARGS} variable
(for example, \textsf{QUILT\_DIFF\_ARGS="-{}-color=auto"} causes the output
diff --git a/doc/quilt.1.in b/doc/quilt.1.in
index c0e8b05..3c23043 100644
--- a/doc/quilt.1.in
+++ b/doc/quilt.1.in
@@ -178,9 +178,10 @@ Please refer to the pdf documentation for a full example of use.
.SH CONFIGURATION FILE
Upon startup, quilt evaluates the file .quiltrc in the user's home
-directory, or the file specified with the --quiltrc option. This file
-is a regular bash script. Default options can be passed to any COMMAND
-by defining a QUILT_${COMMAND}_ARGS variable. For example,
+directory, /etc/quilt.quiltrc if the former file does not exist, or
+the file specified with the --quiltrc option. This file is a regular
+bash script. Default options can be passed to any COMMAND by defining
+a QUILT_${COMMAND}_ARGS variable. For example,
QUILT_DIFF_ARGS="--color=auto" causes the output of quilt diff to be
syntax colored when writing to a terminal.