Entity-ify a passel of & < > characters. Per gripe from Devrim.

diff --git a/doc/src/sgml/btree-gist.sgml b/doc/src/sgml/btree-gist.sgml
index c545c6ce7b42345f2c7478a206f11250fab08b20..59191e233897ada538e37dacac11ea5958752897 100644 (file)
--- a/doc/src/sgml/btree-gist.sgml
+++ b/doc/src/sgml/btree-gist.sgml
@@ -19,7 +19,7 @@
    -- create index
    CREATE INDEX testidx ON test USING gist (a);
    -- query
-   SELECT * FROM test WHERE a < 10;
+   SELECT * FROM test WHERE a < 10;
   
  
  

diff --git a/doc/src/sgml/cube.sgml b/doc/src/sgml/cube.sgml
index 507a55cbd7bf083f24bc680e5244a9c5c33b27cd..edb7611810af16f395049efc2b67482168994164 100644 (file)
--- a/doc/src/sgml/cube.sgml
+++ b/doc/src/sgml/cube.sgml
@@ -287,28 +287,28 @@ a = b                Same as
   
 
   
-a && b                Overlaps
+a && b                Overlaps
   
   
    The cubements a and b overlap.
   
 
   
-a @> b                Contains
+a @> b                Contains
   
   
    The cubement a contains the cubement b.
   
 
   
-a <@ b                Contained in
+a <@ b                Contained in
   
   
    The cubement a is contained in b.
   
 
   
-   (Before PostgreSQL 8.2, the containment operators @> and <@ were
+   (Before PostgreSQL 8.2, the containment operators @> and <@ were
    respectively called @ and ~.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
@@ -326,8 +326,8 @@ a <@ b                Contained in
   
 
   
-[a, b] < [c, d]                Less than
-[a, b] > [c, d]                Greater than
+[a, b] < [c, d]                Less than
+[a, b] > [c, d]                Greater than
   
  
   
@@ -462,10 +462,10 @@ a <@ b                Contained in
        is useful for creating bounding boxes around a point for searching for
        nearby points. All defined dimensions are changed by the radius. If n
        is greater than the number of defined dimensions and the cube is being
-       increased (r >= 0) then 0 is used as the base for the extra coordinates.
+       increased (r >= 0) then 0 is used as the base for the extra coordinates.
        LL coordinates are decreased by r and UR coordinates are increased by r. 
        If a LL coordinate is increased to larger than the corresponding UR 
-       coordinate (this can only happen when r < 0) than both coordinates are 
+       coordinate (this can only happen when r < 0) than both coordinates are 
        set to their average. To make it harder for people to break things there 
        is an effective maximum on the dimension of cubes of 100. This is set 
        in cubedata.h if you need something bigger.

diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 699884d8003400f363af5be5cdfcf06d7b7882b9..9b8e0cfe068aeab718e9c864ef407932a9af97ea 100644 (file)
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Data Types
@@ -3440,10 +3440,10 @@ SELECT 'fat:ab & cat'::tsquery;
      function is convenient for performing such normalization:
 
 
-SELECT to_tsquery('Fat:ab & Cats');
+SELECT to_tsquery('Fat:ab & Cats');
     to_tsquery    
 ------------------
- 'fat':AB & 'cat'
+ 'fat':AB & 'cat'
 
     
 

diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index 41679a79672451464f986ea4b453c25c254207d5..de06bbe359e88d245503e217c7fd1631e627508a 100644 (file)
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Data Definition
@@ -2312,7 +2312,7 @@ VALUES ('New York', NULL, NULL, 'NY');
 
     
      To set up a partitioned table, do the following:
-     compact>
+     "compact">
       
        
         Create the master table, from which all of the
@@ -2430,7 +2430,7 @@ CREATE TABLE measurement (
     
 
     
-     compact>
+     "compact">
       
        
         The master table is the measurement table, declared

diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 8dce63c00d62b324c73929ee2464ffbaf24a435f..707501bb040e3e9d3c335b27c52f3745ecd7bfe3 100644 (file)
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  Data Manipulation
@@ -135,7 +135,7 @@ INSERT INTO products (product_no, name, price) VALUES
 
   
    To perform an update, you need three pieces of information:
-   compact>
+   "compact">
     
      The name of the table and column to update,
     

diff --git a/doc/src/sgml/earthdistance.sgml b/doc/src/sgml/earthdistance.sgml
index 2d08bb829d6e43535eb9fe5bed2e8ed1310eb68c..8688f5baea72f2d144019f5e661a68717b4a24fc 100644 (file)
--- a/doc/src/sgml/earthdistance.sgml
+++ b/doc/src/sgml/earthdistance.sgml
@@ -114,7 +114,7 @@
      
     
     
-     <@> operator
+     <@> operator
      gives the distance in statute miles between
       two points on the Earth's surface. Coordinates are in degrees. Points are
       taken as (longitude, latitude) and not vice versa as longitude is closer 

diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index e57b5222d056efae93e5e9d0b787dabaad1d8903..2bcfcf5c5fe705ce74d0d11013b3bbd14a49f4f2 100644 (file)
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -1,4 +1,4 @@
-
+
 
 
  <application>ECPG</application> - Embedded <acronym>SQL</acronym> in C
@@ -4695,7 +4695,7 @@ cc -o myprog prog1.o prog2.o ... -lecpg
 ECPG = ecpg
 
 %.c: %.pgc
-        $(ECPG) $<
+        $(ECPG) $<
 
   
 

diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 9662090d569c378cc2fa0fc577d3caa9be12ff43..deb6ec19d27e87a80eee7d7cdee539b1eeadddbd 100644 (file)
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   Functions and Operators
@@ -7752,15 +7752,15 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         to_tsquery( config regconfig ,  query text)
         tsquery
         normalize words and convert to tsquery
-        to_tsquery('english', 'The & Fat & Rats')
-        'fat' & 'rat'
+        to_tsquery('english', 'The & Fat & Rats')
+        'fat' & 'rat'
        
        
         plainto_tsquery( config regconfig ,  query text)
         tsquery
         produce tsquery ignoring punctuation
         plainto_tsquery('english', 'The Fat Rats')
-        'fat' & 'rat'
+        'fat' & 'rat'
        
        
         numnode(tsquery)
@@ -7773,7 +7773,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         querytree(query tsquery)
         text
         get indexable part of a tsquery
-        querytree('foo & ! bar'::tsquery)
+        querytree('foo & ! bar'::tsquery)
         'foo'
        
        

diff --git a/doc/src/sgml/fuzzystrmatch.sgml b/doc/src/sgml/fuzzystrmatch.sgml
index 666e031c0d63fcf84fa26be0878ddc930892d081..8200725b17d02ef8a9cf4bbec85722b27922153f 100644 (file)
--- a/doc/src/sgml/fuzzystrmatch.sgml
+++ b/doc/src/sgml/fuzzystrmatch.sgml
@@ -41,30 +41,30 @@ INSERT INTO s VALUES ('jack');
 
 SELECT * FROM s WHERE soundex(nm) = soundex('john');
 
-SELECT a.nm, b.nm FROM s a, s b WHERE soundex(a.nm) = soundex(b.nm) AND a.oid <> b.oid;
+SELECT a.nm, b.nm FROM s a, s b WHERE soundex(a.nm) = soundex(b.nm) AND a.oid <> b.oid;
 
 CREATE FUNCTION text_sx_eq(text, text) RETURNS boolean AS
 'select soundex($1) = soundex($2)'
 LANGUAGE SQL;
 
 CREATE FUNCTION text_sx_lt(text, text) RETURNS boolean AS
-'select soundex($1) < soundex($2)'
+'select soundex($1) < soundex($2)'
 LANGUAGE SQL;
 
 CREATE FUNCTION text_sx_gt(text, text) RETURNS boolean AS
-'select soundex($1) > soundex($2)'
+'select soundex($1) > soundex($2)'
 LANGUAGE SQL;
 
 CREATE FUNCTION text_sx_le(text, text) RETURNS boolean AS
-'select soundex($1) <= soundex($2)'
+'select soundex($1) <= soundex($2)'
 LANGUAGE SQL;
 
 CREATE FUNCTION text_sx_ge(text, text) RETURNS boolean AS
-'select soundex($1) >= soundex($2)'
+'select soundex($1) >= soundex($2)'
 LANGUAGE SQL;
 
 CREATE FUNCTION text_sx_ne(text, text) RETURNS boolean AS
-'select soundex($1) <> soundex($2)'
+'select soundex($1) <> soundex($2)'
 LANGUAGE SQL;
 
 DROP OPERATOR #= (text, text);
@@ -75,7 +75,7 @@ SELECT * FROM s WHERE text_sx_eq(nm, 'john');
 
 SELECT * FROM s WHERE s.nm #= 'john';
 
-SELECT * FROM s WHERE difference(s.nm, 'john') > 2;
+SELECT * FROM s WHERE difference(s.nm, 'john') > 2;
   
  
 

diff --git a/doc/src/sgml/intarray.sgml b/doc/src/sgml/intarray.sgml
index b01d825cee56c6914211a1d36776cc1637bcaa77..a7f29980e593eece7cddf188cff8671123c19f19 100644 (file)
--- a/doc/src/sgml/intarray.sgml
+++ b/doc/src/sgml/intarray.sgml
@@ -131,15 +131,15 @@ test=# select intset(1);
     
     
      
-      int[] && int[]
+      int[] && int[]
       overlap - returns TRUE if arrays have at least one common element
      
      
-      int[] @> int[]
+      int[] @> int[]
       contains - returns TRUE if left array contains right array
      
      
-      int[] <@ int[]
+      int[] <@ int[]
       contained - returns TRUE if left array is contained in right array
      
      
@@ -172,7 +172,7 @@ test=# select intset(1);
      
 
      
-      int[] & int[]
+      int[] &amp; int[]
       returns intersection of arrays
      
 
@@ -192,7 +192,7 @@ test=# select intset(1);
    
   
   
-   (Before PostgreSQL 8.2, the containment operators @> and <@ were
+   (Before PostgreSQL 8.2, the containment operators @> and <@ were
    respectively called @ and ~.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
@@ -213,12 +213,12 @@ CREATE unique index message_section_map_key2 ON message_section_map (sid, mid );
 CREATE INDEX message_rdtree_idx ON message USING GIST ( sections gist__int_ops);
 
 -- select some messages with section in 1 OR 2 - OVERLAP operator
-SELECT message.mid FROM message WHERE message.sections && '{1,2}'; 
+SELECT message.mid FROM message WHERE message.sections &amp;& '{1,2}'; 
 
 -- select messages contains in sections 1 AND 2 - CONTAINS operator
-SELECT message.mid FROM message WHERE message.sections @> '{1,2}';
+SELECT message.mid FROM message WHERE message.sections @> '{1,2}';
 -- the same, CONTAINED operator
-SELECT message.mid FROM message WHERE '{1,2}' <@ message.sections;
+SELECT message.mid FROM message WHERE '{1,2}' <@ message.sections;
   
  
 
@@ -230,7 +230,7 @@ SELECT message.mid FROM message WHERE '{1,2}' <@ message.sections;
   
   cd ./bench
   1. createdb TEST
-  2. psql TEST < ../_int.sql
+  2. psql TEST < ../_int.sql
   3. ./create_test.pl | psql TEST
   4. ./bench.pl - perl script to benchmark queries, supports OR, AND queries
                   with/without RD-Tree. Run script without arguments to

diff --git a/doc/src/sgml/isn.sgml b/doc/src/sgml/isn.sgml
index 209cef343eb5fffd9ac48386a5dc8c83dfc3b6ca..81b32968188a5b98a0ead69117ab54b1f73e10ab 100644 (file)
--- a/doc/src/sgml/isn.sgml
+++ b/doc/src/sgml/isn.sgml
@@ -244,52 +244,52 @@
   
    
     
-     ISBN13 -> EAN13
+     ISBN13 -> EAN13
     
    
    
     
-     ISMN13 -> EAN13
+     ISMN13 -> EAN13
     
    
    
     
-     ISSN13 -> EAN13
+     ISSN13 -> EAN13
     
    
    
     
-     ISBN -> EAN13
+     ISBN -> EAN13
     
    
    
     
-     ISMN -> EAN13
+     ISMN -> EAN13
     
    
    
     
-     ISSN -> EAN13
+     ISSN -> EAN13
     
    
    
     
-     UPC  -> EAN13
+     UPC  -> EAN13
     
    
    
     
-     ISBN <-> ISBN13
+     ISBN <-> ISBN13
     
    
    
     
-     ISMN <-> ISMN13
+     ISMN <-> ISMN13
     
    
    
     
-     ISSN <-> ISSN13
+     ISSN <-> ISSN13
     
    
   

diff --git a/doc/src/sgml/lo.sgml b/doc/src/sgml/lo.sgml
index 2a23a5b5cd053d1eed8b0343911ee301f0f6e5f2..d994d9f84bad6e584930e00bf3d1be0d2ab87dbe 100644 (file)
--- a/doc/src/sgml/lo.sgml
+++ b/doc/src/sgml/lo.sgml
@@ -102,7 +102,7 @@
   
 
   
-   As the ODBC driver needs a permanent lo type (& JDBC could be optimised to
+   As the ODBC driver needs a permanent lo type (& JDBC could be optimised to
    use it if it's Oid is fixed), and as the above issues can only be fixed by
    some internal changes, I feel it should become a permanent built-in type.
   

diff --git a/doc/src/sgml/ltree.sgml b/doc/src/sgml/ltree.sgml
index 75c02013c7315d23a99a63d2a740ece7c50bf576..f98555c31acaea44c02f93ed0b005b9cd55e018b 100644 (file)
--- a/doc/src/sgml/ltree.sgml
+++ b/doc/src/sgml/ltree.sgml
@@ -15,7 +15,7 @@
  
   Definitions
   
-   A <emphasis>label> of a node is a sequence of one or more words 
+   A <firstterm>label> of a node is a sequence of one or more words 
    separated by blank character '_' and containing letters and digits ( for 
    example, [a-zA-Z0-9] for C locale). The length of a label is limited by 256 
    bytes.
@@ -24,9 +24,9 @@
    Example: 'Countries', 'Personal_Services'
   
   
-   A <emphasis>label path> of a node is a sequence of one or more 
+   A <firstterm>label path> of a node is a sequence of one or more 
    dot-separated labels l1.l2...ln, represents path from root to the node. The 
-   length of a label path is limited by 65Kb, but size <= 2Kb is preferrable. 
+   length of a label path is limited by 65Kb, but size <= 2Kb is preferrable. 
    We consider it's not a strict limitation (maximal size of label path for 
    DMOZ catalogue - , is about 240 
    bytes!)
@@ -85,7 +85,7 @@
      
      
       %     Don't account word separator '_' in label matching, that is 
-                     'Russian%' would match 'Russian_nations', but not 'Russian'
+                  'Russian%' would match 'Russian_nations', but not 'Russian'
       
      
     
@@ -143,7 +143,7 @@
     the end of word. The meaning of modifiers are the same as for lquery.
     
     
-     Example: 'Europe & Russia*@ & !Transportation'
+     Example: 'Europe &amp; Russia*@ & !Transportation'
     
     
      Search paths contain words 'Europe' and 'Russia*' (case-insensitive) and
@@ -164,21 +164,21 @@
   
    
     
-     <,>,<=,>=,=, <>
+     <,>,<=,>=,=, <>
      - Have their usual meanings. Comparison is doing in the order of direct
      tree traversing, children of a node are sorted lexicographic.
     
    
    
     
-     ltree @> ltree
+     ltree @> ltree
       - returns TRUE if left argument is an ancestor of right argument (or
       equal).
     
    
    
     
-     ltree <@ ltree 
+     ltree <@ ltree 
      - returns TRUE if left argument is a descendant of right argument (or
      equal).
     
@@ -216,13 +216,13 @@
   
    
     
-     ltree[] @> ltree, ltree <@ ltree[]
+     ltree[] @> ltree, ltree <@ ltree[]
      - returns TRUE if array ltree[] contains an ancestor of ltree.
     
    
    
     
-     ltree @> ltree[], ltree[] <@ ltree
+     ltree @> ltree[], ltree[] <@ ltree
      - returns TRUE if array ltree[] contains a descendant of ltree.
     
    
@@ -248,7 +248,7 @@
    
    
     
-     ltree[] ?@> ltree, ltree ?<@ ltree[], ltree[] ?~ lquery, ltree[] ?@ ltxtquery
+     ltree[] ?@> ltree, ltree ?<@ ltree[], ltree[] ?~ lquery, ltree[] ?@ ltxtquery
 
      - returns first element of array ltree[] satisfies corresponding condition
      and NULL in vice versa.
@@ -292,7 +292,7 @@
    
    
     GiST index over ltree[]:
-     ltree[]<@ ltree, ltree @> ltree[], @, ~, ?.
+     ltree[]<@ ltree, ltree @> ltree[], @, ~, ?.
     
     
      Example:
@@ -418,8 +418,8 @@
   Example
   
  createdb ltreetest
- psql ltreetest < /usr/local/pgsql/share/contrib/ltree.sql
- psql ltreetest < ltreetest.sql
+ psql ltreetest < /usr/local/pgsql/share/contrib/ltree.sql
+ psql ltreetest < ltreetest.sql
   
 
   
@@ -445,7 +445,7 @@ shown below:
   
 
   
-ltreetest=# select path from test where path <@ 'Top.Science';
+ltreetest=# select path from test where path <@ 'Top.Science';
                 path                
 ------------------------------------
  Top.Science
@@ -481,7 +481,7 @@ ltreetest=# select path from test where path ~ '*.!pictures@.*.Astronomy.*';
    Full text search:
   
   
-ltreetest=# select path from test where path @ 'Astro*% & !pictures@';
+ltreetest=# select path from test where path @ 'Astro*% &amp; !pictures@';
                 path                
 ------------------------------------
  Top.Science.Astronomy
@@ -490,7 +490,7 @@ ltreetest=# select path from test where path @ 'Astro*% & !pictures@';
  Top.Hobbies.Amateurs_Astronomy
 (4 rows)
 
-ltreetest=# select path from test where path @ 'Astro* & !pictures@';
+ltreetest=# select path from test where path @ 'Astro* &amp; !pictures@';
                 path                
 ------------------------------------
  Top.Science.Astronomy
@@ -502,7 +502,7 @@ ltreetest=# select path from test where path @ 'Astro* & !pictures@';
    Using Functions:
   
   
-ltreetest=# select subpath(path,0,2)||'Space'||subpath(path,2) from test where path <@ 'Top.Science.Astronomy';
+ltreetest=# select subpath(path,0,2)||'Space'||subpath(path,2) from test where path <@ 'Top.Science.Astronomy';
                  ?column?                 
 ------------------------------------------
  Top.Science.Space.Astronomy
@@ -519,7 +519,7 @@ LANGUAGE SQL IMMUTABLE;
   
 
   
-ltreetest=# select ins_label(path,2,'Space') from test where path <@ 'Top.Science.Astronomy';
+ltreetest=# select ins_label(path,2,'Space') from test where path <@ 'Top.Science.Astronomy';
                 ins_label                 
 ------------------------------------------
  Top.Science.Space.Astronomy
@@ -537,7 +537,7 @@ CREATE FUNCTION ins_label(ltree, ltree, text) RETURNS ltree
 AS 'select subpath($1,0,nlevel($2)) || $3 || subpath($1,nlevel($2));'
 LANGUAGE SQL IMMUTABLE;
 
-ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where path <@ 'Top.Science.Astronomy';
+ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where path <@ 'Top.Science.Astronomy';
                 ins_label                 
 ------------------------------------------
  Top.Science.Space.Astronomy
@@ -606,7 +606,7 @@ ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where
       Q2: The same as Q1 but with counting of successors
      
      
-     select path as parentpath , (select count(*)-1 from dmoz where path <@
+     select path as parentpath , (select count(*)-1 from dmoz where path <@
      p.path) as count from dmoz p where path ~ 'Top.Adult.Arts.Animation.*{1}';
                  parentpath             | count 
      -----------------------------------+-------
@@ -620,7 +620,7 @@ ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where
       Q3: Get all parents
      
      
-     select path from dmoz where path @> 'Top.Adult.Arts.Animation' order by
+     select path from dmoz where path @> 'Top.Adult.Arts.Animation' order by
      path asc;
                 path           
      --------------------------
@@ -636,8 +636,8 @@ ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where
       Q4: Get all parents with counting of children
      
      
-     select path, (select count(*)-1 from dmoz where path <@ p.path) as count
-     from dmoz p where path @> 'Top.Adult.Arts.Animation' order by path asc;
+     select path, (select count(*)-1 from dmoz where path <@ p.path) as count
+     from dmoz p where path @> 'Top.Adult.Arts.Animation' order by path asc;
                 path           | count  
      --------------------------+--------
       Top                      | 300273
@@ -753,7 +753,7 @@ ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where
   
    For ltree we store LPS in a B-tree, implemented using GiST. Each node entry is
    represented by (left_bound, signature, right_bound), so that we could speedup
-   operations <, <=, =, >=, > using left_bound, right_bound and prune branches of
+   operations <, <=, =, >=, > using left_bound, right_bound and prune branches of
    a tree using signature.
   
  
@@ -768,4 +768,3 @@ ltreetest=# select ins_label(path,'Top.Science'::ltree,'Space') from test where
   
  
 
-

diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 027d0eb7ec1c6aa5916cd601699d68f84390e19c..32f668aabe5577f5412b0b7d1ca13fd5fd289509 100644 (file)
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   <application>PL/pgSQL</application> - <acronym>SQL</acronym> Procedural Language
@@ -704,7 +704,7 @@ IF x < y THEN ...
 
      what happens behind the scenes is
 
-PREPARE statement_name(integer, integer) AS SELECT $1 < $2;
+PREPARE statement_name(integer, integer) AS SELECT $1 < $2;
 
      and then this prepared statement is EXECUTEd for each
      execution of the IF statement, with the current values

diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index 6ae266a5b72190b82ee390262c552dca04ba234d..38d12128568ccb0562bdda7400656661dc0a1f6b 100644 (file)
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -1,4 +1,4 @@
-
+
 
  
   PL/Tcl - Tcl Procedural Language
@@ -164,7 +164,7 @@ CREATE FUNCTION overpaid(employee) RETURNS boolean AS $$
     if {200000.0 < $1(salary)} {
         return "t"
     }
-    if {$1(age) < 30 && 100000.0 < $1(salary)} {
+    if {$1(age) < 30 &amp;& 100000.0 < $1(salary)} {
         return "t"
     }
     return "f"

diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 78276ec954d5a118aa994d1b7d2b9da2f8f5ebbd..366922cc6248ff617caac5449e86238e3228fa9c 100644 (file)
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -1,5 +1,5 @@
 
 
@@ -270,7 +270,7 @@ CREATE OPERATOR CLASS name [ DEFAUL
 
 CREATE OPERATOR CLASS gist__int_ops
     DEFAULT FOR TYPE _int4 USING gist AS
-        OPERATOR        3       &&,
+        OPERATOR        3       &&,
         OPERATOR        6       =       RECHECK,
         OPERATOR        7       @>,
         OPERATOR        8       <@,

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index 752032f1db925cd380b104b2f82f87abb3923c66..b4b502ca981286f58a32b75f9f2573c2c1bcf54b 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,4 +1,4 @@
-
+
 
+
 
  
   Triggers
@@ -288,7 +288,7 @@ CALLED_AS_TRIGGER(fcinfo)
 
     which expands to:
 
-((fcinfo)->context != NULL && IsA((fcinfo)->context, TriggerData))
+((fcinfo)->context != NULL && IsA((fcinfo)->context, TriggerData))
 
     If this returns true, then it is safe to cast
     fcinfo->context to type TriggerData
@@ -580,7 +580,7 @@ trigf(PG_FUNCTION_ARGS)
 
     /* check for null values */
     if (!TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)
-        && TRIGGER_FIRED_BEFORE(trigdata->tg_event))
+        && TRIGGER_FIRED_BEFORE(trigdata->tg_event))
         checknull = true;
 
     if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))

diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml
index 15a52658f79df19085830a6eb19a415bbe9a903d..9a0af4b537f00687fe3f0d88e0756aa695c4bbd9 100644 (file)
--- a/doc/src/sgml/xml2.sgml
+++ b/doc/src/sgml/xml2.sgml
@@ -401,7 +401,7 @@ WHERE t.author_id = p.person_id;
    
    
     Also note that if either the document or stylesheet values do not
-    begin with a < then they will be treated as URLs and libxslt will
+    begin with a < then they will be treated as URLs and libxslt will
     fetch them. It thus follows that you can use xslt_process as a means
     to fetch the contents of URLs - you should be aware of the security
     implications of this.