diff options
-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 | 4 | ||||
-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/sslinfo.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/xplang.sgml | 2 |
10 files changed, 15 insertions, 15 deletions
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml index a83a13b9a96..fa08a83315a 100644 --- a/doc/src/sgml/ecpg.sgml +++ b/doc/src/sgml/ecpg.sgml @@ -4925,7 +4925,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 089fc8f099f..0417f2a2f65 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -2518,7 +2518,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> @@ -2686,7 +2686,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 2d1a5aa863f..2e7d48f5b96 100644 --- a/doc/src/sgml/gist.sgml +++ b/doc/src/sgml/gist.sgml @@ -655,8 +655,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)) @@ -857,7 +857,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; @@ -868,7 +868,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 a67cfbf1cc1..82e597830de 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -5466,7 +5466,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 642a59f9f37..4ffccc71e53 100644 --- a/doc/src/sgml/plpgsql.sgml +++ b/doc/src/sgml/plpgsql.sgml @@ -3603,7 +3603,7 @@ 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>P0001</>). If no message + <literal>ERRCODE_RAISE_EXCEPTION</> (<literal>P0001</>). If no message text is specified, the default is to use the condition name or SQLSTATE as message text. </para> @@ -5316,7 +5316,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 764bca1f029..5385c60eb09 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 eaa410bc94c..2a0dbb6291b 100644 --- a/doc/src/sgml/ref/create_aggregate.sgml +++ b/doc/src/sgml/ref/create_aggregate.sgml @@ -189,7 +189,7 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> ( as described in <xref linkend="xaggr-moving-aggregates">. This requires specifying the <literal>MSFUNC</>, <literal>MINVFUNC</>, and <literal>MSTYPE</> parameters, and optionally - the <literal>MSPACE</>, <literal>MFINALFUNC</>, <literal>MFINALFUNC_EXTRA</>, + the <literal>MSSPACE</>, <literal>MFINALFUNC</>, <literal>MFINALFUNC_EXTRA</>, and <literal>MINITCOND</> parameters. Except for <literal>MINVFUNC</>, these parameters work like the corresponding simple-aggregate parameters without <literal>M</>; they define a separate implementation of the diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml index 8e2deb76351..cb25ebbec6f 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</> attribute, <command>SET ROLE</> drops the + has the <literal>NOINHERIT</> attribute, <command>SET ROLE</> 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/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml index 22ef4396abc..9dfd24fd29c 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 68220bf6334..32433b13d98 100644 --- a/doc/src/sgml/xplang.sgml +++ b/doc/src/sgml/xplang.sgml @@ -144,7 +144,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> ; |