Imported Upstream version 1.5.2upstream/1.5.2

1 files changed, 31 insertions, 12 deletions

diff --git a/doc/gpgme.info-1 b/doc/gpgme.info-1
index bdfd347..640f693 100644
--- a/doc/gpgme.info-1
+++ b/doc/gpgme.info-1
@@ -22,8 +22,8 @@ General Public License for more details.
 
    This file documents the GPGME library.
 
-   This is Edition 1.5.1, last updated 30 July 2014, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.5.1.
+   This is Edition 1.5.2, last updated 6 November 2014, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.5.2.
 
    Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
 2013, 2014 g10 Code GmbH.
@@ -45,8 +45,8 @@ File: gpgme.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Main Menu
 *********
 
-This is Edition 1.5.1, last updated 30 July 2014, of `The `GnuPG Made
-Easy' Reference Manual', for Version 1.5.1 of the GPGME library.
+This is Edition 1.5.2, last updated 6 November 2014, of `The `GnuPG
+Made Easy' Reference Manual', for Version 1.5.2 of the GPGME library.
 
 * Menu:
 
@@ -351,8 +351,8 @@ types and `GPGME_*' for other symbols.  Symbols internal to GPGME take
 the form `_gpgme_*' and `_GPGME_*'.
 
    Because GPGME makes use of the GPG Error library, using GPGME will
-also use the `GPG_ERR_*' name space directly, and the `gpg_err*' and
-`gpg_str*' name space indirectly.
+also use the `GPG_ERR_*' name space directly, and the `gpg_err*',
+`gpg_str*', and `gpgrt_*' name space indirectly.
 
 
 File: gpgme.info,  Node: Building the Source,  Next: Largefile Support (LFS),  Prev: Header,  Up: Preparation
@@ -520,7 +520,10 @@ to Automake that does all the work for you.
      Additionally, the function defines `GPGME_CFLAGS' to the flags
      needed for compilation of the program to find the `gpgme.h' header
      file, and `GPGME_LIBS' to the linker flags needed to link the
-     program to the GPGME library.
+     program to the GPGME library.  If the used helper script does not
+     match the target type you are building for a warning is printed
+     and the string `libgcrypt' is appended to the variable
+     `gpg_config_script_warn'.
 
      `AM_PATH_GPGME_PTH' checks for the version of GPGME that can be
      used with GNU Pth, and defines `GPGME_PTH_CFLAGS' and
@@ -530,6 +533,16 @@ to Automake that does all the work for you.
      be used with the native pthread implementation, and defines
      `GPGME_PTHREAD_CFLAGS' and `GPGME_PTHREAD_LIBS'.
 
+     This macro searches for `gpgme-config' along the PATH.  If you are
+     cross-compiling, it is useful to set the environment variable
+     `SYSROOT' to the top directory of your target.  The macro will
+     then first look for the helper program in the `bin' directory
+     below that top directory.  An absolute directory name must be used
+     for `SYSROOT'.  Finally, if the configure command line option
+     `--with-gpgme-prefix' is used, only its value is used for the top
+     directory below which the helper script is expected.
+
+
    You can use the defined Autoconf variables like this in your
 `Makefile.am':
 
@@ -6001,7 +6014,7 @@ before the final OK response:
 
  -- Status line: MICALG STRING
      The STRING represents the hash algorithm used to create the
-     signature. It is used with MOSS style signature messages and
+     signature. It is used with RFC-1847 style signature messages and
      defined by PGP/MIME (RFC-3156) and S/MIME (RFC-3851).  The GPGME
      library has a supporting function `gpgme_hash_algo_name' to return
      the algorithm name as a string.  This string needs to be
@@ -6139,13 +6152,18 @@ A.5 UI Server: Specifying the input files to operate on.
 All file related UI server commands operate on a number of input files
 or directories, specified by one or more `FILE' commands:
 
- -- Command: FILE NAME [-continued]
+ -- Command: FILE [-clear] NAME
      Add the file or directory NAME to the list of pathnames to be
      processed by the server.  The parameter NAME must be an absolute
      path name (including the drive letter) and is percent espaced (in
      particular, the characters %, = and white space characters are
-     always escaped).  The option `--continued' is present for all but
-     the last `FILE' command.
+     always escaped).  If the option `--clear' is given, the list of
+     files is cleared before adding NAME.
+
+     Historical note: The original spec did not define `--clear' but
+     the keyword `--continued' after the file name to indicate that
+     more files are to be expected.  However, this has never been used
+     and thus removed from the specs.
 
 
 File: gpgme.info,  Node: UI Server Sign/Encrypt Files,  Next: UI Server Verify/Decrypt Files,  Prev: UI Server Set Input Files,  Up: UI Server Protocol
@@ -6388,7 +6406,8 @@ line.  If you can't figure out why things don't work, you may use
 GPGME's built in trace feature.  This feature is either enabled using
 the environment variable `GPGME_DEBUG' or, if this is not possible, by
 calling the function `gpgme_set_global_flag'.  The value is the trace
-level and an optional file name.
+level and an optional file name.  If no file name is given the trace
+output is printed to `stderr'.
 
 For example
      GPGME_DEBUG=9:/home/user/mygpgme.log