diff options
-rw-r--r-- | doc/src/sgml/ddl.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/ref/create_role.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/rules.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/typeconv.sgml | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml index 1e9a4625cc6..422c1180bab 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 73b30d7b23c..b6a4ea1f722 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 b017d3122e3..2ae6925b418 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à</foreignphrase>: + The results are: <programlisting> SELECT * FROM shoelace; diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml index 810b0cb5573..103e4c5d99d 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> |