Преглед изворни кода

Escape hyphens in man pages.

Guillem Jover пре 20 година
родитељ
комит
a52275368f
5 измењених фајлова са 20 додато и 13 уклоњено
  1. 1 0
      debian/changelog
  2. 6 6
      man/C/dpkg-architecture.1
  3. 5 5
      man/C/dpkg-divert.8
  4. 2 2
      man/C/dpkg-statoverride.8
  5. 6 0
      man/ChangeLog

+ 1 - 0
debian/changelog

@@ -55,6 +55,7 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
     when checking if the locking error was due to an already existing
     when checking if the locking error was due to an already existing
     file, which is locale dependent, and die accordingly. Based on a patch
     file, which is locale dependent, and die accordingly. Based on a patch
     by Nicolas François. Closes: #199204, #210781
     by Nicolas François. Closes: #199204, #210781
+  * Escape hyphens in man pages.
 
 
  -- Bart Cornelis (cobaco) <cobaco@linux.be>  Thu,  4 May 2006 10:36:12 +0200
  -- Bart Cornelis (cobaco) <cobaco@linux.be>  Thu,  4 May 2006 10:36:12 +0200
 
 

+ 6 - 6
man/C/dpkg-architecture.1

@@ -1,4 +1,4 @@
-.TH dpkg\-architecture 1 "2006-02-28" "Debian Project" "dpkg utilities"
+.TH dpkg\-architecture 1 "2006-05-04" "Debian Project" "dpkg utilities"
 .SH "NAME"
 .SH "NAME"
 dpkg\-architecture \- set and determine the architecture for package building
 dpkg\-architecture \- set and determine the architecture for package building
 .
 .
@@ -187,18 +187,18 @@ You may wish to retain backwards compatibility with older version of
 dpkg-dev by using the following code:
 dpkg-dev by using the following code:
 .IP
 .IP
 .nf
 .nf
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
+DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_CPU 2>/dev/null)
+DEB_HOST_ARCH_OS := $(shell dpkg\-architecture \-qDEB_HOST_ARCH_OS 2>/dev/null)
 
 
-# Take account of old dpkg-architecture output.
+# Take account of old dpkg\-architecture output.
 ifeq ($(DEB_HOST_ARCH_CPU),)
 ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+  DEB_HOST_ARCH_CPU := $(shell dpkg\-architecture \-qDEB_HOST_GNU_CPU)
   ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
   ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
     DEB_HOST_ARCH_CPU := amd64
     DEB_HOST_ARCH_CPU := amd64
   endif
   endif
 endif
 endif
 ifeq ($(DEB_HOST_ARCH_OS),)
 ifeq ($(DEB_HOST_ARCH_OS),)
-  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM))
+  DEB_HOST_ARCH_OS := $(subst \-gnu,,$(shell dpkg\-architecture \-qDEB_HOST_GNU_SYSTEM))
   ifeq ($(DEB_HOST_ARCH_OS),gnu)
   ifeq ($(DEB_HOST_ARCH_OS),gnu)
     DEB_HOST_ARCH_OS := hurd
     DEB_HOST_ARCH_OS := hurd
   endif
   endif

+ 5 - 5
man/C/dpkg-divert.8

@@ -1,4 +1,4 @@
-.TH dpkg\-divert 8 "2006-02-28" "Debian Project" "dpkg utilities"
+.TH dpkg\-divert 8 "2006-05-04" "Debian Project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-divert - override a package's version of a file
 dpkg\-divert - override a package's version of a file
 .
 .
@@ -87,21 +87,21 @@ pointing at the diverted library.
 To divert all copies of a \fI/usr/bin/example.foo\fR to \fI/usr/bin/example\fR,
 To divert all copies of a \fI/usr/bin/example.foo\fR to \fI/usr/bin/example\fR,
 performing the rename if required:
 performing the rename if required:
 .HP
 .HP
-dpkg-divert --divert /usr/bin/example --rename /usr/bin/example.foo
+dpkg-divert \-\-divert /usr/bin/example \-\-rename /usr/bin/example.foo
 .PP
 .PP
 To remove that diversion:
 To remove that diversion:
 .HP
 .HP
-dpkg-divert --rename --remove /usr/bin/example.foo
+dpkg-divert \-\-rename \-\-remove /usr/bin/example.foo
 
 
 .PP
 .PP
 To divert any package trying to install \fI/usr/bin/example\fR to
 To divert any package trying to install \fI/usr/bin/example\fR to
 \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package:
 \fI/usr/bin/example.foo\fR, except your own \fIwibble\fR package:
 .HP
 .HP
-dpkg-divert --package wibble --divert /usr/bin/example.foo --rename /usr/bin/example
+dpkg-divert \-\-package wibble \-\-divert /usr/bin/example.foo \-\-rename /usr/bin/example
 .PP
 .PP
 To remove that diversion:
 To remove that diversion:
 .HP
 .HP
-dpkg-divert --package wibble --rename --remove /usr/bin/example
+dpkg-divert \-\-package wibble \-\-rename \-\-remove /usr/bin/example
 .
 .
 .SH FILES
 .SH FILES
 .TP
 .TP

+ 2 - 2
man/C/dpkg-statoverride.8

@@ -1,4 +1,4 @@
-.TH dpkg\-statoverride 8 "2006-02-28" "Debian project" "dpkg utilities"
+.TH dpkg\-statoverride 8 "2006-05-04" "Debian project" "dpkg utilities"
 .SH NAME
 .SH NAME
 dpkg\-statoverride - override ownership and mode of files
 dpkg\-statoverride - override ownership and mode of files
 .
 .
@@ -75,7 +75,7 @@ is located in the dpkg administration directory, along with other files
 important to dpkg, such as `status' or `available'.
 important to dpkg, such as `status' or `available'.
 .br
 .br
 Note: dpkg\-statoverride preserves the old copy of this file, with
 Note: dpkg\-statoverride preserves the old copy of this file, with
-extension "-old", before replacing it with the new one.
+extension "\-old", before replacing it with the new one.
 .
 .
 .SH SEE ALSO
 .SH SEE ALSO
 .BR dpkg (1).
 .BR dpkg (1).

+ 6 - 0
man/ChangeLog

@@ -1,3 +1,9 @@
+2006-05-04  Guillem Jover  <guillem@debian.org>
+
+	* C/dpkg-divert.8: Escape hyphens used in command line.
+	* C/dpkg-architecture.1: Likewise.
+	* C/dpkg-statoverride.8: Likewise.
+
 2006-05-02  Guillem Jover  <guillem@debian.org>
 2006-05-02  Guillem Jover  <guillem@debian.org>
 
 
 	* C/dpkg-source.1: Rename dpkg:UpstreamVersion to
 	* C/dpkg-source.1: Rename dpkg:UpstreamVersion to