瀏覽代碼

man: Remove unneeded u-a references from options descriptions

Guillem Jover 11 年之前
父節點
當前提交
30d45ed5cc
共有 2 個文件被更改,包括 5 次插入6 次删除
  1. 1 0
      debian/changelog
  2. 4 6
      man/update-alternatives.1

+ 1 - 0
debian/changelog

@@ -137,6 +137,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low
     - Use .TQ to separate different but related options in dpkg(1).
     - Use .TQ to separate different but related options in dpkg(1).
     - Clarify that dpkg-buildpackage -jN forces parallel builds, regardless of
     - Clarify that dpkg-buildpackage -jN forces parallel builds, regardless of
       the packaging or upstream build systems supporting them. Closes: #780866
       the packaging or upstream build systems supporting them. Closes: #780866
+    - Remove unneeded update-alternatives references from options descriptions.
   * Output message fixes and improvements:
   * Output message fixes and improvements:
     - Remove trailing newline from string literal in warning calls.
     - Remove trailing newline from string literal in warning calls.
     - Say “execute” instead of “exec” in Dpkg::Changelog::Parse error message.
     - Say “execute” instead of “exec” in Dpkg::Changelog::Parse error message.

+ 4 - 6
man/update-alternatives.1

@@ -318,7 +318,7 @@ might contain spaces).
 .TP
 .TP
 \fB\-\-set\-selections\fR
 \fB\-\-set\-selections\fR
 Read configuration of alternatives on standard input in the format
 Read configuration of alternatives on standard input in the format
-generated by \fBupdate\-alternatives \-\-get\-selections\fR and reconfigure
+generated by \-\-get\-selections\fR and reconfigure
 them accordingly (since version 1.15.0).
 them accordingly (since version 1.15.0).
 .TP
 .TP
 \fB\-\-query\fR \fIname\fR
 \fB\-\-query\fR \fIname\fR
@@ -354,7 +354,7 @@ Specifies the log file (since version 1.15.0), when this is to be different
 from the default (/var/log/alternatives.log).
 from the default (/var/log/alternatives.log).
 .TP
 .TP
 .BI \-\-force
 .BI \-\-force
-Let \fBupdate\-alternatives\fR replace or drop any real file that is installed
+Allows to replace or drop any real file that is installed
 where an alternative link has to be installed or removed.
 where an alternative link has to be installed or removed.
 .TP
 .TP
 .BI \-\-skip\-auto
 .BI \-\-skip\-auto
@@ -363,9 +363,7 @@ in automatic mode. This option is only relevant with \fB\-\-config\fR or
 \fB\-\-all\fR.
 \fB\-\-all\fR.
 .TP
 .TP
 .B \-\-verbose
 .B \-\-verbose
-Generate more comments about what
-.B update\-alternatives
-is doing.
+Generate more comments about what is being done.
 .TP
 .TP
 .B \-\-quiet
 .B \-\-quiet
 Don't generate any comments unless errors occur.
 Don't generate any comments unless errors occur.
@@ -400,7 +398,7 @@ Can be overridden by the
 option.
 option.
 .
 .
 .SH QUERY FORMAT
 .SH QUERY FORMAT
-The \fBupdate\-alternatives \-\-query\fP format is using an
+The \fB\-\-query\fP format is using an
 RFC822-like flat format. It's made of \fIn\fP + 1 blocks where \fIn\fP is
 RFC822-like flat format. It's made of \fIn\fP + 1 blocks where \fIn\fP is
 the number of alternatives available in the queried link group. The first
 the number of alternatives available in the queried link group. The first
 block contains the following fields:
 block contains the following fields: