Correctly name the Windows operating systems

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 05ffa373c047ca251d995dedc97e6d87926d1462..c47c33d56e216a0a1ab56474d3d9ff8679f5815f 100644 (file)
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.168 2004/11/15 06:32:13 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.169 2004/11/27 21:56:04 petere Exp $
 -->
 
  <chapter id="libpq">
@@ -137,7 +137,7 @@ PGconn *PQconnectdb(const char *conninfo);
       that is not the name of the machine at <literal>hostaddr</>.)  Also,
       <literal>host</> rather than <literal>hostaddr</> is used to identify
       the connection in <filename>$HOME/.pgpass</> (or 
-      <filename>%USERPROFILE%\.pgpass</> on Win32).
+      <filename>%USERPROFILE%\.pgpass</> on Microsoft Windows).
      </para>
      <para>
       Without either a host name or host address,

diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 8ba5409fd7f27f5959c25ea00ada0cf67caab996..d9a0130333fb750c60b23629329f45960e3982c4 100644 (file)
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.59 2004/11/17 02:50:06 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.60 2004/11/27 21:56:05 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -446,7 +446,7 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla
 
    <para>
     <command>COPY TO</command> will terminate each row with a Unix-style 
-    newline (<quote><literal>\n</></>).  Servers running on MS Windows instead
+    newline (<quote><literal>\n</></>).  Servers running on Microsoft Windows instead
     output carriage return/newline (<quote><literal>\r\n</></>), but only for
     <command>COPY</> to a server file; for consistency across platforms,
     <command>COPY TO STDOUT</> always sends <quote><literal>\n</></>

diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 6e0458e8238c874571589bce84320d54ec0a92fa..e61b2713628e0c1eb34d5a51ab4efb014b904128 100644 (file)
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.28 2004/06/04 04:05:36 momjian Exp $
+$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.29 2004/11/27 21:56:05 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -139,7 +139,7 @@ PostgreSQL documentation
 
   <para>
    <option>kill</option> mode allows you to send a signal to a specified
-    process.  This is particularly valuable for <productname>MS Windows</>
+    process.  This is particularly valuable for <productname>Microsoft Windows</>
     which does not have a <application>kill</> command.  Use 
     <literal>--help</> to see a list of supported signal names.
   </para>

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index d16aa0693bc77157b1ec877f8471266487f873d6..391f9d06c59935111dcaac37fd6d46d848eb0926 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere Exp $
+$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.314 2004/11/27 21:56:04 petere Exp $
 -->
 
 <appendix id="release">
@@ -22,7 +22,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
     <variablelist>
      <varlistentry>
       <term>
-       Win32 Native Server
+       Microsoft Windows Native Server
       </term>
 
       <listitem>
@@ -31,10 +31,10 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
         to natively run on <productname>Microsoft Windows</> as a
         server. It can run as a <productname>Windows</> service. This
         release supports NT-based Windows releases like
-        <productname>Win2000</>, <productname>XP</>,
-        <productname>Win2003</>. Older releases like
-        <productname>Windows 95</>, <productname>98</>, and
-        <productname>ME</> are not supported because these operating
+        <productname>Windows 2000</>, <productname>Windows XP</>, and
+        <productname>Windows 2003</>. Older releases like
+        <productname>Windows 95</>, <productname>Windows 98</>, and
+        <productname>Windows ME</> are not supported because these operating
         systems do not have the infrastructure to support
         <productname>PostgreSQL</productname>. A separate installer
         project has been created to ease installation on
@@ -42,6 +42,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
         url="http://pgfoundry.org/projects/pginstaller">
         http://pgfoundry.org/projects/pginstaller</ulink>.
        </para>
+
        <para>
         Although tested throughout our release cycle, the Windows port
         does not have the benefit of years of use in production
@@ -49,10 +50,12 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
         Unix platforms and therefore should be treated with the same
         level of caution as you would a new product.
        </para>
-       <para> Previous releases required the Unix emulation toolkit
-       <productname>Cygwin</> for Win32 server support.
-       <productname>PostgreSQL</productname> has always supported
-       clients on Win32.
+
+       <para>
+        Previous releases required the Unix emulation toolkit
+        <productname>Cygwin</> in order to run the server on Windows
+        operating systems.  <productname>PostgreSQL</productname> has
+        always supported clients on Windows.
        </para>
       </listitem>
      </varlistentry>
@@ -740,7 +743,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
      </para>
      <para>
       Listening on localhost (<literal>127.0.0.1</>) opens no new
-      security holes but allows configurations like Win32 and JDBC,
+      security holes but allows configurations like Windows and JDBC,
       which do not support local sockets, to work without special
       adjustments.
      </para>
@@ -1272,10 +1275,10 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
 
     <listitem>
      <para>
-      New <application>pg_ctl</> <option>kill</> option for Win32 (Andrew)
+      New <application>pg_ctl</> <option>kill</> option for Windows (Andrew)
      </para>
      <para>
-      Win32 does not have a <literal>kill</> command to send signals to
+      Windows does not have a <literal>kill</> command to send signals to
       backends so this capability was added to <application>pg_ctl</>.
      </para>
     </listitem>
@@ -1303,8 +1306,8 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
 
     <listitem>
      <para>
-      Add Win32 service <option>register</> command to
-      <application>pg_ctl</> (Dave Page)
+      Add <option>register</> command to <application>pg_ctl</> to
+      register Windows operating system service (Dave Page)
      </para>
     </listitem>
 
@@ -1976,13 +1979,13 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
 
     <listitem>
      <para>
-      Allow the database server to run natively on Win32 (Claudio, Magnus, Andrew)
+      Allow the database server to run natively on Windows (Claudio, Magnus, Andrew)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Shell script commands converted to C versions for Win32 support (Andrew)
+      Shell script commands converted to C versions for Windows support (Andrew)
      </para>
     </listitem>
 
@@ -2197,7 +2200,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
 
     <listitem>
      <para>
-      New <application>pgevent</> for Win32 logging
+      New <application>pgevent</> for Windows logging
      </para>
     </listitem>
 
@@ -2266,7 +2269,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
 
     <listitem>
      <para>
-      Allow /contrib/pg_autovacuum to run as a Win32 service (Dave Page)
+      Allow /contrib/pg_autovacuum to run as a Windows service (Dave Page)
      </para>
     </listitem>
 

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 5b3530b0990cf0ba935811ed3d1c5dbabbf633e5..213257b359e2bdb48e6a1696ba88dae16a05fa3f 100644 (file)
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.293 2004/11/16 05:33:14 neilc Exp $
+$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.294 2004/11/27 21:56:04 petere Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1626,7 +1626,7 @@ SET ENABLE_SEQSCAN TO OFF;
         it succeeds.  Examples:
 <programlisting>
 archive_command = 'cp "%p" /mnt/server/archivedir/"%f"'
-archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Win32
+archive_command = 'copy "%p" /mnt/server/archivedir/"%f"'  # Windows
 </programlisting>
        </para>
       </listitem>