diff options
author | Bruce Momjian <bruce@momjian.us> | 2005-01-22 23:23:53 +0000 |
---|---|---|
committer | Bruce Momjian <bruce@momjian.us> | 2005-01-22 23:23:53 +0000 |
commit | 5be6219bdd857313e667d83bd45cc22b0f85be93 (patch) | |
tree | ca48f6a08b743aa8e7d2dec74c3bded8db5a2039 | |
parent | 60f63fb0d4c456b22e1d02edef468867b275251c (diff) | |
download | postgresql-5be6219bdd857313e667d83bd45cc22b0f85be93.tar.gz |
More < and > changes to ampersands.
8.0.X and HEAD.
-rw-r--r-- | doc/src/sgml/ref/create_table.sgml | 6 | ||||
-rw-r--r-- | doc/src/sgml/ref/grant.sgml | 4 | ||||
-rw-r--r-- | doc/src/sgml/ref/lock.sgml | 6 | ||||
-rw-r--r-- | doc/src/sgml/ref/psql-ref.sgml | 14 | ||||
-rw-r--r-- | doc/src/sgml/ref/reindex.sgml | 6 | ||||
-rw-r--r-- | doc/src/sgml/ref/select.sgml | 4 |
6 files changed, 20 insertions, 20 deletions
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 732c7f6949..c8d51efb10 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.90 2005/01/05 18:03:19 momjian Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/create_table.sgml,v 1.90.4.1 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -732,7 +732,7 @@ CREATE TABLE films ( <programlisting> CREATE TABLE distributors ( - did integer CHECK (did > 100), + did integer CHECK (did > 100), name varchar(40) ); </programlisting> @@ -745,7 +745,7 @@ CREATE TABLE distributors ( CREATE TABLE distributors ( did integer, name varchar(40) - CONSTRAINT con1 CHECK (did > 100 AND name <> '') + CONSTRAINT con1 CHECK (did > 100 AND name <> '') ); </programlisting> </para> diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 97854d5528..368725ac8b 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.44 2004/11/05 19:15:51 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/grant.sgml,v 1.44.4.1 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -308,7 +308,7 @@ GRANT { CREATE | ALL [ PRIVILEGES ] } Use <xref linkend="app-psql">'s <command>\z</command> command to obtain information about existing privileges, for example: <programlisting> -=> \z mytable +=> \z mytable Access privileges for database "lusitania" Schema | Name | Type | Access privileges diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml index 9c2f47a815..37fcbea7dd 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.45 2005/01/04 00:39:53 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/lock.sgml,v 1.45.4.1 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -210,8 +210,8 @@ COMMIT WORK; BEGIN WORK; LOCK TABLE films IN SHARE ROW EXCLUSIVE MODE; DELETE FROM films_user_comments WHERE id IN - (SELECT id FROM films WHERE rating < 5); -DELETE FROM films WHERE rating < 5; + (SELECT id FROM films WHERE rating < 5); +DELETE FROM films WHERE rating < 5; COMMIT WORK; </programlisting> </para> diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index ecc3077d78..f94e1657b5 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.130.4.1 2005/01/22 23:05:53 momjian Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.130.4.2 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -2179,11 +2179,11 @@ testdb=> <userinput>INSERT INTO my_table VALUES (:content);</userinput> they don't cause a syntax error when the second line is processed. This could be done with the program <command>sed</command>: <programlisting> -testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\''</userinput> +testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\''</userinput> </programlisting> Observe the correct number of backslashes (6)! It works this way: After <application>psql</application> has parsed this - line, it passes <literal>sed -e "s/'/\\\'/g" < my_file.txt</literal> + line, it passes <literal>sed -e "s/'/\\\'/g" < my_file.txt</literal> to the shell. The shell will do its own thing inside the double quotes and execute <command>sed</command> with the arguments <literal>-e</literal> and <literal>s/'/\\'/g</literal>. When @@ -2243,8 +2243,8 @@ testdb=> <userinput>\set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` The full host name (with domain name) of the database server, or <literal>[local]</literal> if the connection is over a Unix domain socket, or - <literal>[local:<replaceable>/dir/name</replaceable>]</literal - >, if the Unix domain socket is not at the compiled in default + <literal>[local:<replaceable>/dir/name</replaceable>]</literal>, + if the Unix domain socket is not at the compiled in default location. </para> </listitem> @@ -2632,8 +2632,8 @@ Field separator is "oo". input. Notice the changing prompt: <programlisting> testdb=> <userinput>CREATE TABLE my_table (</userinput> -testdb(> <userinput> first integer not null default 0,</userinput> -testdb(> <userinput> second text)</userinput> +testdb(> <userinput> first integer not null default 0,</userinput> +testdb(> <userinput> second text)</userinput> testdb-> <userinput>;</userinput> CREATE TABLE </programlisting> diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 13bb9f5098..2a3bc7e09e 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.25 2004/11/04 19:08:08 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/reindex.sgml,v 1.25.4.1 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -234,8 +234,8 @@ REINDEX INDEX my_index; $ <userinput>export PGOPTIONS="-P"</userinput> $ <userinput>psql broken_db</userinput> ... -broken_db=> REINDEX DATABASE broken_db; -broken_db=> \q +broken_db=> REINDEX DATABASE broken_db; +broken_db=> \q </programlisting> </para> </refsect1> diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 3bc08e09ec..5046326e54 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1,5 +1,5 @@ <!-- -$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.80 2005/01/04 08:59:45 tgl Exp $ +$PostgreSQL: pgsql/doc/src/sgml/ref/select.sgml,v 1.80.4.1 2005/01/22 23:23:53 momjian Exp $ PostgreSQL documentation --> @@ -874,7 +874,7 @@ SELECT kind, sum(len) AS total FROM films GROUP BY kind; SELECT kind, sum(len) AS total FROM films GROUP BY kind - HAVING sum(len) < interval '5 hours'; + HAVING sum(len) < interval '5 hours'; kind | total ----------+------- |