Received: from maia.hub.org (maia-2.hub.org [200.46.204.251])
	by mail.postgresql.org (Postfix) with ESMTP id 6F71C13364DE
	for <pgsql-docs-postgresql.org@mail.postgresql.org>;
	Fri, 11 Mar 2011 10:43:07 -0400 (AST)
Received: from mail.postgresql.org ([200.46.204.86])
	by maia.hub.org (mx1.hub.org [200.46.204.251]) (amavisd-maia,
	port 10024) with ESMTP id 30194-07 for
	<pgsql-docs-postgresql.org@mail.postgresql.org>;
	Fri, 11 Mar 2011 14:42:55 +0000 (UTC)
X-Greylist: from auto-whitelisted by SQLgrey-1.7.6
Received: from momjian.us (momjian.us [70.90.9.53])
	by mail.postgresql.org (Postfix) with ESMTP id 4001A133616B
	for <pgsql-docs@postgresql.org>; Fri, 11 Mar 2011 10:42:54 -0400 (AST)
Received: (from bruce@localhost) by momjian.us (8.11.6/8.11.6) id
 p2BEgwh02462;
	Fri, 11 Mar 2011 09:42:58 -0500 (EST)
From: Bruce Momjian <bruce@momjian.us>
Message-Id: <201103111442.p2BEgwh02462@momjian.us>
Subject: "Backend server" term usage
In-Reply-To: <1298307429-sup-8882@alvh.no-ip.org>
To: Alvaro Herrera <alvherre@commandprompt.com>
Date: Fri, 11 Mar 2011 09:42:58 -0500 (EST)
CC: Dmitriy Igrishin <dmitigr@gmail.com>, Robert Haas <robertmhaas@gmail.com>,
	pgsql-docs <pgsql-docs@postgresql.org>
X-Mailer: ELM [version 2.4ME+ PL124 (25)]
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="ELM1299854578-10557-7_"
Content-Transfer-Encoding: 7bit
X-Virus-Scanned: Maia Mailguard 1.0.1
X-Spam-Status: No, hits=-1.91 tagged_above=-5 required=5 tests=BAYES_00=-1.9,
	T_RP_MATCHES_RCVD=-0.01
X-Spam-Level: 
X-Archive-Number: 201103/70
X-Sequence-Number: 6503


--ELM1299854578-10557-7_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="US-ASCII"

Alvaro Herrera wrote:
> Excerpts from Dmitriy Igrishin's message of dom feb 20 06:19:19 -0300 2011:
> 
> > Better, undoubtedly.
> > Another alternative is just "server". Why? Well, for consistency, e.g. with
> > http://www.postgresql.org/docs/9.0/static/errcodes-appendix.html
> > Here you may see phrase "All messages emitted by the PostgreSQL server ..."
> > and furthermore, there are some SQL standard's "SQLSTATE" code
> > which name includes "server" rather than "backend":
> > SQLSERVER REJECTED ESTABLISHMENT OF SQLCONNECTION
> > But anyway, phrase "backend server" is incorrect.
> 
> Maybe some cleanup would be good, but in that case please provide a
> specific patch.  The replacement suggested in the email that started
> this thread seems OK, but wholesale replacement of the phrase "backend
> server" with something else is likely to introduce as many mistakes as
> it would fix.  For example, the description of postgres' -T switch would
> then be wrong.
> 
> I think using the protocol chapter as reference for terms to use is a
> bad idea -- it's one of the most obscure chapters in the documentation.

OK, attached is my proposed patch;  it mostly changes "backend server"
to "backend process".

-- 
  Bruce Momjian  <bruce@momjian.us>        http://momjian.us
  EnterpriseDB                             http://enterprisedb.com

  + It's impossible for everything to be true. +

--ELM1299854578-10557-7_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-diff
Content-Disposition: inline; filename="/rtmp/backend.diff"

diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 59b4011..1c223cb 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 a65baa3..3f79c6e 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 681d08a..f4fbf11 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 608749f..626ed1f 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
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 31e37e9..0fee280 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -22,7 +22,7 @@
  *	how to handle signalling.
  *
  *	signal(2) handling - this is here because it affects some of
- *	the frontend commands as well as the backend server.
+ *	the frontend commands as well as the backend processes.
  *
  *	Ultrix and SunOS provide BSD signal(2) semantics by default.
  *
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 5d07788..43d182b 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -310,7 +310,7 @@ help(const char *progname)
 	printf(_("  -O              allow system table structure changes\n"));
 	printf(_("  -P              disable system indexes\n"));
 	printf(_("  -t pa|pl|ex     show timings after each query\n"));
-	printf(_("  -T              send SIGSTOP to all backend servers if one dies\n"));
+	printf(_("  -T              send SIGSTOP to all backend processes if one dies\n"));
 	printf(_("  -W NUM          wait NUM seconds to allow attach from a debugger\n"));
 
 	printf(_("\nOptions for single-user mode:\n"));
diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index dafc6ae..0ec0431 100644
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -72,11 +72,11 @@ main(int argc, char **argv)
 	 * defaults by looking up environment variables or, failing that, using
 	 * hardwired constants
 	 */
-	pghost = NULL;				/* host name of the backend server */
-	pgport = NULL;				/* port of the backend server */
+	pghost = NULL;				/* host name of the backend */
+	pgport = NULL;				/* port of the backend */
 	pgoptions = NULL;			/* special options to start up the backend
 								 * server */
-	pgtty = NULL;				/* debugging tty for the backend server */
+	pgtty = NULL;				/* debugging tty for the backend */
 
 	/* make a connection to the database */
 	conn1 = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName1);

--ELM1299854578-10557-7_--