The following commit has been merged in the master branch:
commit e342a8fc3bc777971f76aff0f89b8b121876a532
Author: Guillem Jover <guil...@debian.org>
Date: Sun Jul 3 21:29:43 2011 +0200
Use “command line” instead of commandline or command-line
diff --git a/TODO b/TODO
index e1b1f18..6af952e 100644
--- a/TODO
+++ b/TODO
@@ -69,7 +69,6 @@ TODO
- Check position of short option before long option.
- Use [option...] instead of [options] and friends?
- Fix dpkg man page, refs to dpkg-deb and dpkg-split, etc.
- - Fix «commandline» vs «command line».
- Fix «. ».
* L10n:
diff --git a/debian/usertags b/debian/usertags
index 0a0d9c1..9353bc8 100644
--- a/debian/usertags
+++ b/debian/usertags
@@ -27,7 +27,7 @@ file-metadata File metadata tracking (perm,
acl, cap, hash).
trivial [TRIVIAL] Bug should be trivial to fix.
perf [PERF] Performance problems.
new-field Request for new control file fields.
-new-option Request for new command-line option.
+new-option Request for new command line option.
deb-format Changes to the binary (.deb) format.
dsc-format Changes to the source (.dsc) format.
arch [ARCH] Updates to ‘cputable’, ‘ostable’ and porting
@@ -155,7 +155,7 @@ usercategory dpkg-class [hidden]
+ Performance issue [perf]
+ Trivial fix [trivial]
+ New control field [new-field]
- + New command-line option [new-option]
+ + New command line option [new-option]
+ Binary package format [deb-format]
+ Source package format [dsc-format]
+ Architecture specific issue [arch]
diff --git a/doc/README.api b/doc/README.api
index fe575ad..6cd8eb2 100644
--- a/doc/README.api
+++ b/doc/README.api
@@ -31,7 +31,7 @@ What: custom changelog parsers in /usr/lib/dpkg/parsechangelog
Status: stable
Version: 2.0
Description:
- Since dpkg 1.14.16, the set of command-line options that custom
+ Since dpkg 1.14.16, the set of command line options that custom
changelog parsers must support has been expanded (see
dpkg-parsechangelog(1)). For compatibility, changelog parsers supporting
only the old options are supported in lenny. In lenny+1, that support
diff --git a/doc/triggers.txt b/doc/triggers.txt
index 77668ed..75579fa 100644
--- a/doc/triggers.txt
+++ b/doc/triggers.txt
@@ -312,7 +312,7 @@ by dpkg-trigger). dpkg-deb will be changed to warn about
unrecognised
trigger names syntaxes and unrecognised trigger control directives.
-New command-line interfaces to dpkg tools
+New command line interfaces to dpkg tools
-----------------------------------------
See dpkg(1).
diff --git a/man/dpkg-source.1 b/man/dpkg-source.1
index 2d83146..f752a4e 100644
--- a/man/dpkg-source.1
+++ b/man/dpkg-source.1
@@ -1,5 +1,5 @@
.\" Authors: Ian Jackson, Raphaël Hertzog
-.TH dpkg\-source 1 "2011-03-04" "Debian Project" "dpkg utilities"
+.TH dpkg\-source 1 "2011-07-03" "Debian Project" "dpkg utilities"
.SH NAME
dpkg\-source \- Debian source package (.dsc) manipulation tool
.
@@ -57,7 +57,7 @@ additional parameters might be accepted.
\fBdpkg\-source\fP will build the source package with the first format
found in this ordered list:
-the format indicated with the \fI\-\-format\fP command-line option,
+the format indicated with the \fI\-\-format\fP command line option,
the format indicated in \fBdebian/source/format\fP,
"1.0". The fallback to "1.0" is deprecated and will be removed at some
point in the future, you should always document the desired source format
diff --git a/man/dselect.1 b/man/dselect.1
index cddf29e..d20d499 100644
--- a/man/dselect.1
+++ b/man/dselect.1
@@ -1,4 +1,4 @@
-.TH dselect 1 "2010-03-07" "Debian Project" "Debian"
+.TH dselect 1 "2011-07-03" "Debian Project" "Debian"
.SH NAME
dselect \- Debian package management frontend
.
@@ -38,15 +38,15 @@ package \fBapt\fP.
Normally \fBdselect\fP is invoked without parameters. An interactive
menu is presented, offering the user a list of actions. If an action
is given as argument, then that action is started immediately. Several
-commandline parameters are still available to modify the running behaviour
+command line parameters are still available to modify the running behaviour
of \fBdselect\fP or show additional information about the program.
.
.SH OPTIONS
-All options can be specified both on the commandline and in the \fBdselect\fP
+All options can be specified both on the command line and in the \fBdselect\fP
configuration file \fI/etc/dpkg/dselect.cfg\fP or the files on the
configuration directory \fI/etc/dpkg/dpkg.cfg.d/\fP. Each line in the
configuration file is either an option (exactly the same as the
-commandline option but without leading dashes) or a comment (if it starts
+command line option but without leading dashes) or a comment (if it starts
with a \fB#\fR).
.br
.TP
diff --git a/man/dselect.cfg.5 b/man/dselect.cfg.5
index c6cfbed..8770a95 100644
--- a/man/dselect.cfg.5
+++ b/man/dselect.cfg.5
@@ -1,10 +1,10 @@
-.TH dselect.cfg 5 "2009-09-05" "Debian Project" "dpkg suite"
+.TH dselect.cfg 5 "2011-07-03" "Debian Project" "dpkg suite"
.SH NAME
dselect.cfg \- dselect configuration file
.
.SH DESCRIPTION
This file contains default options for dselect. Each line contains a
-single option which is exactly the same as a normal commandline
+single option which is exactly the same as a normal command line
option for dselect except for the leading dashes which are not used
here. Quotes surrounding option values are stripped. Comments are
allowed by starting a line with a hash sign ("\fB#\fR").
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
