From d38753c6f79d1eb7d3096ff777ec6df0bc7e5008 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Tue, 20 Aug 2019 13:45:53 +0900 Subject: [PATCH] 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 --- doc/src/sgml/catalogs.sgml | 2 +- doc/src/sgml/custom-scan.sgml | 5 +---- doc/src/sgml/ecpg.sgml | 2 +- doc/src/sgml/func.sgml | 4 ++-- doc/src/sgml/gist.sgml | 8 ++++---- doc/src/sgml/libpq.sgml | 2 +- doc/src/sgml/plpgsql.sgml | 8 ++++---- doc/src/sgml/problems.sgml | 2 +- doc/src/sgml/ref/create_aggregate.sgml | 2 +- doc/src/sgml/ref/set_role.sgml | 2 +- doc/src/sgml/sources.sgml | 2 +- doc/src/sgml/sslinfo.sgml | 2 +- doc/src/sgml/xplang.sgml | 2 +- 13 files changed, 20 insertions(+), 23 deletions(-) diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml index 0e22dcc31b..5e71a2e865 100644 --- a/doc/src/sgml/catalogs.sgml +++ b/doc/src/sgml/catalogs.sgml @@ -11031,7 +11031,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx kinds text[] - Types of exdended statistics enabled for this record + Types of extended statistics enabled for this record diff --git a/doc/src/sgml/custom-scan.sgml b/doc/src/sgml/custom-scan.sgml index ab9b055d9a..b8963a28eb 100644 --- a/doc/src/sgml/custom-scan.sgml +++ b/doc/src/sgml/custom-scan.sgml @@ -83,10 +83,7 @@ typedef struct CustomPath by nodeToString, so that debugging routines that attempt to print the custom path will work as designed. methods must point to a (usually statically allocated) object implementing the required - custom path methods, of which there is currently only one. The - LibraryName and SymbolName 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. diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index 72b7e2e2c4..179da0fbf8 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -5011,7 +5011,7 @@ struct The fields sqlcaid, - sqlcabc, + sqlabc, sqlerrp, and the remaining elements of sqlerrd and sqlwarn currently contain no useful diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 4bb5461484..169a01fc1a 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -2893,7 +2893,7 @@ - tcvn_to_utf8 + windows_1258_to_utf8 WIN1258 UTF8 @@ -3061,7 +3061,7 @@ - utf8_to_tcvn + utf8_to_windows_1258 UTF8 WIN1258 diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml index 44a3b2c03c..beed6521eb 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 e467e63d24..f4d21c724c 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -5913,7 +5913,7 @@ int PQendcopy(PGconn *conn); It should either be issued when the last string has been sent to the server using PQputline or when the last string has been received from the server using - PGgetline. It must be issued or the server + PQgetline. It must be issued or the server will get out of sync 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 ef1556be8f..ae73630a48 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -3740,9 +3740,9 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id; If no condition name nor SQLSTATE is specified in a RAISE EXCEPTION command, the default is to use - RAISE_EXCEPTION (P0001). If no message - text is specified, the default is to use the condition name or - SQLSTATE as message text. + ERRCODE_RAISE_EXCEPTION (P0001). + If no message text is specified, the default is to use the condition + name or SQLSTATE as message text. @@ -5626,7 +5626,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 02ed975ec2..cf43262872 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 Debian - 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, make, 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 ca0e9db8b1..644657dd5e 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -211,7 +211,7 @@ CREATE [ OR REPLACE ] AGGREGATE name. This requires specifying the MSFUNC, MINVFUNC, and MSTYPE parameters, and optionally - the MSPACE, MFINALFUNC, + the MSSPACE, MFINALFUNC, MFINALFUNC_EXTRA, MFINALFUNC_MODIFY, and MINITCOND parameters. Except for MINVFUNC, 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 0ef6eb9a9c..9ab0d6af04 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 NOINHERITS attribute, SET ROLE drops the + has the NOINHERIT attribute, SET ROLE drops the privileges assigned directly to the session user and instead acquires the privileges available to the named role. diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml index a339ebbc4b..6294312ab7 100644 --- a/doc/src/sgml/sources.sgml +++ b/doc/src/sgml/sources.sgml @@ -884,7 +884,7 @@ BETTER: unrecognized node type: 42 features can be used, if a fallback is provided. - For example _StaticAssert() and + For example _Static_assert() and __builtin_constant_p are currently used, even though they are from newer revisions of the C standard and a GCC extension respectively. If not available diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml index 0fde0fc10e..78ff83d642 100644 --- a/doc/src/sgml/sslinfo.sgml +++ b/doc/src/sgml/sslinfo.sgml @@ -185,7 +185,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 d215ce82d0..60e0430751 100644 --- a/doc/src/sgml/xplang.sgml +++ b/doc/src/sgml/xplang.sgml @@ -137,7 +137,7 @@ CREATE FUNCTION validator_function_name(oid) Finally, the PL must be declared with the command -CREATE TRUSTED LANGUAGE language-name +CREATE TRUSTED LANGUAGE language_name HANDLER handler_function_name INLINE inline_function_name VALIDATOR validator_function_name ; -- 2.40.0