From 5633da000f403d32baa90fc19af77731ae2793fd Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 16 Nov 2007 15:50:31 +0000
Subject: [PATCH] Add FAQ items about "Postgres" alias usage, remove old
 reference.

---
 doc/FAQ              | 14 +++++++++-----
 doc/src/FAQ/FAQ.html | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/doc/FAQ b/doc/FAQ
index eef0565f00..a03416ae36 100644
--- a/doc/FAQ
+++ b/doc/FAQ
@@ -1,7 +1,7 @@
 
                 Frequently Asked Questions (FAQ) for PostgreSQL
                                        
-   Last updated: Tue Nov 13 22:39:46 EST 2007
+   Last updated: Fri Nov 16 10:50:15 EST 2007
    
    Current maintainer: Bruce Momjian (bruce@momjian.us)
    
@@ -14,7 +14,7 @@
    
                              General Questions
                                       
-   1.1) What is PostgreSQL? How is it pronounced?
+   1.1) What is PostgreSQL? How is it pronounced? What is Postgres?
    1.2) Who controls PostgreSQL?
    1.3) What is the copyright of PostgreSQL?
    1.4) What platforms does PostgreSQL support?
@@ -89,9 +89,8 @@
                                       
   1.1) What is PostgreSQL? How is it pronounced?
   
-   PostgreSQL is pronounced Post-Gres-Q-L, but can also be referred to as
-   simply Postgres, particularly in conversation. (For those curious
-   about how to say "PostgreSQL", an audio file is available.)
+   PostgreSQL is pronounced Post-Gres-Q-L. (For those curious about how
+   to say "PostgreSQL", an audio file is available.)
    
    PostgreSQL is an object-relational database system that has the
    features of traditional commercial database systems with enhancements
@@ -104,6 +103,11 @@
    company. To get involved, see the developer's FAQ at
    http://www.postgresql.org/docs/faqs.FAQ_DEV.html
    
+   Postgres is a widely-used nickname for the PostgreSQL database. It was
+   the original name of the project at Berkeley and is strongly preferred
+   over other nicknames. If you find 'PostgreSQL' hard to pronounce, call
+   it 'Postgres' instead.
+   
   1.2) Who controls PostgreSQL?
   
    If you are looking for a PostgreSQL gatekeeper, central committee, or
diff --git a/doc/src/FAQ/FAQ.html b/doc/src/FAQ/FAQ.html
index 578c3fdb5f..0d297922bb 100644
--- a/doc/src/FAQ/FAQ.html
+++ b/doc/src/FAQ/FAQ.html
@@ -10,7 +10,7 @@
   alink="#0000ff">
     <H1>Frequently Asked Questions (FAQ) for PostgreSQL</H1>
 
-    <P>Last updated: Tue Nov 13 22:39:46 EST 2007</P>
+    <P>Last updated: Fri Nov 16 10:50:15 EST 2007</P>
 
     <P>Current maintainer: Bruce Momjian (<A href=
     "mailto:bruce@momjian.us">bruce@momjian.us</A>)
@@ -26,7 +26,8 @@
     <HR>
 
     <H2 align="center">General Questions</H2>
-     <A href="#item1.1">1.1</A>) What is PostgreSQL? How is it pronounced?<BR>
+     <A href="#item1.1">1.1</A>) What is PostgreSQL? How is it pronounced?
+     What is Postgres?<BR>
      <A href="#item1.2">1.2</A>) Who controls PostgreSQL?<BR>
      <A href="#item1.3">1.3</A>) What is the copyright of PostgreSQL?<BR>
      <A href="#item1.4">1.4</A>) What platforms does PostgreSQL support?<BR>
@@ -128,9 +129,8 @@
 
     <H3 id="item1.1">1.1) What is PostgreSQL? How is it pronounced?</H3>
 
-    <P>PostgreSQL is pronounced <I>Post-Gres-Q-L</I>, but can also be
-    referred to as simply <I>Postgres</I>, particularly in conversation.
-    (For those curious about how to say "PostgreSQL", an <a
+    <P>PostgreSQL is pronounced <I>Post-Gres-Q-L</I>.  (For those curious
+    about how to say "PostgreSQL", an <a
     href="http://www.postgresql.org/files/postgresql.mp3">audio file</a>
     is available.)</P>
 
@@ -148,6 +148,11 @@
     http://www.postgresql.org/docs/faqs.FAQ_DEV.html</A>
     </P>
 
+    <P>Postgres is a widely-used nickname for the PostgreSQL database.
+    It was the original name of the project at Berkeley and is strongly
+    preferred over other nicknames. If you find 'PostgreSQL' hard to
+    pronounce, call it 'Postgres' instead.</P>
+
     <H3 id="item1.2">1.2) Who controls PostgreSQL?<BR></H3>
 
     <P>If you are looking for a PostgreSQL gatekeeper, central committee,
-- 
2.40.0