doc: Write hyphen instead of dash when we mean the ‘-’ character

debian/changelog

@@ -73,6 +73,8 @@ dpkg (1.17.2) UNRELEASED; urgency=low
   * Improve and unify -O option handling in dpkg-genchanges, dpkg-gensymbols
     and dpkg-shlibdeps, by always taking an optional filename argument and
     describing in the man page the default output files.
+  * Use “hyphen” instead of “dash” when we mean the ‘-’ character in the
+    documentation and code comments.
 
   [ Updated programs translations ]
   * German (Sven Joachim).

lib/dpkg/arch.c

@@ -47,7 +47,7 @@
  * Returns NULL if the architecture name is valid. Otherwise it returns a
  * string describing why it's not valid. Currently it ensures the name
  * starts with an alphanumeric and is then composed of a combinations of
- * dashes and alphanumerics.
+ * hyphens and alphanumerics.
  *
  * The function will abort if you pass it a NULL pointer.
  *

lib/dpkg/test/t-version.c

@@ -197,7 +197,7 @@ test_version_parse(void)
 	test_pass(parseversion(&a, "5:1", NULL) == 0);
 	test_pass(dpkg_version_compare(&a, &b) == 0);
 
-	/* Test multiple dashes. */
+	/* Test multiple hyphens. */
 	b = version(0, "0-0", "0");
 	test_pass(parseversion(&a, "0:0-0-0", NULL) == 0);
 	test_pass(dpkg_version_compare(&a, &b) == 0);
@@ -215,7 +215,7 @@ test_version_parse(void)
 	test_pass(parseversion(&a, "0:0:0:0-0", NULL) == 0);
 	test_pass(dpkg_version_compare(&a, &b) == 0);
 
-	/* Test multiple dashes and colons. */
+	/* Test multiple hyphens and colons. */
 	b = version(0, "0:0-0", "0");
 	test_pass(parseversion(&a, "0:0:0-0-0", NULL) == 0);
 	test_pass(dpkg_version_compare(&a, &b) == 0);

man/dpkg-architecture.1

@@ -115,7 +115,7 @@ any real architecture being part of it. The general form is <kernel>\-<cpu>.
 Examples: linux\-any, any\-i386, hurd\-any.
 .IP "GNU system type" 4
 An architecture specification string consisting of two parts separated by
-a dash: cpu and system. Examples: i386\-linux\-gnu, sparc\-linux\-gnu,
+a hyphen: cpu and system. Examples: i386\-linux\-gnu, sparc\-linux\-gnu,
 i386\-gnu, x86_64\-netbsd.
 .
 .SH VARIABLES

man/dpkg-maintscript-helper.1

@@ -40,7 +40,7 @@ scripts (\fBpreinst\fP, \fBpostinst\fP, \fBprerm\fP, \fBpostrm\fP). To
 avoid mistakes the same call simply needs to be put in all scripts and the
 program will automatically adapt its behaviour based on the environment
 variable \fBDPKG_MAINTSCRIPT_NAME\fP and on the maintainer scripts arguments
-that you have to forward after a double dash.
+that you have to forward after a double hyphen.
 .
 .SH CONFFILE RELATED TASKS
 .P

man/dpkg-source.1

@@ -425,7 +425,7 @@ an original tarball (\fB.orig.tar.\fP\fIext\fP where \fIext\fP can be
 \fBgz\fP, \fBbz2\fP, \fBlzma\fP and \fBxz\fP) and a debian tarball
 (\fB.debian.tar.\fP\fIext\fP). It can also contain additional original
 tarballs (\fB.orig\-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
-\fIcomponent\fP can only contain alphanumeric characters and dashes ("\-").
+\fIcomponent\fP can only contain alphanumeric characters and hyphens ("\-").
 .PP
 .B Extracting
 .PP

man/dpkg.1

@@ -370,7 +370,7 @@ configuration file \fI/etc/dpkg/dpkg.cfg\fP or fragment files (with names
 matching this shell pattern \(aq[0-9a-zA-Z_-]*\(aq) 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 command line option but
-without leading dashes) or a comment (if it starts with a \fB#\fR).
+without leading hyphens) or a comment (if it starts with a \fB#\fR).
 .br
 .TP
 \fB\-\-abort\-after=\fP\fInumber\fP

man/dpkg.cfg.5

@@ -23,7 +23,7 @@ dpkg.cfg \- dpkg configuration file
 .SH DESCRIPTION
 This file contains default options for dpkg. Each line contains a
 single option which is exactly the same as a normal command line
-option for dpkg except for the leading dashes which are not used
+option for dpkg except for the leading hyphens which are not used
 here. Quotes surrounding option values are stripped. Comments are
 allowed by starting a line with a hash sign ("\fB#\fR").
 .

man/dselect.1

@@ -59,7 +59,7 @@ 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/dselect.cfg.d/\fP. Each line in the
 configuration file is either an option (exactly the same as the
-command line option but without leading dashes) or a comment (if it starts
+command line option but without leading hyphens) or a comment (if it starts
 with a \fB#\fR).
 .br
 .TP

man/dselect.cfg.5

@@ -23,7 +23,7 @@ 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 command line
-option for dselect except for the leading dashes which are not used
+option for dselect except for the leading hyphens which are not used
 here. Quotes surrounding option values are stripped. Comments are
 allowed by starting a line with a hash sign ("\fB#\fR").
 .

scripts/Dpkg/Conf.pm

@@ -49,7 +49,7 @@ file. It can exports an array that can then be parsed exactly like @ARGV.
 Create a new Dpkg::Conf object. Some options can be set through %opts:
 if allow_short evaluates to true (it defaults to false), then short
 options are allowed in the configuration file, they should be prepended
-with a single dash.
+with a single hyphen.
 
 =cut
 

scripts/Dpkg/Control/FieldsCore.pm

@@ -395,7 +395,7 @@ CTRL_* constants exported by Dpkg::Control.
 =item my $f = field_capitalize($field_name)
 
 Returns the field name properly capitalized. All characters are lowercase,
-except the first of each word (words are separated by a dash in field names).
+except the first of each word (words are separated by a hyphen in field names).
 
 =cut