From 65a26804fb76825f7a98022347aca6a3d17aadb8 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 19 Jun 2017 17:52:56 -0400 Subject: [PATCH] Remove endterms and title ids Older documentation toolchains could not automatically generate text for xrefs into refentries, so we had to use the endterm attribute to tell it which text to create. This is no longer necessary and can be removed. In most cases, we can just rely on the automatically generated text. In the cases where that doesn't work, use the link element instead to create the desired text locally instead of relying on text at a remote location. --- doc/src/sgml/README.links | 4 -- doc/src/sgml/config.sgml | 3 +- doc/src/sgml/indices.sgml | 3 +- doc/src/sgml/maintenance.sgml | 3 +- doc/src/sgml/queries.sgml | 7 ++- doc/src/sgml/ref/alter_collation.sgml | 5 +- doc/src/sgml/ref/alter_table.sgml | 3 +- doc/src/sgml/ref/commit_prepared.sgml | 2 +- doc/src/sgml/ref/create_aggregate.sgml | 6 +-- doc/src/sgml/ref/create_foreign_table.sgml | 2 +- doc/src/sgml/ref/create_index.sgml | 9 ++-- doc/src/sgml/ref/create_materialized_view.sgml | 3 +- doc/src/sgml/ref/create_table.sgml | 10 ++-- doc/src/sgml/ref/create_table_as.sgml | 3 +- doc/src/sgml/ref/create_view.sgml | 2 +- doc/src/sgml/ref/declare.sgml | 5 +- doc/src/sgml/ref/delete.sgml | 4 +- doc/src/sgml/ref/do.sgml | 2 +- doc/src/sgml/ref/execute.sgml | 4 +- doc/src/sgml/ref/insert.sgml | 7 ++- doc/src/sgml/ref/lock.sgml | 3 +- doc/src/sgml/ref/pg_dump.sgml | 12 ++--- doc/src/sgml/ref/postgres-ref.sgml | 5 +- doc/src/sgml/ref/prepare.sgml | 2 +- doc/src/sgml/ref/prepare_transaction.sgml | 2 +- doc/src/sgml/ref/psql-ref.sgml | 49 ++++++++----------- doc/src/sgml/ref/rollback_prepared.sgml | 2 +- doc/src/sgml/ref/select.sgml | 67 ++++++++++++-------------- doc/src/sgml/ref/update.sgml | 4 +- doc/src/sgml/ref/values.sgml | 8 +-- 30 files changed, 104 insertions(+), 137 deletions(-) diff --git a/doc/src/sgml/README.links b/doc/src/sgml/README.links index f64b857316..4050de140c 100644 --- a/doc/src/sgml/README.links +++ b/doc/src/sgml/README.links @@ -19,10 +19,6 @@ Intra-document Linking linkend= controls the target of the link/xref, required -endterm= - for , allows the text of the link/xref to be taken from a - different link target title - External Linking ---------------- diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml index 533faf060d..750db427dc 100644 --- a/doc/src/sgml/config.sgml +++ b/doc/src/sgml/config.sgml @@ -5894,8 +5894,7 @@ Automatic Vacuuming These settings control the behavior of the autovacuum feature. Refer to for more information. Note that many of these settings can be overridden on a per-table - basis; see . + basis; see . diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml index 0818196e76..f60d16e812 100644 --- a/doc/src/sgml/indices.sgml +++ b/doc/src/sgml/indices.sgml @@ -98,8 +98,7 @@ Introduction In production environments this is often unacceptable. It is possible to allow writes to occur in parallel with index creation, but there are several caveats to be aware of — - for more information see . + for more information see . diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml index 4a68ec3b40..e4341e252c 100644 --- a/doc/src/sgml/maintenance.sgml +++ b/doc/src/sgml/maintenance.sgml @@ -807,8 +807,7 @@ The Autovacuum Daemon The default thresholds and scale factors are taken from postgresql.conf, but it is possible to override them (and many other autovacuum control parameters) on a per-table basis; see - for more information. + for more information. If a setting has been changed via a table's storage parameters, that value is used when processing that table; otherwise the global settings are used. See for more details on diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml index 19a7d2e18b..e98a30d836 100644 --- a/doc/src/sgml/queries.sgml +++ b/doc/src/sgml/queries.sgml @@ -110,7 +110,7 @@ Table Expressions The <literal>FROM</literal> Clause - The derives a + The FROM clause derives a table from one or more other tables given in a comma-separated table reference list. @@ -907,8 +907,7 @@ The <literal>WHERE</literal> Clause - The syntax of the is + The syntax of the WHERE clause is WHERE search_condition @@ -1014,7 +1013,7 @@ The <literal>GROUP BY</literal> and <literal>HAVING</literal> Clauses</ti </synopsis> <para> - The <xref linkend="sql-groupby" endterm="sql-groupby-title"/> is + The <literal>GROUP BY</literal> clause is used to group together those rows in a table that have the same values in all the columns listed. The order in which the columns are listed does not matter. The effect is to combine each set diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml index b51b3a2564..683b3c542a 100644 --- a/doc/src/sgml/ref/alter_collation.sgml +++ b/doc/src/sgml/ref/alter_collation.sgml @@ -93,8 +93,7 @@ <title>Parameters Update the collation's version. - See below. + See below. @@ -102,7 +101,7 @@ Parameters - Notes + Notes When using collations provided by the ICU library, the ICU-specific version diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 7bcf242846..cf255e6efc 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -614,8 +614,7 @@ Description This form changes one or more storage parameters for the table. See - + for details on the available parameters. Note that the table contents will not be modified immediately by this command; depending on the parameter you might need to rewrite the table to get the desired effects. diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml index d938b65bbe..7299f735c9 100644 --- a/doc/src/sgml/ref/commit_prepared.sgml +++ b/doc/src/sgml/ref/commit_prepared.sgml @@ -72,7 +72,7 @@ Notes - Examples + Examples Commit the transaction identified by the transaction identifier foobar: diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml index a4aaae876e..244b42c321 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -425,8 +425,8 @@ Parameters This option specifies whether the final function is a pure function that does not modify its arguments. READ_ONLY indicates it does not; the other two values indicate that it may change the - transition state value. See below for more detail. The + transition state value. See + below for more detail. The default is READ_ONLY, except for ordered-set aggregates, for which the default is READ_WRITE. @@ -656,7 +656,7 @@ Parameters - Notes + Notes In parameters that specify support function names, you can write diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml index 37a45b26db..c7b6edfc1f 100644 --- a/doc/src/sgml/ref/create_foreign_table.sgml +++ b/doc/src/sgml/ref/create_foreign_table.sgml @@ -343,7 +343,7 @@ Examples - Compatibility + Compatibility The CREATE FOREIGN TABLE command largely conforms to the diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml index 025537575b..4943594ed6 100644 --- a/doc/src/sgml/ref/create_index.sgml +++ b/doc/src/sgml/ref/create_index.sgml @@ -120,8 +120,7 @@ Parameters updates, or deletes on the table; whereas a standard index build locks out writes (but not reads) on the table until it's done. There are several caveats to be aware of when using this option - — see . + — see . @@ -259,7 +258,7 @@ Parameters The name of an index-method-specific storage parameter. See - + for details. @@ -289,7 +288,7 @@ Parameters - Index Storage Parameters + Index Storage Parameters The optional WITH clause specifies storage @@ -410,7 +409,7 @@ Index Storage Parameters</t </refsect2> <refsect2 id="sql-createindex-concurrently"> - <title id="sql-createindex-concurrently-title">Building Indexes Concurrently + Building Indexes Concurrently index diff --git a/doc/src/sgml/ref/create_materialized_view.sgml b/doc/src/sgml/ref/create_materialized_view.sgml index eed4273c4b..1f6a450dc5 100644 --- a/doc/src/sgml/ref/create_materialized_view.sgml +++ b/doc/src/sgml/ref/create_materialized_view.sgml @@ -91,8 +91,7 @@ Parameters This clause specifies optional storage parameters for the new - materialized view; see for more + materialized view; see for more information. All parameters supported for CREATE TABLE are also supported for CREATE MATERIALIZED VIEW with the exception of OIDS. diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index a0c9a6d257..ad230a1bc6 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -186,8 +186,7 @@ Parameters can be written before TEMPORARY or TEMP. This presently makes no difference in PostgreSQL and is deprecated; see - . + . @@ -1035,8 +1034,7 @@ Parameters This clause specifies optional storage parameters for a table or index; - see for more + see for more information. The WITH clause for a table can also include OIDS=TRUE (or just OIDS) to specify that rows of the new table @@ -1155,7 +1153,7 @@ Parameters - Storage Parameters + Storage Parameters storage parameters @@ -1788,7 +1786,7 @@ Examples - Compatibility + Compatibility The CREATE TABLE command conforms to the diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index 527138e787..7570f5d46f 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -125,8 +125,7 @@ Parameters This clause specifies optional storage parameters for the new table; - see for more + see for more information. The WITH clause can also include OIDS=TRUE (or just OIDS) to specify that rows of the new table diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml index b325c1be50..c9726c9910 100644 --- a/doc/src/sgml/ref/create_view.sgml +++ b/doc/src/sgml/ref/create_view.sgml @@ -279,7 +279,7 @@ Notes - Updatable Views + Updatable Views updatable views diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml index 648c2950f4..93737b67fe 100644 --- a/doc/src/sgml/ref/declare.sgml +++ b/doc/src/sgml/ref/declare.sgml @@ -99,8 +99,7 @@ Parameters NO SCROLL specifies that the cursor cannot be used to retrieve rows in a nonsequential fashion. The default is to allow scrolling in some cases; this is not the same as specifying - SCROLL. See for details. + SCROLL. See for details. @@ -140,7 +139,7 @@ Parameters - Notes + Notes Normal cursors return data in text format, the same as a diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml index df8cea48cf..13656e7c83 100644 --- a/doc/src/sgml/ref/delete.sgml +++ b/doc/src/sgml/ref/delete.sgml @@ -122,8 +122,8 @@ Parameters A list of table expressions, allowing columns from other tables to appear in the WHERE condition. This is similar - to the list of tables that can be specified in the of a + to the list of tables that can be specified in the FROM clause of a SELECT statement; for example, an alias for the table name can be specified. Do not repeat the target table in the using_list, diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml index 061218b135..c1df83156e 100644 --- a/doc/src/sgml/ref/do.sgml +++ b/doc/src/sgml/ref/do.sgml @@ -94,7 +94,7 @@ Notes - Examples + Examples Grant all privileges on all views in schema public to role webuser: diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml index aab1f4b7e0..9967052d3e 100644 --- a/doc/src/sgml/ref/execute.sgml +++ b/doc/src/sgml/ref/execute.sgml @@ -94,9 +94,7 @@ Outputs Examples - Examples are given in the section of the documentation. + Examples are given in the documentation. diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml index 134092fa9c..9a623a97db 100644 --- a/doc/src/sgml/ref/insert.sgml +++ b/doc/src/sgml/ref/insert.sgml @@ -77,8 +77,7 @@ Description ON CONFLICT can be used to specify an alternative action to raising a unique constraint or exclusion constraint - violation error. (See below.) + violation error. (See below.) @@ -129,7 +128,7 @@ Description Parameters - Inserting + Inserting This section covers parameters that may be used when only @@ -303,7 +302,7 @@ Inserting - <literal>ON CONFLICT</literal> Clause + <literal>ON CONFLICT</literal> Clause UPSERT diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index b2c7203919..cd95152f49 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -190,8 +190,7 @@ Notes LOCK TABLE is concerned, differing only in the rules about which modes conflict with which. For information on how to acquire an actual row-level lock, see - and the in the SELECT + and in the SELECT reference documentation. diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml index 08cad68199..38d0c4383f 100644 --- a/doc/src/sgml/ref/pg_dump.sgml +++ b/doc/src/sgml/ref/pg_dump.sgml @@ -375,11 +375,11 @@ Options schema parameter is interpreted as a pattern according to the same rules used by psql's \d commands (see ), + linkend="app-psql-patterns"/>), so multiple schemas can also be selected by writing wildcard characters in the pattern. When using wildcards, be careful to quote the pattern if needed to prevent the shell from expanding the wildcards; see - . + . @@ -526,11 +526,11 @@ Options table parameter is interpreted as a pattern according to the same rules used by psql's \d commands (see ), + linkend="app-psql-patterns"/>), so multiple tables can also be selected by writing wildcard characters in the pattern. When using wildcards, be careful to quote the pattern if needed to prevent the shell from expanding the wildcards; see - . + . @@ -1273,7 +1273,7 @@ Notes - Examples + Examples To dump a database called mydb into a SQL-script file: @@ -1374,7 +1374,7 @@ Examples To specify an upper-case or mixed-case name in and related switches, you need to double-quote the name; else it will be folded to lower case (see ). But + linkend="app-psql-patterns"/>). But double quotes are special to the shell, so in turn they must be quoted. Thus, to dump a single table with a mixed-case name, you need something like diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index 53dc05a78f..43cdf792a7 100644 --- a/doc/src/sgml/ref/postgres-ref.sgml +++ b/doc/src/sgml/ref/postgres-ref.sgml @@ -530,8 +530,7 @@ Options for Single-User Mode The following options only apply to the single-user mode - (see ). + (see ). @@ -754,7 +753,7 @@ Bugs - Single-User Mode + Single-User Mode To start a single-user mode server, use a command like diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml index 704fb5e4ab..34d6c9ea70 100644 --- a/doc/src/sgml/ref/prepare.sgml +++ b/doc/src/sgml/ref/prepare.sgml @@ -200,7 +200,7 @@ Notes - Examples + Examples Create a prepared statement for an INSERT statement, and then execute it: diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml index d958f7a06f..3fd0d04ed2 100644 --- a/doc/src/sgml/ref/prepare_transaction.sgml +++ b/doc/src/sgml/ref/prepare_transaction.sgml @@ -147,7 +147,7 @@ Notes - Examples + Examples Prepare the current transaction for two-phase commit, using foobar as the transaction identifier: diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index fce7e3a585..da49d2312f 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -779,7 +779,7 @@ Meta-Commands If an unquoted colon (:) followed by a psql variable name appears within an argument, it is replaced by the variable's value, as described in . + linkend="app-psql-interpolation"/>. The forms :'variable_name' and :"variable_name" described there work as well. @@ -1116,7 +1116,7 @@ Meta-Commands also shown. For foreign tables, the associated foreign server is shown as well. (Matching the pattern is defined in - + below.) @@ -1769,8 +1769,7 @@ Meta-Commands - See under for how to configure and + See for how to configure and customize your editor. @@ -1843,8 +1842,7 @@ Meta-Commands - See under for how to configure and + See for how to configure and customize your editor. @@ -2027,7 +2025,7 @@ Meta-Commands Sends the current query buffer to the server and stores the query's output into psql variables (see ). + linkend="app-psql-variables"/>). The query to be executed must return exactly one row. Each column of the row is stored into a separate variable, named the same as the column. For example: @@ -2831,8 +2829,7 @@ Meta-Commands Illustrations of how these different formats look can be seen in - the section. + . @@ -2916,9 +2913,8 @@ Meta-Commands Valid variable names can contain letters, digits, and - underscores. See the section below for details. + underscores. See below for details. Variable names are case-sensitive. @@ -2926,8 +2922,7 @@ Meta-Commands Certain variables are special, in that they control psql's behavior or are automatically set to reflect connection state. These variables are - documented in , below. + documented in , below. @@ -3070,8 +3065,7 @@ Meta-Commands Most variables that control psql's behavior cannot be unset; instead, an \unset command is interpreted as setting them to their default values. - See , below. + See , below. @@ -3230,7 +3224,7 @@ Meta-Commands - Patterns + Patterns patterns @@ -3323,7 +3317,7 @@ Patterns Advanced Features - Variables + Variables psql provides variable substitution @@ -3347,8 +3341,7 @@ Variables bar This works in both regular SQL commands and meta-commands; there is - more detail in , below. + more detail in , below. @@ -3742,8 +3735,7 @@ Variables These specify what the prompts psql issues should look like. See below. + linkend="app-psql-prompting"/> below. @@ -3876,7 +3868,7 @@ Variables - <acronym>SQL</acronym> Interpolation + <acronym>SQL</acronym> Interpolation A key feature of psql @@ -3961,7 +3953,7 @@ <acronym>SQL</acronym> Interpolation</t </refsect3> <refsect3 id="app-psql-prompting"> - <title id="app-psql-prompting-title">Prompting + Prompting The prompts psql issues can be customized @@ -4117,9 +4109,8 @@ Prompting The value of the psql variable - name. See the - section for details. + name. See + for details. @@ -4205,7 +4196,7 @@ Command-Line Editing - Environment + Environment @@ -4500,7 +4491,7 @@ Notes for Windows Users - Examples + Examples The first example shows how to spread a command over several lines of diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml index 08821a6652..175a3e9386 100644 --- a/doc/src/sgml/ref/rollback_prepared.sgml +++ b/doc/src/sgml/ref/rollback_prepared.sgml @@ -72,7 +72,7 @@ Notes - Examples + Examples Roll back the transaction identified by the transaction identifier foobar: diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 8a3e86b6db..f08e3f0c82 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -94,7 +94,7 @@ Description in the FROM list. A WITH query that is referenced more than once in FROM is computed only once. - (See below.) + (See below.) @@ -104,7 +104,7 @@ Description (Each element in the FROM list is a real or virtual table.) If more than one element is specified in the FROM list, they are cross-joined together. - (See below.) + (See below.) @@ -112,8 +112,7 @@ Description If the WHERE clause is specified, all rows that do not satisfy the condition are eliminated from the - output. (See below.) + output. (See below.) @@ -125,8 +124,8 @@ Description values, and the results of aggregate functions are computed. If the HAVING clause is present, it eliminates groups that do not satisfy the given condition. (See - and - below.) + and + below.) @@ -135,7 +134,7 @@ Description The actual output rows are computed using the SELECT output expressions for each selected row or row group. (See - + below.) @@ -145,8 +144,7 @@ Description result. SELECT DISTINCT ON eliminates rows that match on all the specified expressions. SELECT ALL (the default) will return all candidate rows, including - duplicates. (See below.) + duplicates. (See below.) @@ -167,9 +165,9 @@ Description eliminating duplicate rows. Notice that DISTINCT is the default behavior here, even though ALL is the default for SELECT itself. (See - , , and - below.) + , , and + below.) @@ -179,7 +177,7 @@ Description returned rows are sorted in the specified order. If ORDER BY is not given, the rows are returned in whatever order the system finds fastest to produce. (See - below.) + below.) @@ -188,7 +186,7 @@ Description If the LIMIT (or FETCH FIRST) or OFFSET clause is specified, the SELECT statement only returns a subset of the result rows. (See below.) + linkend="sql-limit"/> below.) @@ -198,8 +196,7 @@ Description or FOR KEY SHARE is specified, the SELECT statement locks the selected rows - against concurrent updates. (See below.) + against concurrent updates. (See below.) @@ -219,7 +216,7 @@ Description Parameters - <literal>WITH</literal> Clause + <literal>WITH</literal> Clause The WITH clause allows you to specify one or more @@ -296,7 +293,7 @@ <literal>WITH</literal> Clause - <literal>FROM</literal> Clause + <literal>FROM</literal> Clause The FROM clause specifies one or more source @@ -667,7 +664,7 @@ <literal>FROM</literal> Clause - <literal>WHERE</literal> Clause + <literal>WHERE</literal> Clause The optional WHERE clause has the general form @@ -684,7 +681,7 @@ <literal>WHERE</literal> Clause - <literal>GROUP BY</literal> Clause + <literal>GROUP BY</literal> Clause The optional GROUP BY clause has the general form @@ -758,7 +755,7 @@ <literal>GROUP BY</literal> Clause - <literal>HAVING</literal> Clause + <literal>HAVING</literal> Clause The optional HAVING clause has the general form @@ -801,7 +798,7 @@ <literal>HAVING</literal> Clause - <literal>WINDOW</literal> Clause + <literal>WINDOW</literal> Clause The optional WINDOW clause has the general form @@ -834,7 +831,7 @@ <literal>WINDOW</literal> Clause The elements of the PARTITION BY list are interpreted in much the same fashion as elements of a - , except that + GROUP BY clause, except that they are always simple expressions and never the name or number of an output column. Another difference is that these expressions can contain aggregate @@ -846,7 +843,7 @@ <literal>WINDOW</literal> Clause Similarly, the elements of the ORDER BY list are interpreted in much the same fashion as elements of an - , except that + ORDER BY clause, except that the expressions are always taken as simple expressions and never the name or number of an output column. @@ -920,8 +917,8 @@ <literal>WINDOW</literal> Clause The purpose of a WINDOW clause is to specify the behavior of window functions appearing in the query's - or - . These functions + SELECT list or + ORDER BY clause. These functions can reference the WINDOW clause entries by name in their OVER clauses. A WINDOW clause entry does not have to be referenced anywhere, however; if it is not @@ -948,7 +945,7 @@ <literal>WINDOW</literal> Clause - <command>SELECT</command> List + <command>SELECT</command> List The SELECT list (between the key words @@ -1029,7 +1026,7 @@ <command>SELECT</command> List - <literal>DISTINCT</literal> Clause + <literal>DISTINCT</literal> Clause If SELECT DISTINCT is specified, all duplicate rows are @@ -1074,7 +1071,7 @@ <literal>DISTINCT</literal> Clause - <literal>UNION</literal> Clause + <literal>UNION</literal> Clause The UNION clause has this general form: @@ -1127,7 +1124,7 @@ <literal>UNION</literal> Clause - <literal>INTERSECT</literal> Clause + <literal>INTERSECT</literal> Clause The INTERSECT clause has this general form: @@ -1175,7 +1172,7 @@ <literal>INTERSECT</literal> Clause - <literal>EXCEPT</literal> Clause + <literal>EXCEPT</literal> Clause The EXCEPT clause has this general form: @@ -1219,7 +1216,7 @@ <literal>EXCEPT</literal> Clause - <literal>ORDER BY</literal> Clause + <literal>ORDER BY</literal> Clause The optional ORDER BY clause has this general form: @@ -1317,7 +1314,7 @@ <literal>ORDER BY</literal> Clause - <literal>LIMIT</literal> Clause + <literal>LIMIT</literal> Clause The LIMIT clause consists of two independent @@ -1397,7 +1394,7 @@ <literal>LIMIT</literal> Clause - The Locking Clause + The Locking Clause FOR UPDATE, FOR NO KEY UPDATE, FOR SHARE @@ -2001,7 +1998,7 @@ <literal>LIMIT</literal> and <literal>OFFSET</literal> used by MySQL. The SQL:2008 standard has introduced the clauses OFFSET ... FETCH {FIRST|NEXT} ... for the same functionality, as shown above - in . This + in . This syntax is also used by IBM DB2. (Applications written for Oracle frequently use a workaround involving the automatically diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml index c0d0f7134d..5740fb96e9 100644 --- a/doc/src/sgml/ref/update.sgml +++ b/doc/src/sgml/ref/update.sgml @@ -170,8 +170,8 @@ Parameters A list of table expressions, allowing columns from other tables to appear in the WHERE condition and the update expressions. This is similar to the list of tables that can be - specified in the of a SELECT + specified in the FROM + clause of a SELECT statement. Note that the target table must not appear in the from_list, unless you intend a self-join (in which case it must appear with an alias in the from_list). diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml index 849220b120..5c7aeb2a49 100644 --- a/doc/src/sgml/ref/values.sgml +++ b/doc/src/sgml/ref/values.sgml @@ -85,7 +85,7 @@ Parameters rows. This expression can refer to the columns of the VALUES result as column1, column2, etc. For more details see - . + . @@ -95,7 +95,7 @@ Parameters A sorting operator. For details see - . + . @@ -105,7 +105,7 @@ Parameters The maximum number of rows to return. For details see - . + . @@ -116,7 +116,7 @@ Parameters The number of rows to skip before starting to return rows. For details see - . + . -- 2.15.1