diff options
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/sgml/auth-delay.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/datatype.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/high-availability.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/install-windows.sgml | 6 | ||||
-rw-r--r-- | doc/src/sgml/pgupgrade.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/ref/drop_foreign_table.sgml | 8 | ||||
-rw-r--r-- | doc/src/sgml/ref/grant.sgml | 16 | ||||
-rw-r--r-- | doc/src/sgml/ref/postgres-ref.sgml | 2 | ||||
-rw-r--r-- | doc/src/sgml/sepgsql.sgml | 2 |
9 files changed, 22 insertions, 22 deletions
diff --git a/doc/src/sgml/auth-delay.sgml b/doc/src/sgml/auth-delay.sgml index b91a7ecda7a..e377c980cab 100644 --- a/doc/src/sgml/auth-delay.sgml +++ b/doc/src/sgml/auth-delay.sgml @@ -17,7 +17,7 @@ </para> <para> - In order to function, this module must be loaded via + In order to function, this module must be loaded via <xref linkend="guc-shared-preload-libraries"> in <filename>postgresql.conf</>. </para> diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml index 0b4f978d985..89b531fa1d2 100644 --- a/doc/src/sgml/datatype.sgml +++ b/doc/src/sgml/datatype.sgml @@ -790,7 +790,7 @@ NUMERIC </indexterm> <para> - The data types <type>smallserial</type>, <type>serial</type> and + The data types <type>smallserial</type>, <type>serial</type> and <type>bigserial</type> are not true types, but merely a notational convenience for creating unique identifier columns (similar to the <literal>AUTO_INCREMENT</literal> property @@ -3898,7 +3898,7 @@ SELECT to_tsvector( 'postgraduate' ) @@ to_tsquery( 'postgres:*' ); t (1 row) </programlisting> - because <literal>postgres</> gets stemmed to <literal>postgr</>: + because <literal>postgres</> gets stemmed to <literal>postgr</>: <programlisting> SELECT to_tsquery('postgres:*'); to_tsquery diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml index 674bfb80102..c1680301d3f 100644 --- a/doc/src/sgml/high-availability.sgml +++ b/doc/src/sgml/high-availability.sgml @@ -872,7 +872,7 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass' <literal>pg_stat_replication</></link> view. Large differences between <function>pg_current_xlog_location</> and <literal>sent_location</> field might indicate that the master server is under heavy load, while - differences between <literal>sent_location</> and + differences between <literal>sent_location</> and <function>pg_last_xlog_receive_location</> on the standby might indicate network delay, or that the standby is under heavy load. </para> diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml index 439f5ad82b2..bc2ed012f44 100644 --- a/doc/src/sgml/install-windows.sgml +++ b/doc/src/sgml/install-windows.sgml @@ -49,8 +49,8 @@ <xref linkend="installation-notes-mingw"> and <xref linkend="installation-notes-cygwin">. To produce native 64 bit binaries in these environments, use the tools from <productname>MinGW-w64</productname>. These tools can also be used to - cross-compile for 32 bit and 64 bit <productname>Windows</productname> - targets on other hosts, such as <productname>Linux</productname> and + cross-compile for 32 bit and 64 bit <productname>Windows</productname> + targets on other hosts, such as <productname>Linux</productname> and <productname>Darwin</productname>. <productname>Cygwin</productname> is not recommended for running a production server, and it should only be used for running on @@ -61,7 +61,7 @@ </para> <para> - Native builds of <application>psql</application> don't support command + Native builds of <application>psql</application> don't support command line editing. The <productname>Cygwin</productname> build does support command line editing, so it should be used where psql is needed for interactive use on <productname>Windows</productname>. diff --git a/doc/src/sgml/pgupgrade.sgml b/doc/src/sgml/pgupgrade.sgml index 102ca526bb1..2d8bbce6b40 100644 --- a/doc/src/sgml/pgupgrade.sgml +++ b/doc/src/sgml/pgupgrade.sgml @@ -294,7 +294,7 @@ NET STOP pgsql-8.3 (<productname>PostgreSQL</> 8.3 and older used a different s <application>pg_upgrade</> requires the specification of the old and new cluster's data and executable (<filename>bin</>) directories. You can also specify user and port values, and whether you want the data linked instead of - copied (the default). + copied (the default). </para> <para> diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml index 9a9624b1873..1f66126a335 100644 --- a/doc/src/sgml/ref/drop_foreign_table.sgml +++ b/doc/src/sgml/ref/drop_foreign_table.sgml @@ -21,7 +21,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ] </synopsis> </refsynopsisdiv> - + <refsect1> <title>Description</title> @@ -30,7 +30,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl Only the owner of a foreign table can remove it. </para> </refsect1> - + <refsect1> <title>Parameters</title> @@ -80,14 +80,14 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl <title>Examples</title> <para> - To destroy two foreign tables, <literal>films</literal> and + To destroy two foreign tables, <literal>films</literal> and <literal>distributors</literal>: <programlisting> DROP FOREIGN TABLE films, distributors; </programlisting></para> </refsect1> - + <refsect1> <title>Compatibility</title> diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 1437861441e..aa9bbcbdab9 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -140,14 +140,14 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace <para> PostgreSQL grants default privileges on some types of objects to - <literal>PUBLIC</literal>. No privileges are granted to - <literal>PUBLIC</literal> by default on tables, - columns, schemas or tablespaces. For other types, the default privileges - granted to <literal>PUBLIC</literal> are as follows: - <literal>CONNECT</literal> and <literal>CREATE TEMP TABLE</literal> for - databases; <literal>EXECUTE</literal> privilege for functions; and - <literal>USAGE</literal> privilege for languages. - The object owner can, of course, <command>REVOKE</command> + <literal>PUBLIC</literal>. No privileges are granted to + <literal>PUBLIC</literal> by default on tables, + columns, schemas or tablespaces. For other types, the default privileges + granted to <literal>PUBLIC</literal> are as follows: + <literal>CONNECT</literal> and <literal>CREATE TEMP TABLE</literal> for + databases; <literal>EXECUTE</literal> privilege for functions; and + <literal>USAGE</literal> privilege for languages. + The object owner can, of course, <command>REVOKE</command> both default and expressly granted privileges. (For maximum security, issue the <command>REVOKE</> in the same transaction that creates the object; then there is no window in which another user diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml index bd4ae338f73..b16bbdfa4b3 100644 --- a/doc/src/sgml/ref/postgres-ref.sgml +++ b/doc/src/sgml/ref/postgres-ref.sgml @@ -745,7 +745,7 @@ PostgreSQL documentation <para> Note that the single-user mode server does not provide sophisticated - line-editing features (no command history, for example). + line-editing features (no command history, for example). Single-User mode also does not do any background processing, like automatic checkpoints. diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml index fa42c191a16..fc379885d8b 100644 --- a/doc/src/sgml/sepgsql.sgml +++ b/doc/src/sgml/sepgsql.sgml @@ -147,7 +147,7 @@ $ for DBNAME in template0 template1 postgres; do Second, build and install the policy package for the regression test. The <filename>sepgsql-regtest.pp</> is a special purpose policy package which provides a set of rules to be allowed during the regression tests. - It should be built from the policy source file + It should be built from the policy source file (<filename>sepgsql-regtest.te</>), which is normally done using <command>make</command>. You will need to locate the appropriate Makefile on your system; the path shown below is only an example. |