From 754b5e1c42aa60f9ba18d2a9104cff4f25e06d95 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Sat, 22 Jan 2005 23:22:19 +0000 Subject: [PATCH] More < and > changes to ampersands. 8.0.X and HEAD. --- doc/src/sgml/ref/create_table.sgml | 6 +++--- doc/src/sgml/ref/grant.sgml | 4 ++-- doc/src/sgml/ref/lock.sgml | 6 +++--- doc/src/sgml/ref/psql-ref.sgml | 14 +++++++------- doc/src/sgml/ref/reindex.sgml | 6 +++--- 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..192e64d69b 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -1,5 +1,5 @@ @@ -732,7 +732,7 @@ CREATE TABLE films ( CREATE TABLE distributors ( - did integer CHECK (did > 100), + did integer CHECK (did > 100), name varchar(40) ); @@ -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 <> '') ); diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml index 97854d5528..5e9adaa805 100644 --- a/doc/src/sgml/ref/grant.sgml +++ b/doc/src/sgml/ref/grant.sgml @@ -1,5 +1,5 @@ @@ -308,7 +308,7 @@ GRANT { CREATE | ALL [ PRIVILEGES ] } Use 's \z command to obtain information about existing privileges, for example: -=> \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..3c762ac48b 100644 --- a/doc/src/sgml/ref/lock.sgml +++ b/doc/src/sgml/ref/lock.sgml @@ -1,5 +1,5 @@ @@ -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; diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml index e69248d716..5f1144a637 100644 --- a/doc/src/sgml/ref/psql-ref.sgml +++ b/doc/src/sgml/ref/psql-ref.sgml @@ -1,5 +1,5 @@ @@ -2179,11 +2179,11 @@ testdb=> INSERT INTO my_table VALUES (:content); they don't cause a syntax error when the second line is processed. This could be done with the program sed: -testdb=> \set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'' +testdb=> \set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` '\'' Observe the correct number of backslashes (6)! It works this way: After psql has parsed this - line, it passes sed -e "s/'/\\\'/g" < my_file.txt + line, it passes sed -e "s/'/\\\'/g" < my_file.txt to the shell. The shell will do its own thing inside the double quotes and execute sed with the arguments -e and s/'/\\'/g. When @@ -2243,8 +2243,8 @@ testdb=> \set content '\'' `sed -e "s/'/\\\\\\'/g" < my_file.txt` The full host name (with domain name) of the database server, or [local] if the connection is over a Unix domain socket, or - [local:/dir/name], if the Unix domain socket is not at the compiled in default + [local:/dir/name], + if the Unix domain socket is not at the compiled in default location. @@ -2632,8 +2632,8 @@ Field separator is "oo". input. Notice the changing prompt: testdb=> CREATE TABLE my_table ( -testdb(> first integer not null default 0, -testdb(> second text) +testdb(> first integer not null default 0, +testdb(> second text) testdb-> ; CREATE TABLE diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml index 13bb9f5098..9579b95e23 100644 --- a/doc/src/sgml/ref/reindex.sgml +++ b/doc/src/sgml/ref/reindex.sgml @@ -1,5 +1,5 @@ @@ -234,8 +234,8 @@ REINDEX INDEX my_index; $ export PGOPTIONS="-P" $ psql broken_db ... -broken_db=> REINDEX DATABASE broken_db; -broken_db=> \q +broken_db=> REINDEX DATABASE broken_db; +broken_db=> \q diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml index 3bc08e09ec..855412c36c 100644 --- a/doc/src/sgml/ref/select.sgml +++ b/doc/src/sgml/ref/select.sgml @@ -1,5 +1,5 @@ @@ -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 ----------+-------