From 98bb697f332fdfaccac6d1927a7a858e17f9ab8f Mon Sep 17 00:00:00 2001
From: Magnus Hagander <magnus@hagander.net>
Date: Thu, 17 Jan 2008 11:06:28 +0000
Subject: [PATCH] pgcrypto doc updates

Marko Kreen
---
 doc/src/sgml/pgcrypto.sgml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml
index 892dfdca2b..5c5e7a80f8 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.4 2008/01/05 13:17:00 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/pgcrypto.sgml,v 1.5 2008/01/17 11:06:28 mha Exp $ -->
 
 <sect1 id="pgcrypto">
  <title>pgcrypto</title>
@@ -26,8 +26,10 @@
    <para>
     Computes a binary hash of the given <parameter>data</>.
     <parameter>type</> is the algorithm to use.
-    Standard algorithms are <literal>md5</literal> and
-    <literal>sha1</literal>.  If <filename>pgcrypto</> was built with
+    Standard algorithms are <literal>md5</literal>, <literal>sha1</literal>,
+    <literal>sha224</literal>, <literal>sha256</literal>,
+    <literal>sha384</literal> and <literal>sha512</literal>.
+    If <filename>pgcrypto</> was built with
     OpenSSL, more algorithms are available, as detailed in
     <xref linkend="pgcrypto-with-without-openssl">.
    </para>
@@ -390,7 +392,7 @@
   <title>PGP encryption functions</title>
 
   <para>
-   The functions here implement the encryption part of the OpenPGP (RFC 2440)
+   The functions here implement the encryption part of the OpenPGP (RFC 4880)
    standard.  Supported are both symmetric-key and public-key encryption.
   </para>
 
@@ -657,7 +659,7 @@
 
    <para>
     Which compression algorithm to use.  Only available if
-    <filename>pgcrypto</> was built with zlib.
+    <productname>PostgreSQL<productname/> was built with zlib.
    </para>
    <programlisting>
     Values:
@@ -689,7 +691,7 @@
    <para>
     Whether to convert <literal>\n</literal> into <literal>\r\n</literal> when
     encrypting and <literal>\r\n</literal> to <literal>\n</literal> when
-    decrypting.  RFC 2440 specifies that text data should be stored using
+    decrypting.  RFC 4880 specifies that text data should be stored using
     <literal>\r\n</literal> line-feeds.  Use this to get fully RFC-compliant
     behavior.
    </para>
@@ -706,7 +708,7 @@
    <para>
     Do not protect data with SHA-1.  The only good reason to use this
     option is to achieve compatibility with ancient PGP products, predating
-    the addition of SHA-1 protected packets to RFC 2440.
+    the addition of SHA-1 protected packets to RFC 4880.
     Recent gnupg.org and pgp.com software supports it fine.
    </para>
    <programlisting>
@@ -1172,15 +1174,9 @@
 
    <itemizedlist>
     <listitem>
-     <para><ulink url="http://www.ietf.org/rfc/rfc2440.txt"></ulink></para>
+     <para><ulink url="http://www.ietf.org/rfc/rfc4880.txt"></ulink></para>
      <para>OpenPGP message format.</para>
     </listitem>
-    <listitem>
-     <para>
-      <ulink url="http://www.imc.org/draft-ietf-openpgp-rfc2440bis"></ulink>
-     </para>
-     <para>New version of RFC 2440.</para>
-    </listitem>
     <listitem>
      <para><ulink url="http://www.ietf.org/rfc/rfc1321.txt"></ulink></para>
      <para>The MD5 Message-Digest Algorithm.</para>
-- 
2.40.0