Merge branch 'master' into buildsystems

[debhelper.git] / debhelper.pod

diff --git a/debhelper.pod b/debhelper.pod
index 37f649fdc09585d2739c4172edc61f5230c7518f..8c232d2859bac1e3caac44cfed1beefb7a63cf21 100644 (file)
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -62,8 +62,8 @@ debian/control, debhelper will use debian/foo if no debian/package.foo
 file can be found.
 
 In some rare cases, you may want to have different versions of these files
-for different architectures or OSes. If files named debian/package.foo.arch
-or debian/package.foo.os exist, where "arch" and "os" are the same as the
+for different architectures or OSes. If files named debian/package.foo.ARCH
+or debian/package.foo.OS exist, where "ARCH" and "OS" are the same as the
 output of  "dpkg-architecture -qDEB_HOST_ARCH" /
 "dpkg-architecture -qDEB_HOST_ARCH_OS",
 then they will be used in preference to other, more general files.
@@ -491,8 +491,14 @@ Anything in this variable will be prepended to the command line arguments
 of all debhelper commands. Command-specific options will be ignored by 
 commands that do not support them. 
 
-This is useful in some situations, for example, if you need to pass -p to
-all debhelper commands that will be run. One good way to set DH_OPTIONS is
+Arguments are separated by whitespaces unless a whitespace is escaped
+with a backslash character (\). Then the whitespace is treated literally.
+Likewise, the backslash character is treated literally unless it is followed
+by a single whitespace. If a backslash is followed by two or more spaces,
+it will be considered as the last symbol of the argument.
+
+DH_OPTIONS is useful in some situations, for example, if you need to pass -p
+to all debhelper commands that will be run. One good way to set DH_OPTIONS is
 by using "Target-specific Variable Values" in your debian/rules file. See
 the make documentation for details on doing this.