diff options
| author | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
|---|---|---|
| committer | Cédric Villemain | 2011-05-13 20:55:39 +0000 |
| commit | e0c3b474d5436c7874aef36988f2646bdb890249 (patch) | |
| tree | 49c41d2b8abbd9bae4096643d840859f3a02a08c /doc/src/sgml/ref | |
| parent | 40cefa392974c73ec20deb3c15fb5111ed7fad17 (diff) | |
| parent | 9bb6d9795253bb521f81c626fea49a704a369ca9 (diff) | |
Merge branch 'master' into analyze_cacheanalyze_cache
Diffstat (limited to 'doc/src/sgml/ref')
| -rw-r--r-- | doc/src/sgml/ref/createdb.sgml | 26 | ||||
| -rw-r--r-- | doc/src/sgml/ref/grant.sgml | 2 | ||||
| -rw-r--r-- | doc/src/sgml/ref/pg_basebackup.sgml | 22 | ||||
| -rw-r--r-- | doc/src/sgml/ref/security_label.sgml | 10 |
4 files changed, 30 insertions, 30 deletions
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml index 7cbf56506d..9c8171d049 100644 --- a/doc/src/sgml/ref/createdb.sgml +++ b/doc/src/sgml/ref/createdb.sgml @@ -107,6 +107,19 @@ PostgreSQL documentation </varlistentry> <varlistentry> + <term><option>-E <replaceable class="parameter">encoding</replaceable></></term> + <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></></term> + <listitem> + <para> + Specifies the character encoding scheme to be used in this + database. The character sets supported by the + <productname>PostgreSQL</productname> server are described in + <xref linkend="multibyte-charset-supported">. + </para> + </listitem> + </varlistentry> + + <varlistentry> <term><option>-l <replaceable class="parameter">locale</replaceable></></term> <term><option>--locale=<replaceable class="parameter">locale</replaceable></></term> <listitem> @@ -136,19 +149,6 @@ PostgreSQL documentation </varlistentry> <varlistentry> - <term><option>-E <replaceable class="parameter">encoding</replaceable></></term> - <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></></term> - <listitem> - <para> - Specifies the character encoding scheme to be used in this - database. The character sets supported by the - <productname>PostgreSQL</productname> server are described in - <xref linkend="multibyte-charset-supported">. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term><option>-O <replaceable class="parameter">owner</replaceable></></term> <term><option>--owner=<replaceable class="parameter">owner</replaceable></></term> <listitem> diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 93e83320cc..689aba5104 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -101,7 +101,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace There is also an option to grant privileges on all objects of the same type within one or more schemas. This functionality is currently supported only for tables, sequences, and functions (but note that <literal>ALL - TABLES</> is considered to include views). + TABLES</> is considered to include views and foreign tables). </para> <para> diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index 382effdaa3..29c885e93d 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -388,28 +388,28 @@ PostgreSQL documentation To create a base backup of the server at <literal>mydbserver</literal> and store it in the local directory <filename>/usr/local/pgsql/data</filename>: - <screen> - <prompt>$</prompt> <userinput>pg_basebackup -h mydbserver -D /usr/local/pgsql/data</userinput> - </screen> +<screen> +<prompt>$</prompt> <userinput>pg_basebackup -h mydbserver -D /usr/local/pgsql/data</userinput> +</screen> </para> <para> To create a backup of the local server with one maximum compressed tar file for each tablespace, and store it in the directory <filename>backup</filename>, showing a progress report while running: - <screen> - <prompt>$</prompt> <userinput>pg_basebackup -D backup -Ft -Z9 -P</userinput> - </screen> +<screen> +<prompt>$</prompt> <userinput>pg_basebackup -D backup -Ft -Z9 -P</userinput> +</screen> </para> <para> To create a backup of a single-tablespace local database and compress this with <productname>bzip2</productname>: - <screen> - <prompt>$</prompt> <userinput>pg_basebackup -D - -Ft | bzip2 > backup.tar.bz2</userinput> - </screen> - (this command will fail if there are multiple tablespaces in the - database) +<screen> +<prompt>$</prompt> <userinput>pg_basebackup -D - -Ft | bzip2 > backup.tar.bz2</userinput> +</screen> + (This command will fail if there are multiple tablespaces in the + database.) </para> </refsect1> diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml index 40ce3317b9..8a01b940de 100644 --- a/doc/src/sgml/ref/security_label.sgml +++ b/doc/src/sgml/ref/security_label.sgml @@ -82,7 +82,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON <term><replaceable class="parameter">function_name</replaceable></term> <listitem> <para> - The name of the object to be commented. Names of tables, + The name of the object to be labeled. Names of tables, aggregates, domains, foreign tables, functions, sequences, types, and views can be schema-qualified. </para> @@ -120,8 +120,8 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON The mode of a function argument: <literal>IN</>, <literal>OUT</>, <literal>INOUT</>, or <literal>VARIADIC</>. If omitted, the default is <literal>IN</>. - Note that <command>COMMENT ON FUNCTION</command> does not actually pay - any attention to <literal>OUT</> arguments, since only the input + Note that <command>SECURITY LABEL ON FUNCTION</command> does not actually + pay any attention to <literal>OUT</> arguments, since only the input arguments are needed to determine the function's identity. So it is sufficient to list the <literal>IN</>, <literal>INOUT</>, and <literal>VARIADIC</> arguments. @@ -135,8 +135,8 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON <listitem> <para> The name of a function argument. - Note that <command>COMMENT ON FUNCTION</command> does not actually pay - any attention to argument names, since only the argument data + Note that <command>SECURITY LABEL ON FUNCTION</command> does not actually + pay any attention to argument names, since only the argument data types are needed to determine the function's identity. </para> </listitem> |