From 7fb5a9992cf2edbcf6ee58be6c712555b0737d68 Mon Sep 17 00:00:00 2001 From: Neil Conway Date: Sat, 13 Dec 2003 23:59:07 +0000 Subject: [PATCH] This patch makes some SGML markup more consistent and makes a small improvement to the SSL auth docs. --- doc/src/sgml/client-auth.sgml | 31 ++-- doc/src/sgml/func.sgml | 4 +- doc/src/sgml/information_schema.sgml | 238 +++++++++++++------------- doc/src/sgml/installation.sgml | 17 +- doc/src/sgml/jdbc.sgml | 32 ++-- doc/src/sgml/libpq.sgml | 14 +- doc/src/sgml/mvcc.sgml | 12 +- doc/src/sgml/ref/copy.sgml | 6 +- doc/src/sgml/ref/create_table_as.sgml | 26 +-- doc/src/sgml/ref/postmaster.sgml | 24 +-- doc/src/sgml/ref/select_into.sgml | 25 +-- doc/src/sgml/rules.sgml | 8 +- doc/src/sgml/runtime.sgml | 4 +- 13 files changed, 225 insertions(+), 216 deletions(-) diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml index bbe84c13ed..34322aeba7 100644 --- a/doc/src/sgml/client-auth.sgml +++ b/doc/src/sgml/client-auth.sgml @@ -1,5 +1,5 @@ @@ -111,10 +111,13 @@ hostnossl database user host - This record matches connection attempts using TCP/IP networks. + This record matches connection attempts made using TCP/IP. Note that TCP/IP connections are disabled unless the server is started with the option or the - tcpip_socket configuration parameter is enabled. + tcpip_socket configuration parameter is + enabled. host records match either + SSL or non-SSL connection + attempts. @@ -123,17 +126,17 @@ hostnossl database user hostssl - This record matches connection attempts using SSL over TCP/IP. - host records will match either SSL or - non-SSL connection attempts, but hostssl - records require SSL connections. + This record matches connection attempts made using TCP/IP. In + addition, this record requires that the connection is made with + SSL. - To make use of this option the server must be built - with SSL support enabled. Furthermore, SSL must be enabled by - enabling the ssl configuration parameter - (see for more information). + To make use of this option the server must be built with + SSL support enabled. Furthermore, + SSL must be enabled by setting the + ssl configuration parameter (see for more information). @@ -143,8 +146,8 @@ hostnossl database user This record is similar to hostssl but with the - opposite logic: it matches only regular connection attempts not - using SSL. + opposite logic: it only matches connection attempts made over + TCP/IP that do not use SSL. @@ -593,7 +596,7 @@ local db1,db2,@demodbs all md5 sniffing attacks then md5 is preferred, with crypt a second choice if you must support pre-7.2 clients. Plain password should especially be avoided for - connections over the open Internet (unless you use SSL, SSH, or + connections over the open Internet (unless you use SSL, SSH, or other communications security wrappers around the connection). diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml index 923243aef8..d73199fb20 100644 --- a/doc/src/sgml/func.sgml +++ b/doc/src/sgml/func.sgml @@ -1,5 +1,5 @@ @@ -6117,7 +6117,7 @@ SELECT TIMESTAMP 'now'; - Sequence-Manipulation Functions + Sequence Manipulation Functions sequence diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml index f6ff552f11..9193280ea6 100644 --- a/doc/src/sgml/information_schema.sgml +++ b/doc/src/sgml/information_schema.sgml @@ -1,4 +1,4 @@ - + The Information Schema @@ -183,7 +183,7 @@ is_grantable character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -669,37 +669,37 @@ character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -758,25 +758,25 @@ scope_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL maximum_cardinality cardinal_number - Always null, because arrays always have unlimited maximum cardinality in PostgreSQL + Always null, because arrays always have unlimited maximum cardinality in PostgreSQL @@ -795,7 +795,7 @@ is_self_referencing character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -1279,37 +1279,37 @@ character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -1401,25 +1401,25 @@ scope_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL maximum_cardinality cardinal_number - Always null, because arrays always have unlimited maximum cardinality in PostgreSQL + Always null, because arrays always have unlimited maximum cardinality in PostgreSQL @@ -1541,85 +1541,85 @@ ORDER BY c.ordinal_position; character_maximum_length cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL character_octet_length cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL numeric_precision cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL numeric_precision_radix cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL numeric_scale cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL datetime_precision cardinal_number - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL interval_type character_data - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL interval_precision character_data - Always null, since this information is not applied to array element data types in PostgreSQL + Always null, since this information is not applied to array element data types in PostgreSQL @@ -1657,25 +1657,25 @@ ORDER BY c.ordinal_position; scope_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL maximum_cardinality cardinal_number - Always null, because arrays always have unlimited maximum cardinality in PostgreSQL + Always null, because arrays always have unlimited maximum cardinality in PostgreSQL @@ -1883,19 +1883,19 @@ ORDER BY c.ordinal_position; is_result character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL as_locator character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL parameter_name sql_identifier - Always null, since PostgreSQL does not support named parameters + Always null, since PostgreSQL does not support named parameters @@ -1914,85 +1914,85 @@ ORDER BY c.ordinal_position; character_maximum_length cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL character_octet_length cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL numeric_precision cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL numeric_precision_radix cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL numeric_scale cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL datetime_precision cardinal_number - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL interval_type character_data - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL interval_precision character_data - Always null, since this information is not applied to parameter data types in PostgreSQL + Always null, since this information is not applied to parameter data types in PostgreSQL @@ -2024,25 +2024,25 @@ ORDER BY c.ordinal_position; scope_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL maximum_cardinality cardinal_number - Always null, because arrays always have unlimited maximum cardinality in PostgreSQL + Always null, because arrays always have unlimited maximum cardinality in PostgreSQL @@ -2408,7 +2408,7 @@ ORDER BY c.ordinal_position; with_hierarchy character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -2670,37 +2670,37 @@ ORDER BY c.ordinal_position; module_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL module_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL module_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL udt_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL udt_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL udt_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -2719,85 +2719,85 @@ ORDER BY c.ordinal_position; character_maximum_length cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL character_octet_length cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL collation_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL numeric_precision cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL numeric_precision_radix cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL numeric_scale cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL datetime_precision cardinal_number - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL interval_type character_data - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL interval_precision character_data - Always null, since this information is not applied to return data types in PostgreSQL + Always null, since this information is not applied to return data types in PostgreSQL @@ -2829,25 +2829,25 @@ ORDER BY c.ordinal_position; scope_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL scope_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL maximum_cardinality cardinal_number - Always null, because arrays always have unlimited maximum cardinality in PostgreSQL + Always null, because arrays always have unlimited maximum cardinality in PostgreSQL @@ -2908,7 +2908,7 @@ ORDER BY c.ordinal_position; character_data Always GENERAL (The SQL standard defines - other parameter styles, which are not available in PostgreSQL.) + other parameter styles, which are not available in PostgreSQL.) @@ -2919,7 +2919,7 @@ ORDER BY c.ordinal_position; If the function is declared immutable (called deterministic in the SQL standard), then YES, else NO. (You cannot query the other volatility - levels available in PostgreSQL through the information schema.) + levels available in PostgreSQL through the information schema.) @@ -2929,7 +2929,7 @@ ORDER BY c.ordinal_position; Always MODIFIES, meaning that the function possibly modifies SQL data. This information is not useful for - PostgreSQL. + PostgreSQL. @@ -2946,7 +2946,7 @@ ORDER BY c.ordinal_position; sql_path character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -2955,26 +2955,26 @@ ORDER BY c.ordinal_position; Always YES (The opposite would be a method of a user-defined type, which is a feature not available in - PostgreSQL.) + PostgreSQL.) max_dynamic_result_sets cardinal_number - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL is_user_defined_cast character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL is_implicitly_invocable character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -2991,25 +2991,25 @@ ORDER BY c.ordinal_position; to_sql_specific_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL to_sql_specific_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL to_sql_specific_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL as_locator character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -3058,25 +3058,25 @@ ORDER BY c.ordinal_position; default_character_set_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL default_character_set_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL default_character_set_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL sql_path character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -3136,7 +3136,7 @@ ORDER BY c.ordinal_position; character_data YES if the feature is fully supported by the - current version of PostgreSQL, NO if not + current version of PostgreSQL, NO if not @@ -3144,7 +3144,7 @@ ORDER BY c.ordinal_position; is_verified_by character_data - Always null, since the PostgreSQL development group does not + Always null, since the PostgreSQL development group does not perform formal testing of feature conformance @@ -3306,7 +3306,7 @@ ORDER BY c.ordinal_position; character_data The programming language, if the binding style is - EMBEDDED, else null. PostgreSQL only + EMBEDDED, else null. PostgreSQL only supports the language C. @@ -3355,7 +3355,7 @@ ORDER BY c.ordinal_position; character_data YES if the package is fully supported by the - current version of PostgreSQL, NO if not + current version of PostgreSQL, NO if not @@ -3363,7 +3363,7 @@ ORDER BY c.ordinal_position; is_verified_by character_data - Always null, since the PostgreSQL development group does not + Always null, since the PostgreSQL development group does not perform formal testing of feature conformance @@ -3443,7 +3443,7 @@ ORDER BY c.ordinal_position; The table sql_sizing_profiles contains information about the sql_sizing values that are - required by various profiles of the SQL standard. PostgreSQL does + required by various profiles of the SQL standard. PostgreSQL does not track any SQL profiles, so this table is empty. @@ -3656,7 +3656,7 @@ ORDER BY c.ordinal_position; with_hierarchy character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -3726,31 +3726,31 @@ ORDER BY c.ordinal_position; self_referencing_column_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL reference_generation character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL user_defined_type_catalog sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL user_defined_type_schema sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL user_defined_type_name sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -3836,7 +3836,7 @@ ORDER BY c.ordinal_position; action_condition character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -3871,13 +3871,13 @@ ORDER BY c.ordinal_position; condition_reference_old_table sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL condition_reference_new_table sql_identifier - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL @@ -4206,7 +4206,7 @@ ORDER BY c.ordinal_position; check_option character_data - Applies to a feature not available in PostgreSQL + Applies to a feature not available in PostgreSQL diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index 26cc7add5d..eb72a170fa 100644 --- a/doc/src/sgml/installation.sgml +++ b/doc/src/sgml/installation.sgml @@ -1,4 +1,4 @@ - + <![%standalone-include[<productname>PostgreSQL</>]]> @@ -268,7 +268,7 @@ JAVACMD=$JAVA_HOME/bin/java <listitem> <para> - <application>Kerberos</>, <application>OpenSSL</>, or <application>PAM</>, + <application>Kerberos</>, <productname>OpenSSL</>, or <application>PAM</>, if you want to support authentication using these services. </para> </listitem> @@ -893,11 +893,14 @@ JAVACMD=$JAVA_HOME/bin/java <term><option>--disable-spinlocks</option></term> <listitem> <para> - Allow the builds to succeed even if PostgreSQL has no CPU - spinlock support for the platform. The lack of spinlock - support will result in poor performance; therefore, this - option should only be used if the build aborts and informs - you that the platform lacks spinlock support. + Allow the build to succeed even if <productname>PostgreSQL</> + has no CPU spinlock support for the platform. The lack of + spinlock support will result in poor performance; therefore, + this option should only be used if the build aborts and + informs you that the platform lacks spinlock support. If this + option is required to build <productname>PostgreSQL</> on + your platform, please report the problem to the + <productname>PostgreSQL</> developers. </para> </listitem> </varlistentry> diff --git a/doc/src/sgml/jdbc.sgml b/doc/src/sgml/jdbc.sgml index 44096b7eae..e2f0f39347 100644 --- a/doc/src/sgml/jdbc.sgml +++ b/doc/src/sgml/jdbc.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/jdbc.sgml,v 1.51 2003/11/29 19:51:37 pgsql Exp $ +$PostgreSQL: pgsql/doc/src/sgml/jdbc.sgml,v 1.52 2003/12/13 23:59:06 neilc Exp $ --> <chapter id="jdbc"> @@ -98,8 +98,8 @@ $PostgreSQL: pgsql/doc/src/sgml/jdbc.sgml,v 1.51 2003/11/29 19:51:37 pgsql Exp $ For instance, assume we have an application that uses the <acronym>JDBC</acronym> driver to access a database, and that application is installed as - <filename>/usr/local/lib/myapp.jar</filename>. The PostgreSQL - <acronym>JDBC</> driver installed as + <filename>/usr/local/lib/myapp.jar</filename>. The + <productname>PostgreSQL</> <acronym>JDBC</> driver installed as <filename>/usr/local/pgsql/share/java/postgresql.jar</>. To run the application, we would use: <programlisting> @@ -119,9 +119,9 @@ java MyApp <para> Because Java only uses TCP/IP connections, the - <application>PostgreSQL</application> server must be configured to - accept TCP/IP connections. This can be done by setting - <literal>tcpip_socket = true</literal> in the + <productname>PostgreSQL</productname> server must be configured to + accept TCP/IP connections. This can be done by setting + <literal>tcpip_socket = true</literal> in the <filename>postgresql.conf</filename> file or by supplying the <option>-i</option> option flag when starting <command>postmaster</command>. @@ -239,7 +239,7 @@ java -Djdbc.drivers=org.postgresql.Driver example.ImageViewer <para> With <acronym>JDBC</acronym>, a database is represented by a <acronym>URL</acronym> (Uniform Resource Locator). With - <application>PostgreSQL</application>, this takes one of the + <productname>PostgreSQL</productname>, this takes one of the following forms: <itemizedlist> @@ -720,7 +720,7 @@ st.close(); </indexterm> <para> - <application>PostgreSQL</application> provides two distinct ways to + <productname>PostgreSQL</productname> provides two distinct ways to store binary data. Binary data can be stored in a table using the data type <type>bytea</type> or by using the Large Object feature which stores the binary data in a separate table in a special @@ -770,12 +770,11 @@ st.close(); </para> <para> - To use the Large Object functionality you can use either the - <classname>LargeObject</classname> class - provided by the <application>PostgreSQL</application> - <acronym>JDBC</acronym> driver, or by using the - <function>getBLOB()</function> and <function>setBLOB()</function> - methods. + To use the Large Object functionality you can use either the + <classname>LargeObject</classname> class provided by the + <productname>PostgreSQL</> <acronym>JDBC</acronym> driver, or by + using the <function>getBLOB()</function> and + <function>setBLOB()</function> methods. </para> <important> @@ -800,7 +799,8 @@ st.close(); <para> <xref linkend="jdbc-binary-data-example"> contains some examples on - how to process binary data using the PostgreSQL <acronym>JDBC</> driver. + how to process binary data using the <productname>PostgreSQL</> + <acronym>JDBC</> driver. </para> <example id="jdbc-binary-data-example"> @@ -948,7 +948,7 @@ ps.close(); <sect1 id="jdbc-ext"> - <title><application>PostgreSQL</application> Extensions to the + <title><productname>PostgreSQL</productname> Extensions to the <acronym>JDBC</acronym> <acronym>API</acronym> diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml index 81b1672e4d..248d8646af 100644 --- a/doc/src/sgml/libpq.sgml +++ b/doc/src/sgml/libpq.sgml @@ -1,5 +1,5 @@ @@ -3575,12 +3575,12 @@ If the permissions are less strict than this, the file will be ignored. libpq is reentrant and thread-safe if the configure command-line option ---enable-thread-safety has been used when the PostgreSQL -distribution was built. -In addition, you might need to use additional compiler command-line -options when you compile your application code. Refer to your system's -documentation for information about how to build thread-enabled -applications. +--enable-thread-safety has been used when the +PostgreSQL distribution was built. In +addition, you might need to use additional compiler command-line +options when you compile your application code. Refer to your +system's documentation for information about how to build +thread-enabled applications. diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml index f86dcbe21b..ebbdf6291f 100644 --- a/doc/src/sgml/mvcc.sgml +++ b/doc/src/sgml/mvcc.sgml @@ -1,5 +1,5 @@ @@ -215,11 +215,11 @@ $PostgreSQL: pgsql/doc/src/sgml/mvcc.sgml,v 2.42 2003/11/29 19:51:37 pgsql Exp $ isolation level may be stricter than what you select. This is permitted by the SQL standard: the four isolation levels only define which phenomena must not happen, they do not define which - phenomena must happen. The reason that PostgreSQL only provides - two isolation levels is that this is the only sensible way to map - the isolation levels to the multiversion concurrency control - architecture. The behavior of the available isolation levels is - detailed in the following subsections. + phenomena must happen. The reason that PostgreSQL + only provides two isolation levels is that this is the only + sensible way to map the isolation levels to the multiversion + concurrency control architecture. The behavior of the available + isolation levels is detailed in the following subsections. diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml index c510803af6..1e12cbf351 100644 --- a/doc/src/sgml/ref/copy.sgml +++ b/doc/src/sgml/ref/copy.sgml @@ -1,5 +1,5 @@ @@ -584,8 +584,8 @@ ZW ZIMBABWE - The following syntax was used before PostgreSQL version 7.3 and is - still supported: + The following syntax was used before PostgreSQL + version 7.3 and is still supported: COPY [ BINARY ] tablename [ WITH OIDS ] diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml index a7382abfdc..3bc5668b9f 100644 --- a/doc/src/sgml/ref/create_table_as.sgml +++ b/doc/src/sgml/ref/create_table_as.sgml @@ -1,5 +1,5 @@ @@ -125,17 +125,19 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name - Prior to PostgreSQL 7.5, CREATE TABLE AS always - included OIDs in the table it produced. Furthermore, these OIDs - were newly generated: they were distinct from the OIDs of any of - the rows in the source tables of the SELECT or - EXECUTE statement. Therefore, if CREATE - TABLE AS was frequently executed, the OID counter would - be rapidly incremented. As of PostgreSQL 7.5, the inclusion of OIDs - in the table generated by CREATE TABLE AS is - controlled by the default_with_oids configuration - variable. This variable currently defaults to true, but will likely - default to false in a future release of PostgreSQL. + Prior to PostgreSQL 7.5, CREATE TABLE + AS always included OIDs in the table it + produced. Furthermore, these OIDs were newly generated: they were + distinct from the OIDs of any of the rows in the source tables of + the SELECT or EXECUTE + statement. Therefore, if CREATE TABLE AS was + frequently executed, the OID counter would be rapidly + incremented. As of PostgreSQL 7.5, the inclusion of + OIDs in the table generated by CREATE TABLE AS + is controlled by the default_with_oids + configuration variable. This variable currently defaults to true, + but will likely default to false in a future release of + PostgreSQL. diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml index 258af3f08e..f3e55507cf 100644 --- a/doc/src/sgml/ref/postmaster.sgml +++ b/doc/src/sgml/ref/postmaster.sgml @@ -1,5 +1,5 @@ @@ -452,17 +452,17 @@ PostgreSQL documentation - A failure message indicating inability to bind to a port may indicate - that that port is already in use by some non-PostgreSQL process. - You may also get this error if you terminate the - postmaster - and immediately restart it using the same port; in this case, you must - simply wait a few seconds until the operating system closes the port - before trying again. Finally, you may get this error if you specify - a port number that your operating system considers to be reserved. - For example, many versions of Unix consider port numbers under 1024 to - be trusted - and only permit the Unix superuser to access them. + A failure message indicating inability to bind to a port may + indicate that that port is already in use by some + non-PostgreSQL process. You may also + get this error if you terminate the postmaster + and immediately restart it using the same port; in this case, you + must simply wait a few seconds until the operating system closes + the port before trying again. Finally, you may get this error if + you specify a port number that your operating system considers to + be reserved. For example, many versions of Unix consider port + numbers under 1024 to be trusted and only permit + the Unix superuser to access them. diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml index 1261f3cd4b..0585726aac 100644 --- a/doc/src/sgml/ref/select_into.sgml +++ b/doc/src/sgml/ref/select_into.sgml @@ -1,5 +1,5 @@ @@ -94,17 +94,18 @@ SELECT [ ALL | DISTINCT [ ON ( expression - Prior to PostgreSQL 7.5, the table created by SELECT - INTO always included OIDs. Furthermore, these OIDs were - newly generated: they were distinct from the OIDs of any of the - rows in the source tables of the SELECT INTO - statement. Therefore, if SELECT INTO was - frequently executed, the OID counter would be rapidly - incremented. As of PostgreSQL 7.5, the inclusion of OIDs in the - table created by SELECT INTO is controlled by - the default_with_oids configuration - variable. This variable currently defaults to true, but will likely - default to false in a future release of PostgreSQL. + Prior to PostgreSQL 7.5, the table created by + SELECT INTO always included OIDs. Furthermore, + these OIDs were newly generated: they were distinct from the OIDs + of any of the rows in the source tables of the SELECT + INTO statement. Therefore, if SELECT + INTO was frequently executed, the OID counter would be + rapidly incremented. As of PostgreSQL 7.5, the + inclusion of OIDs in the table created by SELECT + INTO is controlled by the + default_with_oids configuration variable. This + variable currently defaults to true, but will likely default to + false in a future release of PostgreSQL. diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml index d3096c8447..c719a651de 100644 --- a/doc/src/sgml/rules.sgml +++ b/doc/src/sgml/rules.sgml @@ -1,4 +1,4 @@ - + The Rule System @@ -1825,9 +1825,9 @@ GRANT SELECT ON phone_number TO secretary; - (This system was established in PostgreSQL 7.3. In versions - before that, the command status might show different results when - rules exist.) + (This system was established in PostgreSQL 7.3. + In versions before that, the command status might show different + results when rules exist.) diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml index 49f48ca3be..34fc350a6c 100644 --- a/doc/src/sgml/runtime.sgml +++ b/doc/src/sgml/runtime.sgml @@ -1,5 +1,5 @@ @@ -3551,7 +3551,7 @@ $ kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`SSL connections on the same TCP port, and will negotiate with any connecting client on whether to use SSL. See about how to force the server to + linkend="auth-pg-hba-conf"> about how to force the server to require use of SSL for certain connections.