Fix ids and xrefs to avoid duplicates.

Remove copy/paste redundant extra section with slight merge of content.

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index ab7a6b4795b7106d9e63ddc2c1d7b70982b45178..31810dc19d8de04208365eb61e0873f273ee577d 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -1014,7 +1014,7 @@ env PGOPTIONS='--geqo=off' psql
       
        
         Enables SSL connections. Please read
-         before using this. The default
+        -tcp"> before using this. The default
         is off.
        
       
@@ -1637,7 +1637,7 @@ set semsys:seminfo_semmsl=32
   
  
 
- 
+ -tcp">
   Secure TCP/IP Connections with SSL
 
   
@@ -1654,7 +1654,8 @@ set semsys:seminfo_semmsl=32
    can be started with the argument -l (ell) to enable
    SSL connections. When starting in SSL mode, the postmaster will look
    for the files server.key and server.crt in
-   the data directory. These files should contain the server private key
+   the data directory (pointed to by PGDATA).
+    These files should contain the server private key
    and certificate respectively. These files must be set up correctly
    before an SSL-enabled server can start. If the private key is protected
    with a passphrase, the postmaster will prompt for the passphrase and will
@@ -1664,7 +1665,8 @@ set semsys:seminfo_semmsl=32
   
    The postmaster will listen for both standard and SSL connections
    on the same TCP/IP port, and will negotiate with any connecting
-   client wether to use SSL or not. See 
+   client whether or not to use SSL.
+    See 
    about how to force on the server side the use of SSL for certain
    connections.
   
@@ -1695,63 +1697,7 @@ openssl x509 -inform PEM -outform PEM -in newreq.pem -out newkey_no_passphrase.p
   
  
 
- 
-  Secure TCP/IP Connection with SSL
-
-  
-   PostgreSQL has native support for connections over SSL to encrypt
-   client/server communications for increased security. This requires
-   OpenSSL to be installed on both client
-   and server systems and support enabled at compile-time using
-   the configure script.
-  
-
-  
-   With SSL support compiled in, the Postgres backend can be 
-   started with argument -l to enable SSL connections. 
-   When starting in SSL mode, the postmaster will look for the 
-   files server.key and
-   server.cert in the PGDATA
-   directory. These files should contain the server private key and
-   certificate respectively. If the private key is protected with a 
-   passphrase, the postmaster will prompt for the passphrase and not 
-   start until it has been provided.
-  
-
-  
-   The postmaster will listen for both standard and SSL connections
-   on the same TCP/IP port, and will negotiate with any connecting
-   client wether to use SSL or not. Use the pg_hba.conf
-   file to optionally require SSL in order to accept a connection.
-  
-
-  
-   For details on how to create your server private key and certificate,
-   refer to the OpenSSL documentation. A simple self-signed certificate
-   can be used to get started testing, but a certificate signed by a CA
-   (either one of the global CAs or a local one) should be used in 
-   production so the client can verify the servers identity. To create
-   a quick self-signed certificate, use the CA.pl
-   script included in OpenSSL:
-
-   CA.pl -newcert
-
-   Fill out the information the script asks for. Make sure to enter
-   the local hostname as Common Name. The script will generate a key
-   which is passphrase protected. To remove the passphrase (required
-   if you want automatic startup of the postmaster), run the command
-
-   openssl x509 -inform PEM -outform PEM -in newreq.pem -out newkey_no_passphrase.pem
-
-   Enter the old passphrase to unlock the existing key. Copy the file
-   newreq.pem to PGDATA/server.cert
-   and newkey_no_passphrase.pem to 
-   PGDATA/server.key. Remove the PRIVATE KEY part
-   from the server.cert using any text editor.
-  
- 
-
- 
+ 
   Secure TCP/IP Connections with SSH tunnels