summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2021-03-10 17:38:43 +0000
committerTom Lane2021-03-10 17:38:43 +0000
commitb12436340adf27aa3d334c92579e6662dd3090ce (patch)
treee2dc81a65c47627b33440091985a001fd7c29be3
parent227338b00d498d9e1c5705a1ab118585e5d57c87 (diff)
Doc: get rid of <foreignphrase> tags.
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
-rw-r--r--doc/src/sgml/ddl.sgml4
-rw-r--r--doc/src/sgml/ref/create_role.sgml2
-rw-r--r--doc/src/sgml/rules.sgml2
-rw-r--r--doc/src/sgml/typeconv.sgml2
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 1e9a4625cc..422c1180ba 100644
--- 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 73b30d7b23..b6a4ea1f72 100644
--- 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 b017d3122e..2ae6925b41 100644
--- 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&agrave;</foreignphrase>:
+ The results are:
<programlisting>
SELECT * FROM shoelace;
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 810b0cb557..103e4c5d99 100644
--- 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>