Skip to content

Commit a420b76

Browse files
peterepetere
committed
Correctly name the Windows operating systems
1 parent 49cbef7 commit a420b76

File tree

5 files changed

+30
-27
lines changed

5 files changed

+30
-27
lines changed

‎doc/src/sgml/libpq.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.168 2004/11/15 06:32:13 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.169 2004/11/27 21:56:04 petere Exp $
33
-->
44

55
<chapter id="libpq">
@@ -137,7 +137,7 @@ PGconn *PQconnectdb(const char *conninfo);
137137
that is not the name of the machine at <literal>hostaddr</>.) Also,
138138
<literal>host</> rather than <literal>hostaddr</> is used to identify
139139
the connection in <filename>$HOME/.pgpass</> (or
140-
<filename>%USERPROFILE%\.pgpass</> on Win32).
140+
<filename>%USERPROFILE%\.pgpass</> on Microsoft Windows).
141141
</para>
142142
<para>
143143
Without either a host name or host address,

‎doc/src/sgml/ref/copy.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.59 2004/11/17 02:50:06 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/copy.sgml,v 1.60 2004/11/27 21:56:05 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -446,7 +446,7 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla
446446

447447
<para>
448448
<command>COPY TO</command> will terminate each row with a Unix-style
449-
newline (<quote><literal>\n</></>). Servers running on MS Windows instead
449+
newline (<quote><literal>\n</></>). Servers running on Microsoft Windows instead
450450
output carriage return/newline (<quote><literal>\r\n</></>), but only for
451451
<command>COPY</> to a server file; for consistency across platforms,
452452
<command>COPY TO STDOUT</> always sends <quote><literal>\n</></>

‎doc/src/sgml/ref/pg_ctl-ref.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.28 2004/06/04 04:05:36 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/ref/pg_ctl-ref.sgml,v 1.29 2004/11/27 21:56:05 petere Exp $
33
PostgreSQL documentation
44
-->
55

@@ -139,7 +139,7 @@ PostgreSQL documentation
139139

140140
<para>
141141
<option>kill</option> mode allows you to send a signal to a specified
142-
process. This is particularly valuable for <productname>MS Windows</>
142+
process. This is particularly valuable for <productname>Microsoft Windows</>
143143
which does not have a <application>kill</> command. Use
144144
<literal>--help</> to see a list of supported signal names.
145145
</para>

‎doc/src/sgml/release.sgml

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.314 2004/11/27 21:56:04 petere Exp $
33
-->
44

55
<appendix id="release">
@@ -22,7 +22,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
2222
<variablelist>
2323
<varlistentry>
2424
<term>
25-
Win32 Native Server
25+
Microsoft Windows Native Server
2626
</term>
2727

2828
<listitem>
@@ -31,28 +31,31 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
3131
to natively run on <productname>Microsoft Windows</> as a
3232
server. It can run as a <productname>Windows</> service. This
3333
release supports NT-based Windows releases like
34-
<productname>Win2000</>, <productname>XP</>,
35-
<productname>Win2003</>. Older releases like
36-
<productname>Windows 95</>, <productname>98</>, and
37-
<productname>ME</> are not supported because these operating
34+
<productname>Windows 2000</>, <productname>Windows XP</>, and
35+
<productname>Windows 2003</>. Older releases like
36+
<productname>Windows 95</>, <productname>Windows 98</>, and
37+
<productname>Windows ME</> are not supported because these operating
3838
systems do not have the infrastructure to support
3939
<productname>PostgreSQL</productname>. A separate installer
4040
project has been created to ease installation on
4141
<productname>Windows</>: <ulink
4242
url="http://pgfoundry.org/projects/pginstaller">
4343
http://pgfoundry.org/projects/pginstaller</ulink>.
4444
</para>
45+
4546
<para>
4647
Although tested throughout our release cycle, the Windows port
4748
does not have the benefit of years of use in production
4849
environments that <productname>PostgreSQL</productname> has on
4950
Unix platforms and therefore should be treated with the same
5051
level of caution as you would a new product.
5152
</para>
52-
<para> Previous releases required the Unix emulation toolkit
53-
<productname>Cygwin</> for Win32 server support.
54-
<productname>PostgreSQL</productname> has always supported
55-
clients on Win32.
53+
54+
<para>
55+
Previous releases required the Unix emulation toolkit
56+
<productname>Cygwin</> in order to run the server on Windows
57+
operating systems. <productname>PostgreSQL</productname> has
58+
always supported clients on Windows.
5659
</para>
5760
</listitem>
5861
</varlistentry>
@@ -740,7 +743,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
740743
</para>
741744
<para>
742745
Listening on localhost (<literal>127.0.0.1</>) opens no new
743-
security holes but allows configurations like Win32 and JDBC,
746+
security holes but allows configurations like Windows and JDBC,
744747
which do not support local sockets, to work without special
745748
adjustments.
746749
</para>
@@ -1272,10 +1275,10 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
12721275

12731276
<listitem>
12741277
<para>
1275-
New <application>pg_ctl</> <option>kill</> option for Win32 (Andrew)
1278+
New <application>pg_ctl</> <option>kill</> option for Windows (Andrew)
12761279
</para>
12771280
<para>
1278-
Win32 does not have a <literal>kill</> command to send signals to
1281+
Windows does not have a <literal>kill</> command to send signals to
12791282
backends so this capability was added to <application>pg_ctl</>.
12801283
</para>
12811284
</listitem>
@@ -1303,8 +1306,8 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
13031306

13041307
<listitem>
13051308
<para>
1306-
Add Win32 service <option>register</> command to
1307-
<application>pg_ctl</> (Dave Page)
1309+
Add <option>register</> command to <application>pg_ctl</> to
1310+
register Windows operating system service (Dave Page)
13081311
</para>
13091312
</listitem>
13101313

@@ -1976,13 +1979,13 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
19761979

19771980
<listitem>
19781981
<para>
1979-
Allow the database server to run natively on Win32 (Claudio, Magnus, Andrew)
1982+
Allow the database server to run natively on Windows (Claudio, Magnus, Andrew)
19801983
</para>
19811984
</listitem>
19821985

19831986
<listitem>
19841987
<para>
1985-
Shell script commands converted to C versions for Win32 support (Andrew)
1988+
Shell script commands converted to C versions for Windows support (Andrew)
19861989
</para>
19871990
</listitem>
19881991

@@ -2197,7 +2200,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
21972200

21982201
<listitem>
21992202
<para>
2200-
New <application>pgevent</> for Win32 logging
2203+
New <application>pgevent</> for Windows logging
22012204
</para>
22022205
</listitem>
22032206

@@ -2266,7 +2269,7 @@ $PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.313 2004/11/27 21:27:06 petere
22662269

22672270
<listitem>
22682271
<para>
2269-
Allow /contrib/pg_autovacuum to run as a Win32 service (Dave Page)
2272+
Allow /contrib/pg_autovacuum to run as a Windows service (Dave Page)
22702273
</para>
22712274
</listitem>
22722275

‎doc/src/sgml/runtime.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.293 2004/11/16 05:33:14 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.294 2004/11/27 21:56:04 petere Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -1626,7 +1626,7 @@ SET ENABLE_SEQSCAN TO OFF;
16261626
it succeeds. Examples:
16271627
<programlisting>
16281628
archive_command = 'cp "%p" /mnt/server/archivedir/"%f"'
1629-
archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Win32
1629+
archive_command = 'copy "%p" /mnt/server/archivedir/"%f"' # Windows
16301630
</programlisting>
16311631
</para>
16321632
</listitem>

0 commit comments

Comments
 (0)