The following commit has been merged in the master branch:
commit ab776cbd87880f3712a8f44aa1f2bb630960d0b5
Author: Raphaël Hertzog <hert...@debian.org>
Date: Fri Apr 29 22:15:17 2011 +0200
deb-src-control(5), start-stop-daemon(8): small improvements
- Clarify that the Architecture field can contain architecture wildcards.
- Clarify when start-stop-daemon can exit 0 when --oknodo is used.
- Drop a sentence that was repeating something already said earlier.
Reported-by: Helge Kreutzmann <deb...@helgefjell.de>
diff --git a/man/deb-src-control.5 b/man/deb-src-control.5
index d0f5369..0c5ee67 100644
--- a/man/deb-src-control.5
+++ b/man/deb-src-control.5
@@ -1,6 +1,6 @@
.\" Author: Oxan van Leeuwen
.\" Includes text from the deb-control manual page by Raul Miller
-.TH deb\-src\-control 5 "2010-11-22" "Debian Project" "Debian"
+.TH deb\-src\-control 5 "2011-04-29" "Debian Project" "Debian"
.SH NAME
deb\-src\-control \- Debian source packages' master control file format
.
@@ -23,8 +23,8 @@ fields is generally joined to a single line by the tools
(except in the case of
the
.B Description
field, see below). To insert empty lines into a multi-line
-field, insert a dot after the space. The paragraphs are separated by an empty
-line. Lines starting with a \fB'#'\fP are treated as comments.
+field, insert a dot after the space. Lines starting with a \fB'#'\fP are
+treated as comments.
.
.SH SOURCE FIELDS
.TP
@@ -186,7 +186,10 @@ value. For packages that are architecture independent,
such as shell and Perl
scripts or documentation, use the
.B all
value. To restrict the packages to a certain set of architectures, specify the
-architecture names, separated by a space.
+architecture names, separated by a space. It's also possible to put
+architecture wildcards in that list (see
+.BR dpkg\-architecture (1)
+for more information about them).
.TP
.BR Package\-Type: " <deb|udeb>"
diff --git a/man/start-stop-daemon.8 b/man/start-stop-daemon.8
index 310b9af..fc39fd6 100644
--- a/man/start-stop-daemon.8
+++ b/man/start-stop-daemon.8
@@ -260,11 +260,12 @@ Print verbose informational messages.
.SH EXIT STATUS
.TP
.B 0
-The requested action was performed, or if
+The requested action was performed. If
.B \-\-oknodo
-is specified and either
+was specified, it's also possible that nothing had to be done.
+This can happen when
.B \-\-start
-was specified and a matching process was already running, or
+was specified and a matching process was already running, or when
.B \-\-stop
was specified and there were no matching processes.
.TP
--
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
