git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 227338b)

Doc: get rid of <foreignphrase> tags.

author Tom Lane <tgl@sss.pgh.pa.us>

2021年3月10日 17:38:43 +0000 (12:38 -0500)

committer Tom Lane <tgl@sss.pgh.pa.us>

2021年3月10日 17:38:43 +0000 (12:38 -0500)

We italicized some, but not all, instances of "per se", "pro forma", and
"ad hoc". These phrases are widespread in formal registers of English,
so it"s debatable whether they even qualify as foreign. We could instead
try to be more consistent in the use of <foreignphrase>, but that"s
difficult to enforce, so let"s just remove the tags for those words.

The one case that seems to deserve the tag is "voilà". Instead of keeping
just one instance of the tag, change that to a more standard phrase.

John Naylor

Discussion: https://postgr.es/m/CAFBsxsHtWs_NsccAVgQ=tTUKkXHpHdkjZXtp_Cd9dGWyBDxfbQ@mail.gmail.com

doc/src/sgml/ddl.sgml patch | blob | blame | history

doc/src/sgml/ref/create_role.sgml patch | blob | blame | history

doc/src/sgml/rules.sgml patch | blob | blame | history

doc/src/sgml/typeconv.sgml patch | blob | blame | history

diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml

index 1e9a4625cc631d5040366f2937d81e64c0a33ba7..422c1180bab5a97a7a03d176914f47f1f5914508 100644 (file)

--- a/doc/src/sgml/ddl.sgml

+++ b/doc/src/sgml/ddl.sgml

@@ -2763,8 +2763,8 @@ CREATE SCHEMA myschema;

<synopsis>

<replaceable>database</replaceable><literal>.</literal><replaceable>schema</replaceable><literal>.</literal><replaceable>table</replaceable>

</synopsis>

- can be used too, but at present this is just for <foreignphrase>pro

- forma</foreignphrase> compliance with the SQL standard. If you write a database name,

+ can be used too, but at present this is just for pro forma

+ compliance with the SQL standard. If you write a database name,

it must be the same as the database you are connected to.

</para>

diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml

index 73b30d7b23ce77085dfb560fab2c86ebb11671b1..b6a4ea1f72285fa4d3f5f79602fd4f22b521e0fe 100644 (file)

--- a/doc/src/sgml/ref/create_role.sgml

+++ b/doc/src/sgml/ref/create_role.sgml

@@ -358,7 +358,7 @@ in sync when changing the above synopsis!

<para>

The <literal>VALID UNTIL</literal> clause defines an expiration time for a

- password only, not for the role <foreignphrase>per se</foreignphrase>. In

+ password only, not for the role per se. In

particular, the expiration time is not enforced when logging in using

a non-password-based authentication method.

</para>

diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml

index b017d3122e39e141b446aca797415213dda80619..2ae6925b4182ecd840e80669b838587f203ff21a 100644 (file)

--- a/doc/src/sgml/rules.sgml

+++ b/doc/src/sgml/rules.sgml

@@ -1946,7 +1946,7 @@ DELETE FROM shoelace WHERE EXISTS

WHERE sl_name = shoelace.sl_name);

</programlisting>

- <foreignphrase>Voilà</foreignphrase>:

+ The results are:

<programlisting>

SELECT * FROM shoelace;

diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml

index 810b0cb5573580f32ddf56620552ce23095f31ef..103e4c5d99d6feb83d0dbde71bc099910488a1d9 100644 (file)

--- a/doc/src/sgml/typeconv.sgml

+++ b/doc/src/sgml/typeconv.sgml

@@ -40,7 +40,7 @@ has an associated data type which determines its behavior and allowed usage.

<productname>PostgreSQL</productname> has an extensible type system that is

more general and flexible than other <acronym>SQL</acronym> implementations.

Hence, most type conversion behavior in <productname>PostgreSQL</productname>

-is governed by general rules rather than by <foreignphrase>ad hoc</foreignphrase>

+is governed by general rules rather than by ad hoc

heuristics. This allows the use of mixed-type expressions even with

user-defined types.

</para>

This is the main PostgreSQL git repository.