diff options
| -rw-r--r-- | bin/guards.in | 2 | ||||
| -rw-r--r-- | doc/main.tex | 7 | ||||
| -rw-r--r-- | doc/quilt.1.in | 10 | ||||
| -rw-r--r-- | quilt/import.in | 2 |
4 files changed, 11 insertions, 10 deletions
diff --git a/bin/guards.in b/bin/guards.in index d08c2bf..9a5721b 100644 --- a/bin/guards.in +++ b/bin/guards.in @@ -263,7 +263,7 @@ The I<--check> option is used to compare the specification file against the file system. If files are referenced in the specification that do not exist, or if files are not enlisted in the specification file warnings are printed. The I<--path> option can be used to specify which directory or directories to scan. -Multiple directories are eparated by a colon (C<:>) character. The +Multiple directories are separated by a colon (C<:>) character. The I<--prefix> option specifies the location of the files. =head1 AUTHOR 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 diff --git a/quilt/import.in b/quilt/import.in index 07cb95d..efee4d1 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -36,7 +36,7 @@ current top patch, and must be pushed after import to apply them. Patch filename to use inside quilt. This option can only be used when importing a single patch. --f Overwite/update existing patches. +-f Overwrite/update existing patches. -d {o|a|n} When overwriting in existing patch, keep the old (o), all (a), or |