4 files changed, 22 insertions, 33 deletions
diff --git a/doc/main.tex b/doc/main.tex
index 2a02cce..de9805b 100644
--- a/doc/main.tex
+++ b/doc/main.tex
@@ -641,14 +641,16 @@ the series file in this case.
 
 \section{Customizing Quilt}
 
-The following settings influence how quilt behaves:
+Upon startup, quilt evaluates the file \textsf{.quiltrc} in the user's
+home directory, 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
+of \quilt{diff} to be syntax colored when writing to a terminal).
 
-\begin{description}
+In addition to that, quilt recognizes the following variables:
 
-\item[\textsf{QUILT\_BACKUP}]
-When set to ``\textsf{yes}'', the \quilt{refresh} command will create
-backup files when refreshing patches. The backup files have
-``\textsc{\~}'' appended to the patch file names.
+\begin{description}
 
 \item[\textsf{QUILT\_DIFF\_OPTS}]
 Additional options that quilt shall pass to \prog{GNU diff} when
@@ -656,10 +658,6 @@ generating patches. A useful setting for C source code is
 ``\textsf{-p}'', which causes \prog{GNU diff} to show in the resulting
 patch which function a change is in.
 
-\item[\textsf{QUILT\_NO\_DIFF\_TIMESTAMPS}]
-When set to ``\textsf{yes}'', the \quilt{diff} and \quilt{refresh}
-commands will not include file timestamps in patches.
-
 \item[\textsf{QUILT\_PATCH\_OPTS}]
 Additional options that quilt shall pass to \prog{GNU patch} when
 applying patches. (For example, some versions of \prog{GNU patch}
@@ -672,10 +670,6 @@ defaults to ``\textsf{patches}''.
 
 \end{description}
 
-These settings can either be defined in the environment, or in the file
-\textsf{.quiltrc} in user home directories. \textsf{.quiltrc} is a
-\prog{bash} script.
-
 \section{Pitfalls and Known Problems}
 
 As mentioned earlier, files must be added to patches before they can be
diff --git a/doc/quilt.1.in b/doc/quilt.1.in
index 6233689..f8238ad 100644
--- a/doc/quilt.1.in
+++ b/doc/quilt.1.in
@@ -118,15 +118,14 @@ Please refere to the pdf documentation for an example.
 
 .SH CONFIGURATION FILE
 
-The file ~/.quiltrc is used by default as configuration file, but that can
-be changed with the option --quiltrc. This file is to be sourced by bash.
-Here are the existing settings and their effects:
+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, QUILT_DIFF_ARGS="--color=auto" causes the output
+of quilt diff to be syntax colored when writing to a terminal).
 
-.IP QUILT_BACKUP 4
-
-When set to "yes", the quilt refresh command will create backup files when
-refreshing patches. The backup files have "~" appended to the patch file
-names.
+In addition to that, quilt recognizes the following variables:
 
 .IP QUILT_DIFF_OPTS 4
 
@@ -134,11 +133,6 @@ Additional options that quilt shall pass to GNU diff when generating
 patches. A useful setting for C source code is "-p", which causes GNU diff
 to show in the resulting patch which function a change is in.
     
-.IP QUILT_NO_DIFF_TIMESTAMPS 4 
-
-When set to "yes", the quilt diff and quilt refresh commands will not
-include file timestamps in patches.
-	
 .IP QUILT_PATCH_OPTS 4
 
 Additional options that quilt shall pass to GNU patch when applying patches.
diff --git a/doc/quilt.pdf b/doc/quilt.pdf
index 5e5ad94..9ccddc5 100644
--- a/doc/quilt.pdf
+++ b/doc/quilt.pdf
diff --git a/doc/sample.quiltrc b/doc/sample.quiltrc
index 0aa72a7..c447f27 100644
--- a/doc/sample.quiltrc
+++ b/doc/sample.quiltrc
@@ -1,15 +1,16 @@
 # Additional options passed to GNU diff
 # -p : Show which C function each change is in.
-QUILT_DIFF_OPTS="-p${QUILT_DIFF_OPTS:+ $QUILT_DIFF_OPTS}"
+QUILT_DIFF_OPTS="--show-c-function"
 
 # Additional options passed to GNU patch
-#QUILT_PATCH_OPTS=""
+#QUILT_PATCH_OPTS="--ignore-whitespace"
 
 # The directory in which patches are found (defaults to "patches").
 #QUILT_PATCHES=patches
 
-# Define this to generate diffs without timestamps.
-#QUILT_NO_DIFF_TIMESTAMPS=yes
+# Generate syntax-colored diffs without timestamps.
+QUILT_DIFF_ARGS="--color=auto --no-timestamps"
 
-# Create backup when refreshing patches.
-QUILT_BACKUP=yes
+# Generate patches without timestamps, and keep a backup of the previous
+# patch.
+QUILT_REFRESH_ARGS="--no-timestamps --backup"