Rev 6500: (jelmer) Properly format apostrophes in manual page. (Jelmer Vernooij) in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6500 [merge]
revision-id: pqm at pqm.ubuntu.com-20120314131706-xv4l56l4e3vjlaeo
parent: pqm at pqm.ubuntu.com-20120313093600-lb7qlh29e7d7kr68
parent: jelmer at samba.org-20120314103427-05r1o2yzdatbhtw6
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2012-03-14 13:17:06 +0000
message:
  (jelmer) Properly format apostrophes in manual page. (Jelmer Vernooij)
modified:
  bzrlib/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  doc/en/release-notes/bzr-2.6.txt bzr2.6.txt-20120116134316-8w1xxom1c7vcu1t5-1
=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- a/bzrlib/doc_generate/autodoc_man.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/doc_generate/autodoc_man.py	2012-03-14 10:34:27 +0000
@@ -57,8 +57,8 @@
 def man_escape(string):
     """Escapes strings for man page compatibility"""
     result = string.replace("\\","\\\\")
-    result = result.replace("`","\\`")
-    result = result.replace("'","\\'")
+    result = result.replace("`","\\'")
+    result = result.replace("'","\\*(Aq")
     result = result.replace("-","\\-")
     return result
 
@@ -165,6 +165,9 @@
 .\\\"
 .\\\" Generation time: %(timestamp)s
 .\\\"
+
+.ie \\n(.g .ds Aq \\(aq
+.el .ds Aq '
 """
 
 

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- a/doc/en/release-notes/bzr-2.6.txt	2012-03-12 13:38:09 +0000
+++ b/doc/en/release-notes/bzr-2.6.txt	2012-03-14 10:29:44 +0000
@@ -64,6 +64,8 @@
 
 .. Improved or updated documentation.
 
+* Properly format apostrophes in manual page. (Jelmer Vernooij, #234771)
+
 API Changes
 ***********