Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7cc3751

Browse files
committed
Minor updates and copy-editing.
1 parent c62465c commit 7cc3751

File tree

2 files changed

+51
-37
lines changed

2 files changed

+51
-37
lines changed

doc/src/sgml/installation.sgml

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.218 2004/12/24 18:37:26 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.219 2004/12/24 19:12:36 tgl Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -146,7 +146,7 @@ su - postgres
146146
<filename>libperl</filename> library must be a shared library
147147
also on most platforms. This appears to be the default in
148148
recent <productname>Perl</productname> versions, but it was not
149-
in earlier versions, and in general it is the choice of whomever
149+
in earlier versions, and in any case it is the choice of whomever
150150
installed Perl at your site.
151151
</para>
152152

@@ -238,8 +238,9 @@ su - postgres
238238

239239
<listitem>
240240
<para>
241-
<application>Kerberos</>, <productname>OpenSSL</>, or <application>PAM</>,
242-
if you want to support authentication using these services.
241+
<application>Kerberos</>, <productname>OpenSSL</>, or
242+
<application>PAM</>, if you want to support authentication or
243+
encryption using these services.
243244
</para>
244245
</listitem>
245246
</itemizedlist>
@@ -393,23 +394,27 @@ su - postgres
393394
old one then shut down the old server, at the latest before you
394395
install the new files:
395396
<screen>
396-
<userinput>kill -INT `cat /usr/local/pgsql/data/postmaster.pid | sed 1q`</>
397+
<userinput>pg_ctl stop</>
397398
</screen>
398-
Versions prior to 7.0 do not have this
399-
<filename>postmaster.pid</> file. If you are using such a version
400-
you must find out the process ID of the server yourself, for
401-
example by typing <userinput>ps ax | grep postmaster</>, and
402-
supply it to the <command>kill</> command.
399+
On systems that have <productname>PostgreSQL</> started at boot time,
400+
there is probably a start-up file that will accomplish the same thing. For
401+
example, on a <systemitem class="osname">Red Hat Linux</> system one
402+
might find that
403+
<screen>
404+
<userinput>/etc/rc.d/init.d/postgresql stop</userinput>
405+
</screen>
406+
works.
403407
</para>
404408

405409
<para>
406-
On systems that have <productname>PostgreSQL</> started at boot time, there is
407-
probably a start-up file that will accomplish the same thing. For
408-
example, on a <systemitem class="osname">Red Hat Linux</> system one might find that
410+
Very old versions might not have <application>pg_ctl</>. If you
411+
can't find it or it doesn't work, find out the process ID of the
412+
old server, for
413+
example by typing <userinput>ps ax | grep postmaster</>, and
414+
signal it to stop this way:
409415
<screen>
410-
<userinput>/etc/rc.d/init.d/postgresql stop</userinput>
416+
<userinput>kill -INT <replaceable>processID</></userinput>
411417
</screen>
412-
works. Another possibility is <userinput>pg_ctl stop</>.
413418
</para>
414419
</step>
415420

@@ -443,10 +448,10 @@ su - postgres
443448
</para>
444449

445450
<para>
446-
These topics are discussed at length in <![%standalone-include[the
447-
documentation,]]> <![%standalone-ignore[<xref
448-
linkend="migration">,]]> which you are encouraged to read in any
449-
case.
451+
Further discussion appears in
452+
<![%standalone-include[the documentation,]]>
453+
<![%standalone-ignore[<xref linkend="migration">,]]>
454+
which you are encouraged to read in any case.
450455
</para>
451456
</sect1>
452457

@@ -691,7 +696,7 @@ su - postgres
691696
Enables Native Language Support (<acronym>NLS</acronym>),
692697
that is, the ability to display a program's messages in a
693698
language other than English.
694-
<replaceable>LANGUAGES</replaceable> is a space separated
699+
<replaceable>LANGUAGES</replaceable> is a space-separated
695700
list of codes of the languages that you want supported, for
696701
example <literal>--enable-nls='de fr'</>. (The intersection
697702
between your list and the set of actually provided
@@ -825,7 +830,7 @@ su - postgres
825830
<term><option>--without-readline</option></term>
826831
<listitem>
827832
<para>
828-
Prevents the use of the <application>Readline</> library. This disables
833+
Prevents use of the <application>Readline</> library. This disables
829834
command-line editing and history in
830835
<application>psql</application>, so it is not recommended.
831836
</para>
@@ -836,7 +841,8 @@ su - postgres
836841
<term><option>--with-rendezvous</option></term>
837842
<listitem>
838843
<para>
839-
Build with Rendezvous support.
844+
Build with Rendezvous support. This requires Rendezvous support
845+
in your operating system. Recommended on Mac OS X.
840846
</para>
841847
</listitem>
842848
</varlistentry>
@@ -864,7 +870,8 @@ su - postgres
864870
Make the client libraries thread-safe. This allows
865871
concurrent threads in <application>libpq</application> and
866872
<application>ECPG</application> programs to safely control
867-
their private connection handles.
873+
their private connection handles. This option requires adequate
874+
threading support in your operating system.
868875
</para>
869876
</listitem>
870877
</varlistentry>
@@ -873,8 +880,12 @@ su - postgres
873880
<term><option>--without-zlib</option></term>
874881
<listitem>
875882
<para>
876-
Prevents the use of the <application>Zlib</> library. This disables
877-
compression support in <application>pg_dump</application>.
883+
<indexterm>
884+
<primary>zlib</primary>
885+
</indexterm>
886+
Prevents use of the <application>Zlib</> library. This disables
887+
support for compressed archives in <application>pg_dump</application>
888+
and <application>pg_restore</application>.
878889
This option is only intended for those rare systems where this
879890
library is not available.
880891
</para>
@@ -936,12 +947,12 @@ su - postgres
936947

937948
<para>
938949
If you prefer a C compiler different from the one
939-
<filename>configure</filename> picks then you can set the
950+
<filename>configure</filename> picks, you can set the
940951
environment variable <envar>CC</> to the program of your choice.
941952
By default, <filename>configure</filename> will pick
942-
<filename>gcc</filename> unless this is inappropriate for the
943-
platform. Similarly, you can override the default compiler flags
944-
with the <envar>CFLAGS</envar> variable.
953+
<filename>gcc</filename> if available, else the platform's
954+
default (usually <filename>cc</>). Similarly, you can override the
955+
default compiler flags if needed with the <envar>CFLAGS</envar> variable.
945956
</para>
946957

947958
<para>
@@ -1002,8 +1013,8 @@ All of PostgreSQL is successfully made. Ready to install.
10021013
<note>
10031014
<para>
10041015
If you are upgrading an existing system and are going to install
1005-
the new files over the old ones, then you should have backed up
1006-
your data and shut down the old server by now, as explained in
1016+
the new files over the old ones, be sure to back up
1017+
your data and shut down the old server before proceeding, as explained in
10071018
<xref linkend="install-upgrading"> above.
10081019
</para>
10091020
</note>
@@ -1036,8 +1047,11 @@ All of PostgreSQL is successfully made. Ready to install.
10361047

10371048
<para>
10381049
The standard installation provides all the header files needed for client
1039-
application development as well as for any server-side program
1040-
development (such as custom functions or data types written in C).
1050+
application development as well as for server-side program
1051+
development, such as custom functions or data types written in C.
1052+
(Prior to <productname>PostgreSQL</> 8.0, a separate <literal>gmake
1053+
install-all-headers</> command was needed for the latter, but this
1054+
step has been folded into the standard install.)
10411055
</para>
10421056

10431057
<formalpara>

doc/src/sgml/postgres.sgml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/postgres.sgml,v 1.69 2004/12/23 05:37:39 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/postgres.sgml,v 1.70 2004/12/24 19:12:37 tgl Exp $
33
-->
44

55
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
@@ -117,7 +117,7 @@ $PostgreSQL: pgsql/doc/src/sgml/postgres.sgml,v 1.69 2004/12/23 05:37:39 tgl Exp
117117
<productname>PostgreSQL</> database administrator. This includes
118118
installation of the software, set up and configuration of the
119119
server, management of users and databases, and maintenance tasks.
120-
Anyone who runs a <productname>PostgreSQL</> server, either for
120+
Anyone who runs a <productname>PostgreSQL</> server, even for
121121
personal use, but especially in production, should be familiar
122122
with the topics covered in this part.
123123
</para>
@@ -135,8 +135,8 @@ $PostgreSQL: pgsql/doc/src/sgml/postgres.sgml,v 1.69 2004/12/23 05:37:39 tgl Exp
135135
The first few chapters are written so that they can be understood
136136
without prerequisite knowledge, so that new users who need to set
137137
up their own server can begin their exploration with this part.
138-
The rest of this part which is about tuning and management
139-
presupposes that the reader is familiar with the general use of
138+
The rest of this part is about tuning and management; that material
139+
assumes that the reader is familiar with the general use of
140140
the <productname>PostgreSQL</> database system. Readers are
141141
encouraged to look at <xref linkend="tutorial"> and <xref
142142
linkend="sql"> for additional information.

0 commit comments

Comments
 (0)