aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/src/sgml/acronyms.sgml23
-rw-r--r--doc/src/sgml/config.sgml2
-rw-r--r--doc/src/sgml/libpq.sgml13
3 files changed, 30 insertions, 8 deletions
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 13bd819eb1d..9ed148ab842 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -411,6 +411,17 @@
</varlistentry>
<varlistentry>
+ <term><acronym>MITM</acronym></term>
+ <listitem>
+ <para>
+ <ulink
+ url="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">
+ Man-in-the-middle attack</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><acronym>MSVC</acronym></term>
<listitem>
<para>
@@ -591,6 +602,18 @@
</varlistentry>
<varlistentry>
+ <term><acronym>SNI</acronym></term>
+ <listitem>
+ <para>
+ <ulink
+ url="https://en.wikipedia.org/wiki/Server_Name_Indication">
+ Server Name Indication</ulink>,
+ <ulink url="https://tools.ietf.org/html/rfc6066#section-3">RFC 6066</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><acronym>SPI</acronym></term>
<listitem>
<para>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f5a753e5898..03b33cfb7e4 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1378,7 +1378,7 @@ include_dir 'conf.d'
<listitem>
<para>
Disables anonymous cipher suites that do no authentication. Such
- cipher suites are vulnerable to man-in-the-middle attacks and
+ cipher suites are vulnerable to <acronym>MITM</acronym> attacks and
therefore should not be used.
</para>
</listitem>
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 441cc0da3a3..641970f2a61 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1783,18 +1783,17 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
<listitem>
<para>
By default, libpq sets the TLS extension <quote>Server Name
- Indication</quote> (SNI) on SSL-enabled connections. See <ulink
- url="https://tools.ietf.org/html/rfc6066#section-3">RFC 6066</ulink>
- for details. By setting this parameter to 0, this is turned off.
+ Indication</quote> (<acronym>SNI</acronym>) on SSL-enabled connections.
+ By setting this parameter to 0, this is turned off.
</para>
<para>
The Server Name Indication can be used by SSL-aware proxies to route
connections without having to decrypt the SSL stream. (Note that this
requires a proxy that is aware of the PostgreSQL protocol handshake,
- not just any SSL proxy.) However, SNI makes the destination host name
- appear in cleartext in the network traffic, so it might be undesirable
- in some cases.
+ not just any SSL proxy.) However, <acronym>SNI</acronym> makes the
+ destination host name appear in cleartext in the network traffic, so
+ it might be undesirable in some cases.
</para>
</listitem>
</varlistentry>
@@ -8430,7 +8429,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
</varlistentry>
<varlistentry>
- <term>Man in the middle (<acronym>MITM</acronym>)</term>
+ <term>Man-in-the-middle (<acronym>MITM</acronym>)</term>
<listitem>
<para>If a third party can modify the data while passing between the
client and server, it can pretend to be the server and therefore see and