diff options
author | Michael Paquier <michael@paquier.xyz> | 2019-08-20 13:45:58 +0900 |
---|---|---|
committer | Michael Paquier <michael@paquier.xyz> | 2019-08-20 13:45:58 +0900 |
commit | 93dcec96ef32a80a37264e1994b462da9e35ebd4 (patch) | |
tree | 787ced5ef143ab5f65994ad8da38b082da3a557c | |
parent | 2b24cf91a8e20873f8c8c5154e4aa6d4986e077d (diff) | |
download | postgresql-93dcec96ef32a80a37264e1994b462da9e35ebd4.tar.gz postgresql-93dcec96ef32a80a37264e1994b462da9e35ebd4.zip |
Doc: Fix various typos
All those fixes are already included on HEAD thanks to for example
c96581a and 66bde49, and have gone missing on back-branches.
Author: Alexander Lakhin, Liudmila Mantrova
Discussion: https://postgr.es/m/CAEkD-mDJHV3bhgezu3MUafJLoAKsOOT86+wHukKU8_NeiJYhLQ@mail.gmail.com
Backpatch-through: 9.4
-rw-r--r-- | doc/src/sgml/custom-scan.sgml | 5 | ||||
-rw-r--r-- | doc/src/sgml/ecpg.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/func.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/gist.sgml | 8 | ||||
-rw-r--r-- | doc/src/sgml/libpq.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/plpgsql.sgml | 8 | ||||
-rw-r--r-- | doc/src/sgml/problems.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/ref/create_aggregate.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/ref/set_role.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/sources.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/sslinfo.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/xplang.sgml | 2 |
12 files changed, 19 insertions, 22 deletions
diff --git a/doc/src/sgml/custom-scan.sgml b/doc/src/sgml/custom-scan.sgml index ab9b055d9a9..b8963a28eb1 100644 --- a/doc/src/sgml/custom-scan.sgml +++ b/doc/src/sgml/custom-scan.sgml @@ -83,10 +83,7 @@ typedef struct CustomPath by <literal>nodeToString</literal>, so that debugging routines that attempt to print the custom path will work as designed. <structfield>methods</structfield> must point to a (usually statically allocated) object implementing the required - custom path methods, of which there is currently only one. The - <structfield>LibraryName</structfield> and <structfield>SymbolName</structfield> fields must also - be initialized so that the dynamic loader can resolve them to locate the - method table. + custom path methods, of which there is currently only one. </para> <para> diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index fac45400b03..1af0ef3cbbc 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -4970,7 +4970,7 @@ struct <para> The fields <structfield>sqlcaid</structfield>, - <structfield>sqlcabc</structfield>, + <structfield>sqlabc</structfield>, <structfield>sqlerrp</structfield>, and the remaining elements of <structfield>sqlerrd</structfield> and <structfield>sqlwarn</structfield> currently contain no useful diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index cfa1e781acd..672bf5cb708 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -2786,7 +2786,7 @@ </row> <row> - <entry><literal>tcvn_to_utf8</literal></entry> + <entry><literal>windows_1258_to_utf8</literal></entry> <entry><literal>WIN1258</literal></entry> <entry><literal>UTF8</literal></entry> </row> @@ -2954,7 +2954,7 @@ </row> <row> - <entry><literal>utf8_to_tcvn</literal></entry> + <entry><literal>utf8_to_windows_1258</literal></entry> <entry><literal>UTF8</literal></entry> <entry><literal>WIN1258</literal></entry> </row> diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml index 44a3b2c03c5..beed6521eb5 100644 --- a/doc/src/sgml/gist.sgml +++ b/doc/src/sgml/gist.sgml @@ -696,8 +696,8 @@ my_picksplit(PG_FUNCTION_ARGS) /* * Choose where to put the index entries and update unionL and unionR - * accordingly. Append the entries to either v_spl_left or - * v_spl_right, and care about the counters. + * accordingly. Append the entries to either v->spl_left or + * v->spl_right, and care about the counters. */ if (my_choice_is_left(unionL, curl, unionR, curr)) @@ -910,7 +910,7 @@ Datum my_fetch(PG_FUNCTION_ARGS) { GISTENTRY *entry = (GISTENTRY *) PG_GETARG_POINTER(0); - input_data_type *in = DatumGetP(entry->key); + input_data_type *in = DatumGetPointer(entry->key); fetched_data_type *fetched_data; GISTENTRY *retval; @@ -921,7 +921,7 @@ my_fetch(PG_FUNCTION_ARGS) * Convert 'fetched_data' into the a Datum of the original datatype. */ - /* fill *retval from fetch_data. */ + /* fill *retval from fetched_data. */ gistentryinit(*retval, PointerGetDatum(converted_datum), entry->rel, entry->page, entry->offset, FALSE); diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 9ea7c562656..e16ab72c0b1 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -5812,7 +5812,7 @@ int PQendcopy(PGconn *conn); It should either be issued when the last string has been sent to the server using <function>PQputline</function> or when the last string has been received from the server using - <function>PGgetline</function>. It must be issued or the server + <function>PQgetline</function>. It must be issued or the server will get <quote>out of sync</quote> with the client. Upon return from this function, the server is ready to receive the next SQL command. The return value is 0 on successful completion, diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml index c4f055eb560..555a6e1c2b2 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -3734,9 +3734,9 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id; <para> If no condition name nor SQLSTATE is specified in a <command>RAISE EXCEPTION</command> command, the default is to use - <literal>RAISE_EXCEPTION</literal> (<literal>P0001</literal>). If no message - text is specified, the default is to use the condition name or - SQLSTATE as message text. + <literal>ERRCODE_RAISE_EXCEPTION</literal> (<literal>P0001</literal>). + If no message text is specified, the default is to use the condition + name or SQLSTATE as message text. </para> <note> @@ -5549,7 +5549,7 @@ BEGIN INSERT INTO cs_active_job(job_id) VALUES (v_job_id); BEGIN - INSERT INTO cs_jobs (job_id, start_stamp) VALUES (v_job_id, sysdate); + INSERT INTO cs_jobs (job_id, start_stamp) VALUES (v_job_id, now()); EXCEPTION WHEN dup_val_on_index THEN NULL; -- don't worry if it already exists END; diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml index 02ed975ec2f..cf432628721 100644 --- a/doc/src/sgml/problems.sgml +++ b/doc/src/sgml/problems.sgml @@ -252,7 +252,7 @@ C library, processor, memory information, and so on. In most cases it is sufficient to report the vendor and version, but do not assume everyone knows what exactly <quote>Debian</quote> - contains or that everyone runs on i386s. If you have + contains or that everyone runs on x86_64. If you have installation problems then information about the toolchain on your machine (compiler, <application>make</application>, and so on) is also necessary. diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml index b8cd2e7af90..d1e2887cb4d 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -202,7 +202,7 @@ CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( as described in <xref linkend="xaggr-moving-aggregates"/>. This requires specifying the <literal>MSFUNC</literal>, <literal>MINVFUNC</literal>, and <literal>MSTYPE</literal> parameters, and optionally - the <literal>MSPACE</literal>, <literal>MFINALFUNC</literal>, + the <literal>MSSPACE</literal>, <literal>MFINALFUNC</literal>, <literal>MFINALFUNC_EXTRA</literal>, <literal>MFINALFUNC_MODIFY</literal>, and <literal>MINITCOND</literal> parameters. Except for <literal>MINVFUNC</literal>, these parameters work like the corresponding simple-aggregate parameters diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 0ef6eb9a9c1..9ab0d6af04c 100644 --- a/doc/src/sgml/ref/set_role.sgml +++ b/doc/src/sgml/ref/set_role.sgml @@ -70,7 +70,7 @@ RESET ROLE effectively drops all the privileges assigned directly to the session user and to the other roles it is a member of, leaving only the privileges available to the named role. On the other hand, if the session user role - has the <literal>NOINHERITS</literal> attribute, <command>SET ROLE</command> drops the + has the <literal>NOINHERIT</literal> attribute, <command>SET ROLE</command> drops the privileges assigned directly to the session user and instead acquires the privileges available to the named role. </para> diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index 8870ee938aa..1a3d905ab7e 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -875,7 +875,7 @@ BETTER: unrecognized node type: 42 </para> <para> For example <literal>static inline</literal> and - <literal>_StaticAssert()</literal> are currently used, even + <literal>_Static_assert()</literal> are currently used, even though they are from newer revisions of the C standard. If not available we respectively fall back to defining the functions without inline, and to using a C89 compatible replacement that diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml index cda09aaafd2..45d1136ac9a 100644 --- a/doc/src/sgml/sslinfo.sgml +++ b/doc/src/sgml/sslinfo.sgml @@ -180,7 +180,7 @@ countryName (alias C) localityName (alias L) stateOrProvinceName (alias ST) organizationName (alias O) -organizationUnitName (alias OU) +organizationalUnitName (alias OU) title description initials diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml index db765b46449..7db1b8aa476 100644 --- a/doc/src/sgml/xplang.sgml +++ b/doc/src/sgml/xplang.sgml @@ -137,7 +137,7 @@ CREATE FUNCTION <replaceable>validator_function_name</replaceable>(oid) <para> Finally, the PL must be declared with the command <synopsis> -CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <replaceable>language-name</replaceable> +CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <replaceable>language_name</replaceable> HANDLER <replaceable>handler_function_name</replaceable> <optional>INLINE <replaceable>inline_function_name</replaceable></optional> <optional>VALIDATOR <replaceable>validator_function_name</replaceable></optional> ; |