diff options
| author | Martin Quinson <martin.quinson@loria.fr> | 2011-09-28 16:12:23 +0200 |
|---|---|---|
| committer | Martin Quinson <martin.quinson@loria.fr> | 2011-09-28 16:12:23 +0200 |
| commit | 90e69fc77ceae0b6f75408501de354a161fe9ed0 (patch) | |
| tree | cff7115ebe6619fc8c5caf9881c1eb88d01ad0d9 /doc | |
| parent | 96440f3c1d2afafc0a1310d9176f58c58a46c76e (diff) | |
| download | quilt-90e69fc77ceae0b6f75408501de354a161fe9ed0.tar.gz | |
several documentation fixes that were accumulated over the years in Debian package
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/main.tex | 7 | ||||
| -rw-r--r-- | doc/quilt.1.in | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/doc/main.tex b/doc/main.tex index f6fbae7..51042dd 100644 --- a/doc/main.tex +++ b/doc/main.tex @@ -690,9 +690,10 @@ patch which function a change is in. \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} -support the ``\textsf{--unified-reject-files}'' option for generating -reject files in unified diff style. +applying patches. (For example, recent versions of \prog{GNU patch} +support the ``\textsf{--reject-format=unified}'' option for generating +reject files in unified diff style (older versions used +``\textsf{--unified-reject-files}'' for that). \item[\textsf{QUILT\_PATCHES}] The location of patch files (see Section~\ref{sec:basic}). This setting diff --git a/doc/quilt.1.in b/doc/quilt.1.in index f4b94e6..1c1dcc2 100644 --- a/doc/quilt.1.in +++ b/doc/quilt.1.in @@ -145,8 +145,8 @@ Please refer to the pdf documentation for an example. 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, +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. @@ -161,9 +161,9 @@ to show in the resulting patch which function a change is in. .IP QUILT_PATCH_OPTS 4 Additional options that quilt shall pass to GNU patch when applying -patches. For example, some versions of GNU patch support the -"--unified-reject-files" option for generating reject files in unified -diff style. +patches. For example, recent versions of GNU patch support the +"--reject-format=unified" option for generating reject files in unified +diff style (older patch versions used "--unified-reject-files" for that). .IP QUILT_DIFFSTAT_OPTS 4 |