doc: Add acronyms for MITM and SNI

This adds MITM and SNI as acronyms, as the documentation already had
them marked up with .

While on it, make sure to spell man-in-the-middle with dashes
consistently, and add acronyms for those new terms where appropriate.

Author: Daniel Gustafsson
Reviewed-by: Michael Paquier
Discussion: https://postgr.es/m/CE12DD5C-4BB3-4166-BC9A-39779568734C@yesql.se

diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 13bd819eb1d63ec3f5af65fbc9f2f7522100752d..9ed148ab8420114ba5210b89c9ff3d09dd33eb44 100644 (file)
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -410,6 +410,17 @@
     
    
 
+   
+    MITM
+    
+     
+      
+      url="https://en.wikipedia.org/wiki/Man-in-the-middle_attack">
+      Man-in-the-middle attack
+     
+    
+   
+
    
     MSVC
     
@@ -590,6 +601,18 @@
     
    
 
+   
+    SNI
+    
+     
+      
+      url="https://en.wikipedia.org/wiki/Server_Name_Indication">
+       Server Name Indication,
+      RFC 6066
+     
+    
+   
+
    
     SPI
     


diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml

index f5a753e5898c48a698e8341ba8e5511c1b4e10e9..03b33cfb7e453aa39e0d1d973e1203e7ed368688 100644 (file)

--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1378,7 +1378,7 @@ include_dir 'conf.d'
           
            
             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 MITM attacks and
             therefore should not be used.
            
           


diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml

index 441cc0da3a3921a4c4b675f3c62feb798b95be50..641970f2a612d3f9dbd5b273e4abccd78f3172ed 100644 (file)

--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1783,18 +1783,17 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       
        
         By default, libpq sets the TLS extension Server Name
-        Indication (SNI) on SSL-enabled connections.  See 
-        url="https://tools.ietf.org/html/rfc6066#section-3">RFC 6066
-        for details.  By setting this parameter to 0, this is turned off.
+        Indication (SNI) on SSL-enabled connections.
+        By setting this parameter to 0, this is turned off.
        
 
        
         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, SNI makes the
+        destination host name appear in cleartext in the network traffic, so
+        it might be undesirable in some cases.
        
       
      
@@ -8430,7 +8429,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
     
 
     
-     Man in the middle (MITM)
+     Man-in-the-middle (MITM)
      
       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




This is the main PostgreSQL git repository.
RSS
Atom

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index f5a753e5898c48a698e8341ba8e5511c1b4e10e9..03b33cfb7e453aa39e0d1d973e1203e7ed368688 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1378,7 +1378,7 @@ include_dir 'conf.d'
           
            
             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 MITM attacks and
             therefore should not be used.
            
           

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 441cc0da3a3921a4c4b675f3c62feb798b95be50..641970f2a612d3f9dbd5b273e4abccd78f3172ed 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1783,18 +1783,17 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       
        
         By default, libpq sets the TLS extension Server Name
-        Indication (SNI) on SSL-enabled connections.  See 
-        url="https://tools.ietf.org/html/rfc6066#section-3">RFC 6066
-        for details.  By setting this parameter to 0, this is turned off.
+        Indication (SNI) on SSL-enabled connections.
+        By setting this parameter to 0, this is turned off.
        
 
        
         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, SNI makes the
+        destination host name appear in cleartext in the network traffic, so
+        it might be undesirable in some cases.
        
       
      
@@ -8430,7 +8429,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
     
 
     
-     Man in the middle (MITM)
+     Man-in-the-middle (MITM)
      
       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