From 21495a2bb7599fb7546b146ca33bd7c6157c1472 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 3 Nov 2014 11:11:34 -0500 Subject: [PATCH] Docs: fix incorrect spelling of contrib/pgcrypto option. pgp_sym_encrypt's option is spelled "sess-key", not "enable-session-key". Spotted by Jeff Janes. In passing, improve a comment in pgp-pgsql.c to make it clearer that the debugging options are intentionally undocumented. --- contrib/pgcrypto/pgp-pgsql.c | 5 ++++- doc/src/sgml/pgcrypto.sgml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/contrib/pgcrypto/pgp-pgsql.c b/contrib/pgcrypto/pgp-pgsql.c index ad1fd08427..3f39e53559 100644 --- a/contrib/pgcrypto/pgp-pgsql.c +++ b/contrib/pgcrypto/pgp-pgsql.c @@ -241,7 +241,10 @@ set_arg(PGP_Context *ctx, char *key, char *val, res = pgp_set_convert_crlf(ctx, atoi(val)); else if (strcmp(key, "unicode-mode") == 0) res = pgp_set_unicode_mode(ctx, atoi(val)); - /* decrypt debug */ + /* + * The remaining options are for debugging/testing and are therefore not + * documented in the user-facing docs. + */ else if (ex != NULL && strcmp(key, "debug") == 0) ex->debug = atoi(val); else if (ex != NULL && strcmp(key, "expect-cipher-algo") == 0) diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml index 544a1f8346..b0ee4c1e73 100644 --- a/doc/src/sgml/pgcrypto.sgml +++ b/doc/src/sgml/pgcrypto.sgml @@ -802,11 +802,11 @@ Applies to: pgp_sym_encrypt, pgp_pub_encrypt - enable-session-key + sess-key Use separate session key. Public-key encryption always uses a separate - session key; this is for symmetric-key encryption, which by default + session key; this option is for symmetric-key encryption, which by default uses the S2K key directly.