Skip to content

Commit 07451e1

Browse files
committed
Doc: Fix some inconsistencies with markups
This addresses some whitespace issues with programlisting, and corrects the spelling of "Enter PEM pass phrase" to be consistent with the code. Author: Daniel Gustafsson Discussion: https://postgr.es/m/[email protected]
1 parent 267cc6e commit 07451e1

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

‎doc/src/sgml/datatype.sgml

+9-3
Original file line numberDiff line numberDiff line change
@@ -2095,11 +2095,15 @@ January 8 04:05:06 1999 PST
20952095
<quote>+</quote> or <quote>-</quote> symbol and time zone offset after
20962096
the time. Hence, according to the standard,
20972097

2098-
<programlisting>TIMESTAMP '2004-10-19 10:23:54'</programlisting>
2098+
<programlisting>
2099+
TIMESTAMP '2004-10-19 10:23:54'
2100+
</programlisting>
20992101

21002102
is a <type>timestamp without time zone</type>, while
21012103

2102-
<programlisting>TIMESTAMP '2004-10-19 10:23:54+02'</programlisting>
2104+
<programlisting>
2105+
TIMESTAMP '2004-10-19 10:23:54+02'
2106+
</programlisting>
21032107

21042108
is a <type>timestamp with time zone</type>.
21052109
<productname>PostgreSQL</productname> never examines the content of a
@@ -2108,7 +2112,9 @@ January 8 04:05:06 1999 PST
21082112
ensure that a literal is treated as <type>timestamp with time
21092113
zone</type>, give it the correct explicit type:
21102114

2111-
<programlisting>TIMESTAMP WITH TIME ZONE '2004-10-19 10:23:54+02'</programlisting>
2115+
<programlisting>
2116+
TIMESTAMP WITH TIME ZONE '2004-10-19 10:23:54+02'
2117+
</programlisting>
21122118

21132119
In a literal that has been determined to be <type>timestamp without time
21142120
zone</type>, <productname>PostgreSQL</productname> will silently ignore

‎doc/src/sgml/libpq.sgml

+5-8
Original file line numberDiff line numberDiff line change
@@ -790,9 +790,9 @@ void PQsetSSLKeyPassHook(PQsslKeyPassHook_type hook);
790790
</synopsis>
791791

792792
The application passes a pointer to a callback function with signature:
793-
<programlisting>
794-
int callback_fn(char *buf, int size, PGconn *conn);
795-
</programlisting>
793+
<programlisting>
794+
int callback_fn(char *buf, int size, PGconn *conn);
795+
</programlisting>
796796
which <literal>libpq</literal> will then call <emphasis>instead of</emphasis>
797797
its default <function>PQdefaultSSLKeyPassHook</function> handler. The callback
798798
should determine the password for the key and copy it to result-buffer
@@ -1668,7 +1668,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
16681668
</para>
16691669
<para>
16701670
Specifying this parameter with any non-empty value suppresses the
1671-
<literal>Enter PEM passphrase:</literal>
1671+
<literal>Enter PEM pass phrase:</literal>
16721672
prompt that OpenSSL will emit by default when an encrypted client
16731673
certificate key is provided to <literal>libpq</literal>.
16741674
</para>
@@ -7667,10 +7667,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
76677667
may be provided in the <xref linkend="libpq-connect-sslpassword"/> connection
76687668
option. If an encrypted key is supplied and the <literal>sslpassword</literal>
76697669
option is absent or blank, a password will be prompted for interactively by
7670-
OpenSSL with a
7671-
<programlisting>
7672-
Enter PEM Passphrase:
7673-
</programlisting>
7670+
OpenSSL with a <literal>Enter PEM pass phrase:</literal>
76747671
prompt if a TTY is available. Applications can override the client certificate
76757672
prompt and the handling of the <literal>sslpassword</literal> parameter by supplying
76767673
their own key password callback; see <xref linkend="libpq-pqsetsslkeypasshook"/>.

‎doc/src/sgml/postgres-fdw.sgml

+4-4
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@
151151
<para>
152152
A superuser may override this check on a per-user-mapping basis by setting
153153
the user mapping option <literal>password_required 'false'</literal>, e.g.
154-
<programlisting>
155-
ALTER USER MAPPING FOR some_non_superuser SERVER loopback_nopw
156-
OPTIONS (ADD password_required 'false');
157-
</programlisting>
154+
<programlisting>
155+
ALTER USER MAPPING FOR some_non_superuser SERVER loopback_nopw
156+
OPTIONS (ADD password_required 'false');
157+
</programlisting>
158158
To prevent unprivileged users from exploiting the authentication rights
159159
of the unix user the postgres server is running as to escalate to superuser
160160
rights, only the superuser may set this option on a user mapping.

0 commit comments

Comments
 (0)