doc: Clarify when SSL actually means TLS

SSL has become the de facto term to mean an end-to-end encrypted channel
regardless of protocol used, even though the SSL protocol is deprecated.
Clarify what we mean with SSL in our documentation, especially for new
users who might be looking for TLS.

Reviewed-by: Robert Haas 
Discussion: https://postgr.es/m/D4ABB281-6CFD-46C6-A4E0-8EC23A2977BC@yesql.se

diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 05df48131d7e66f4039edd9d90a930b59b73a294..9788e831bc91be78cf4c1567faa8f66c752a969f 100644 (file)
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -1184,7 +1184,13 @@ include_dir 'conf.d'
      SSL
 
      
-      See  for more information about setting up SSL.
+      See  for more information about setting up
+      SSL. The configuration parameters for controlling
+      transfer encryption using TLS protocols are named
+      ssl for historic reasons, even though support for
+      the SSL protocol has been deprecated.
+      SSL is in this context used interchangeably with
+      TLS.
      
 
      

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index eac5dee9f76ec7747c551c40406f2214785af05c..0b2a8720f048a0deaa742788f78d9a66ae83c670 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -8292,12 +8292,14 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
 
   
    SSL
+   TLS
   
 
   
    PostgreSQL has native support for using SSL
-   connections to encrypt client/server communications for increased
-   security. See  for details about the server-side
+   connections to encrypt client/server communications using
+   TLS protocols for increased security.
+   See  for details about the server-side
    SSL functionality.
   
 

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 3a463f12d75850acab1803e7b9f6baa41a9af33c..1f021ea116f827d1327232077204ba3bdea61373 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -2182,6 +2182,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
 
   
    SSL
+   TLS
   
 
   
@@ -2193,13 +2194,25 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    enabled at build time (see ).
   
 
+  
+   The terms SSL and TLS are often used
+   interchangeably to mean a secure encrypted connection using a
+   TLS protocol. SSL protocols are the
+   precursors to TLS protocols, and the term
+   SSL is still used for encrypted connections even though
+   SSL protocols are no longer supported. 
+   SSL is used interchangeably with TLS
+   in PostgreSQL.
+
+  
   
    Basic Setup
 
   
    With SSL support compiled in, the
    PostgreSQL server can be started with
-   SSL enabled by setting the parameter
+   support for encrypted connections using TLS protocols
+   enabled by by setting the parameter
     to on in
    postgresql.conf.  The server will listen for both normal
    and SSL connections on the same TCP port, and will negotiate