Applied.
---
Bruce Momjian wrote:
> 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 http://momjian.us
> EnterpriseDB http://enterprisedb.com
>
> + It's impossible for everything to be true. +
[ text/x-diff is unsupported, treating like TEXT/PLAIN ]
> 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);
>
> Returns the process ID
> (PID)PIDdetermining PID of
> - server processin libpq of the backend server
> + server processin libpq of the backend
> process handling this connection.
>
>
> 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 @@
>
>
>
> - Here program refers to any executable, not only the
> backend server.
> + Here program refers to any executable, not only the
> backend process.
>
>
>
> @@ -280,9 +280,9 @@
> When writing a bug report, please avoid confusing terminology.
> The software package in total is called PostgreSQL,
> sometimes Postgres 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 PostgreSQL crashes. 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
> postgres process; please don't say the server
> crashed when you mean a single backend process went down, nor vice
> versa.
> Also, client programs such as the interactive frontend
> psql
> 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';
>
>
> -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
> COPY command in .
>
> 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
> pg_ctl is a utility for initializing a
> PostgreSQL database cluster, starting,
> stopping, or restarting the PostgreSQL
> - backend server (), or displaying the
> + database server (), or displaying the
> status of a running server. Although the server can be started
> manually, pg_ctl 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.
> *
> *
