[Emacs-diffs] Changes to emacs/man/pgg.texi

[Eli Zaretskii]

Index: emacs/man/pgg.texi
diff -c emacs/man/pgg.texi:1.6 emacs/man/pgg.texi:1.7
*** emacs/man/pgg.texi:1.6      Sat Oct 29 11:39:49 2005
--- emacs/man/pgg.texi  Fri Nov  4 14:44:06 2005
***************
*** 129,135 ****
  fails immediately, but if the function had been called interactively, it
  would ask you to retrieve the signer's public key from the server.
  
! @deffn Command pgg-encrypt-region start end recipients &optional sign
  Encrypt the current region between @var{start} and @var{end} for
  @var{recipients}.  When the function were called interactively, you
  would be asked about the recipients.
--- 129,135 ----
  fails immediately, but if the function had been called interactively, it
  would ask you to retrieve the signer's public key from the server.
  
! @deffn Command pgg-encrypt-region start end recipients &optional sign 
passphrase
  Encrypt the current region between @var{start} and @var{end} for
  @var{recipients}.  When the function were called interactively, you
  would be asked about the recipients.
***************
*** 138,166 ****
  the accessible portion) with the resulting data.
  
  If optional argument @var{sign} is address@hidden, the function is
! request to do a combined sign and encrypt.  This currently only work
! with GnuPG.
  @end deffn
  
! @deffn Command pgg-encrypt-symmetric-region start end
  Encrypt the current region between @var{start} and @var{end} using a
  symmetric cipher.  After invocation you are asked for a passphrase.
  
! This is currently only implemented for GnuPG.
  @end deffn
  
! @deffn Command pgg-decrypt-region start end
  Decrypt the current region between @var{start} and @var{end}.  If
  decryption is successful, it replaces the current region contents (in
  the accessible portion) with the resulting data.
  @end deffn
  
! @deffn Command pgg-sign-region start end &optional cleartext
  Make the signature from text between @var{start} and @var{end}.  If the
  optional third argument @var{cleartext} is address@hidden, or the
  function is called interactively, it does not create a detached
  signature.  In such a case, it replaces the current region contents (in
  the accessible portion) with the resulting data.
  @end deffn
  
  @deffn Command pgg-verify-region start end &optional signature fetch
--- 138,178 ----
  the accessible portion) with the resulting data.
  
  If optional argument @var{sign} is address@hidden, the function is
! request to do a combined sign and encrypt.  This currently is
! confirmed to work with GnuPG, but might not work with PGP or PGP5.
! 
! If optional @var{passphrase} is @code{nil}, the passphrase will be
! obtained from the passphrase cache or user.
  @end deffn
  
! @deffn Command pgg-encrypt-symmetric-region &optional start end passphrase
  Encrypt the current region between @var{start} and @var{end} using a
  symmetric cipher.  After invocation you are asked for a passphrase.
  
! If optional @var{passphrase} is @code{nil}, the passphrase will be
! obtained from the passphrase cache or user.
! 
! symmetric-cipher encryption is currently only implemented for GnuPG.
  @end deffn
  
! @deffn Command pgg-decrypt-region start end &optional passphrase
  Decrypt the current region between @var{start} and @var{end}.  If
  decryption is successful, it replaces the current region contents (in
  the accessible portion) with the resulting data.
+ 
+ If optional @var{passphrase} is @code{nil}, the passphrase will be
+ obtained from the passphrase cache or user.
  @end deffn
  
! @deffn Command pgg-sign-region start end &optional cleartext passphrase
  Make the signature from text between @var{start} and @var{end}.  If the
  optional third argument @var{cleartext} is address@hidden, or the
  function is called interactively, it does not create a detached
  signature.  In such a case, it replaces the current region contents (in
  the accessible portion) with the resulting data.
+ 
+ If optional @var{passphrase} is @code{nil}, the passphrase will be
+ obtained from the passphrase cache or user.
  @end deffn
  
  @deffn Command pgg-verify-region start end &optional signature fetch
***************
*** 309,334 ****
  keyrings.
  @end deffn
  
! @deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional 
sign
  Encrypt the current region between @var{start} and @var{end} for
  @var{recipients}.  If @var{sign} is address@hidden, do a combined sign
  and encrypt.  If encryption is successful, it returns @code{t},
  otherwise @code{nil}.
  @end deffn
  
! @deffn Method pgg-scheme-encrypt-symmetric-region scheme start end
  Encrypt the current region between @var{start} and @var{end} using a
  symmetric cipher and a passphrases.  If encryption is successful, it
  returns @code{t}, otherwise @code{nil}.  This function is currently only
  implemented for GnuPG.
  @end deffn
  
! @deffn Method pgg-scheme-decrypt-region scheme start end
  Decrypt the current region between @var{start} and @var{end}.  If
  decryption is successful, it returns @code{t}, otherwise @code{nil}.
  @end deffn
  
! @deffn Method pgg-scheme-sign-region scheme start end &optional cleartext
  Make the signature from text between @var{start} and @var{end}.  If the
  optional third argument @var{cleartext} is address@hidden, it does not
  create a detached signature.  If signing is successful, it returns
--- 321,346 ----
  keyrings.
  @end deffn
  
! @deffn Method pgg-scheme-encrypt-region scheme start end recipients &optional 
sign passphrase
  Encrypt the current region between @var{start} and @var{end} for
  @var{recipients}.  If @var{sign} is address@hidden, do a combined sign
  and encrypt.  If encryption is successful, it returns @code{t},
  otherwise @code{nil}.
  @end deffn
  
! @deffn Method pgg-scheme-encrypt-symmetric-region scheme start end &optional 
passphrase
  Encrypt the current region between @var{start} and @var{end} using a
  symmetric cipher and a passphrases.  If encryption is successful, it
  returns @code{t}, otherwise @code{nil}.  This function is currently only
  implemented for GnuPG.
  @end deffn
  
! @deffn Method pgg-scheme-decrypt-region scheme start end &optional passphrase
  Decrypt the current region between @var{start} and @var{end}.  If
  decryption is successful, it returns @code{t}, otherwise @code{nil}.
  @end deffn
  
! @deffn Method pgg-scheme-sign-region scheme start end &optional cleartext 
passphrase
  Make the signature from text between @var{start} and @var{end}.  If the
  optional third argument @var{cleartext} is address@hidden, it does not
  create a detached signature.  If signing is successful, it returns