aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2011-03-12 09:38:56 -0500
committerBruce Momjian <bruce@momjian.us>2011-03-12 09:38:56 -0500
commit94fe9c0f4e1672ccd830cb0aa7fd5ccce97d14ae (patch)
tree5a50e97ac0450e42f24243b5cf7a28aa821ec8c8 /doc/src
parent3a3f39fdc00c6caa41d795475189ac844403b770 (diff)
downloadpostgresql-94fe9c0f4e1672ccd830cb0aa7fd5ccce97d14ae.tar.gz
postgresql-94fe9c0f4e1672ccd830cb0aa7fd5ccce97d14ae.zip
Use "backend process" rather than "backend server", where appropriate.
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/libpq.sgml2
-rw-r--r--doc/src/sgml/problems.sgml6
-rw-r--r--doc/src/sgml/query.sgml4
-rw-r--r--doc/src/sgml/ref/pg_ctl-ref.sgml2
4 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 195d83ba68c..eddc65e3b4c 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1612,7 +1612,7 @@ int PQsocket(const PGconn *conn);
<para>
Returns the process <acronym>ID</acronym>
(PID)<indexterm><primary>PID</><secondary>determining PID of
- server process</><tertiary>in libpq</></> of the backend server
+ server process</><tertiary>in libpq</></> of the backend
process handling this connection.
<synopsis>
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index a65baa31578..3f79c6ef90c 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -78,7 +78,7 @@
</listitem>
</itemizedlist>
- Here <quote>program</quote> refers to any executable, not only the backend server.
+ Here <quote>program</quote> refers to any executable, not only the backend process.
</para>
<para>
@@ -280,9 +280,9 @@
When writing a bug report, please avoid confusing terminology.
The software package in total is called <quote>PostgreSQL</quote>,
sometimes <quote>Postgres</quote> for short. If you
- are specifically talking about the backend server, mention that, do not
+ are specifically talking about the backend process, mention that, do not
just say <quote>PostgreSQL crashes</quote>. A crash of a single
- backend server process is quite different from crash of the parent
+ backend process is quite different from crash of the parent
<quote>postgres</> process; please don't say <quote>the server
crashed</> when you mean a single backend process went down, nor vice versa.
Also, client programs such as the interactive frontend <quote><application>psql</application></quote>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 681d08abed8..f4fbf11a8d1 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -264,8 +264,8 @@ INSERT INTO weather (date, city, temp_hi, temp_lo)
COPY weather FROM '/home/user/weather.txt';
</programlisting>
- where the file name for the source file must be available to the
- backend server machine, not the client, since the backend server
+ where the file name for the source file must be available on the
+ machine running the backend process, not the client, since the backend process
reads the file directly. You can read more about the
<command>COPY</command> command in <xref linkend="sql-copy">.
</para>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 608749f4c6a..626ed1f8eb8 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -134,7 +134,7 @@ PostgreSQL documentation
<application>pg_ctl</application> is a utility for initializing a
<productname>PostgreSQL</productname> database cluster, starting,
stopping, or restarting the <productname>PostgreSQL</productname>
- backend server (<xref linkend="app-postgres">), or displaying the
+ database server (<xref linkend="app-postgres">), or displaying the
status of a running server. Although the server can be started
manually, <application>pg_ctl</application> encapsulates tasks such
as redirecting log output and properly detaching from the terminal