[Pkg-gnupg-commit] [gpgme] 33/62: doc: Fix regression in macro handling

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gpgme.

commit 05775b52485a0d37033b26d696f36c622a4aa32e
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Nov 11 15:10:57 2016 +0100

    doc: Fix regression in macro handling
    
    --
    
    The way macros are handled seem to have changed since 2008.  Fix that:
    
    Reported-by: dkg at fifthhorseman.net
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 doc/gpgme.texi    |  8 ++++----
 doc/uiserver.texi | 30 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/doc/gpgme.texi b/doc/gpgme.texi
index c790537..ee5ba6d 100644
--- a/doc/gpgme.texi
+++ b/doc/gpgme.texi
@@ -31,11 +31,11 @@ General Public License for more details.
 @end copying
 
 @c Macros used by the description of the UI server protocol
- at macro clnt
-  @sc{c:} @c
+ at macro clnt{string}
+  @sc{c:} \string\
 @end macro
- at macro srvr
-  @sc{s:} @c
+ at macro srvr{string}
+  @sc{s:} \string\
 @end macro
 
 
diff --git a/doc/uiserver.texi b/doc/uiserver.texi
index 16e8f85..aae3b60 100644
--- a/doc/uiserver.texi
+++ b/doc/uiserver.texi
@@ -158,21 +158,21 @@ indicated by a @sc{c:}, server responses by @sc{c:}:
 
 @smallexample
 @group
-  @clnt RESET
-  @srvr OK
-  @clnt RECIPIENT foo@@example.net
-  @srvr OK
-  @clnt RECIPIENT bar@@example.com
-  @srvr OK
-  @clnt PREP_ENCRYPT
-  @srvr S PROTOCOL OpenPGP
-  @srvr OK
-  @clnt INPUT FD=17
-  @srvr OK
-  @clnt OUTPUT FD=18
-  @srvr OK
-  @clnt ENCRYPT
-  @srvr OK
+  @clnt{RESET}
+  @srvr{OK}
+  @clnt{RECIPIENT foo@@example.net}
+  @srvr{OK}
+  @clnt{RECIPIENT bar@@example.com}
+  @srvr{OK}
+  @clnt{PREP_ENCRYPT}
+  @srvr{S PROTOCOL OpenPGP}
+  @srvr{OK}
+  @clnt{INPUT FD=17}
+  @srvr{OK}
+  @clnt{OUTPUT FD=18}
+  @srvr{OK}
+  @clnt{ENCRYPT}
+  @srvr{OK}
 @end group
 @end smallexample
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gpgme.git