From 734dc5dc853769a750007b95b53c89d9fbfc8b5f Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Wed, 13 May 2020 16:46:49 +0200 Subject: [PATCH 2/2] doc: fix PEM prompt markup The same document was using literal and programlisting for showing the PEM pass phrase prompt, settle on using a single way to render the same thing. Also reword the actual prompt as both occurrences had different spelling with neither being wbat is actually used. --- doc/src/sgml/libpq.sgml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index c404429ae9..75c7c5837b 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1668,7 +1668,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname Specifying this parameter with any non-empty value suppresses the - Enter PEM passphrase: + Enter PEM pass phrase: prompt that OpenSSL will emit by default when an encrypted client certificate key is provided to libpq. @@ -7667,10 +7667,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*) may be provided in the connection option. If an encrypted key is supplied and the sslpassword option is absent or blank, a password will be prompted for interactively by - OpenSSL with a - - Enter PEM Passphrase: - + OpenSSL with a Enter PEM pass phrase: prompt if a TTY is available. Applications can override the client certificate prompt and the handling of the sslpassword parameter by supplying their own key password callback; see . -- 2.21.1 (Apple Git-122.3)