From 74bcdfbe2dd656f04db4e883b5bdcdafddebff08 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 17 Jan 2011 21:30:28 -0500
Subject: [PATCH] In the docs, better distinguish server from client SSL
 settings in the documentation.

Ray Stell

Also fix some libpq title capitalization problems.
---
 doc/src/sgml/libpq.sgml   | 14 +++++++-------
 doc/src/sgml/runtime.sgml |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index fe661b8c52..1606a56908 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -6641,7 +6641,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   </para>
 
  <sect2 id="libq-ssl-certificates">
-  <title>Certificate verification</title>
+  <title>Client Verification of Server Certificates</title>
 
   <para>
    By default, <productname>PostgreSQL</> will not perform any verification of
@@ -6696,7 +6696,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
  </sect2>
 
  <sect2 id="libpq-ssl-clientcert">
-  <title>Client certificates</title>
+  <title>Client Certificates</title>
 
   <para>
    If the server requests a trusted client certificate,
@@ -6738,7 +6738,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
  </sect2>
 
  <sect2 id="libpq-ssl-protection">
-  <title>Protection provided in different modes</title>
+  <title>Protection Provided in Different Modes</title>
 
   <para>
    The different values for the <literal>sslmode</> parameter provide different
@@ -6746,7 +6746,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
    protection against three types of attacks:
   </para>
   <table id="libpq-ssl-protect-attacks">
-   <title>SSL attacks</title>
+   <title>SSL Attacks</title>
    <tgroup cols="2">
     <thead>
      <row>
@@ -6821,7 +6821,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   </para>
 
   <table id="libpq-ssl-sslmode-statements">
-   <title>SSL mode descriptions</title>
+   <title>SSL Mode Descriptions</title>
    <tgroup cols="4">
     <thead>
      <row>
@@ -6912,7 +6912,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
  </sect2>
 
  <sect2 id="libpq-ssl-fileusage">
-  <title>SSL File Usage</title>
+  <title>SSL Client File Usage</title>
   <table id="libpq-ssl-file-usage">
    <title>Libpq/Client SSL File Usage</title>
    <tgroup cols="3">
@@ -6958,7 +6958,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
  </sect2>
 
  <sect2 id="libpq-ssl-initialize">
-  <title>SSL library initialization</title>
+  <title>SSL Library Initialization</title>
 
   <para>
    If your application initializes <literal>libssl</> and/or
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 8911e99e20..9b92bec220 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1770,27 +1770,27 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
     <tbody>
 
      <row>
-      <entry><filename>server.crt</></entry>
+      <entry><filename>$PGDATA/server.crt</></entry>
       <entry>server certificate</entry>
       <entry>sent to client to indicate server's identity</entry>
      </row>
 
      <row>
-      <entry><filename>server.key</></entry>
+      <entry><filename>$PGDATA/server.key</></entry>
       <entry>server private key</entry>
       <entry>proves server certificate was sent by the owner; does not indicate
       certificate owner is trustworthy</entry>
      </row>
 
      <row>
-      <entry><filename>root.crt</></entry>
+      <entry><filename>$PGDATA/root.crt</></entry>
       <entry>trusted certificate authorities</entry>
       <entry>checks that client certificate is
       signed by a trusted certificate authority</entry>
      </row>
 
      <row>
-      <entry><filename>root.crl</></entry>
+      <entry><filename>$PGDATA/root.crl</></entry>
       <entry>certificates revoked by certificate authorities</entry>
       <entry>client certificate must not be on this list</entry>
      </row>
-- 
2.40.0