Change -> and <- to use proper ampersand markups.

HEAD and 8.0.X.

diff --git a/doc/src/sgml/cvs.sgml b/doc/src/sgml/cvs.sgml
index df2245e1fcddd347348fa4082c05ebc4d9ad81c6..a72293932cc88d3c215d98b60ac37b459fde7b1f 100644 (file)
--- a/doc/src/sgml/cvs.sgml
+++ b/doc/src/sgml/cvs.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -214,7 +214,7 @@ $ cvs checkout -r REL6_4 tc
    
              file1   file2   file3   file4   file5
 
-             1.1     1.1     1.1     1.1  /--1.1*      <-*-  TAG
+             1.1     1.1     1.1     1.1  /--1.1*      <-*-  TAG
              1.2*-   1.2     1.2    -1.2*-
              1.3  \- 1.3*-   1.3   / 1.3
              1.4          \  1.4  /  1.4

diff --git a/doc/src/sgml/indexcost.sgml b/doc/src/sgml/indexcost.sgml
index 56d46c35cf049b5b002af026b22363829234fb09..9758e8ef68f356506ee61be498cfe97f6dc0ed56 100644 (file)
--- a/doc/src/sgml/indexcost.sgml
+++ b/doc/src/sgml/indexcost.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -205,7 +205,7 @@ amcostestimate (Query *root,
 
      
 *indexSelectivity = clauselist_selectivity(root, indexQuals,
-                                           rel->relid, JOIN_INNER);
+                                           rel->relid, JOIN_INNER);
      
     
    

diff --git a/doc/src/sgml/plhandler.sgml b/doc/src/sgml/plhandler.sgml
index cc2cac92a2b0f81befcfcd5760dbd91dedafe104..5a1e272aa6384aa3c3c9ca6bf47281501103e7b3 100644 (file)
--- a/doc/src/sgml/plhandler.sgml
+++ b/doc/src/sgml/plhandler.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -121,7 +121,7 @@ plsample_call_handler(PG_FUNCTION_ARGS)
         /*
          * Called as a trigger procedure
          */
-        TriggerData    *trigdata = (TriggerData *) fcinfo->context;
+        TriggerData    *trigdata = (TriggerData *) fcinfo->context;
 
         retval = ...
     }

diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index deba31952537fefdd4c0109ef252cd948c677931..847a4d39413980089a25eb5c5f946a17a6328b74 100644 (file)
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -7138,7 +7138,7 @@ Added documentation to tarball.
      
 Fix many CLUSTER failures (Tom)
 Allow ALTER TABLE RENAME works on indexes (Tom)
-Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
+Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
 New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
 Fix the off by one errors in ResultSet from 6.5.3, and more.
 jdbc ResultSet fixes (Joseph Shraibman)
@@ -8017,7 +8017,7 @@ Add Win1250 (Czech) support (Pavel Behal)
      
 Bug Fixes
 ---------
-Fix text<->float8 and text<->float4 conversion functions(Thomas)
+Fix text<->float8 and text<->float4 conversion functions(Thomas)
 Fix for creating tables with mixed-case constraints(Billy)
 Change exp()/pow() behavior to generate error on underflow/overflow(Jan)
 Fix bug in pg_dump -z
@@ -9225,7 +9225,7 @@ Check explicitly for points and polygons contained within polygons
         using an axis-crossing algorithm(Thomas)
 Add routine to convert circle-box(Thomas)
 Merge conflicting operators for different geometric data types(Thomas)
-Replace distance operator "<===>" with "<->"(Thomas)
+Replace distance operator "<===>" with "<->"(Thomas)
 Replace "above" operator "!^" with ">^" and "below" operator "!|" with "<^"(Thomas)
 Add routines for text trimming on both ends, substring, and string position(Thomas)
 Added conversion routines circle(box) and poly(circle)(Thomas)
@@ -10093,9 +10093,9 @@ more compliant to the SQL-92 standard):
    char(N), varchar(N), date and time.
 
    The following are aliases to existing postgres types:
-                smallint -> int2
-                integer, int -> int4
-                float, real  -> float4
+                smallint -> int2
+                integer, int -> int4
+                float, real  -> float4
    char(N) and varchar(N) are implemented as truncated text types. In
    addition, char(N) does blank-padding. 
  * single-quote (') is used for quoting string literals; '' (in addition to

diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index 2b53c84c7b15d673cce3388bceb4a444d627dd29..c04ce33841c071816402f832c390fb8d79228aab 100644 (file)
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -1,4 +1,4 @@
-
+
 
 
 The Rule System
@@ -1565,26 +1565,26 @@ UPDATE shoelace_data
 
 
 Nested Loop
-  ->  Merge Join
-        ->  Seq Scan
-              ->  Sort
-                    ->  Seq Scan on s
-        ->  Seq Scan
-              ->  Sort
-                    ->  Seq Scan on shoelace_arrive
-  ->  Seq Scan on shoelace_data
+  ->  Merge Join
+        ->  Seq Scan
+              ->  Sort
+                    ->  Seq Scan on s
+        ->  Seq Scan
+              ->  Sort
+                    ->  Seq Scan on shoelace_arrive
+  ->  Seq Scan on shoelace_data
 
 
     while omitting the extra range table entry would result in a
 
 
 Merge Join
-  ->  Seq Scan
-        ->  Sort
-              ->  Seq Scan on s
-  ->  Seq Scan
-        ->  Sort
-              ->  Seq Scan on shoelace_arrive
+  ->  Seq Scan
+        ->  Sort
+              ->  Seq Scan on s
+  ->  Seq Scan
+        ->  Sort
+              ->  Seq Scan on shoelace_arrive
 
 
     which produces exactly the same entries in the log table.  Thus,
@@ -1943,8 +1943,8 @@ DELETE FROM software WHERE computer.hostname = 'mypc.local.net'
 
 
 Nestloop
-  ->  Index Scan using comp_hostidx on computer
-  ->  Index Scan using soft_hostidx on software
+  ->  Index Scan using comp_hostidx on computer
+  ->  Index Scan using soft_hostidx on software
 
 
     So there would be not that much difference in speed between
@@ -1973,9 +1973,9 @@ DELETE FROM software WHERE computer.hostname >= 'old' AND computer.hostname < 'o
 
 
 Hash Join
-  ->  Seq Scan on software
-  ->  Hash
-    ->  Index Scan using comp_hostidx on computer
+  ->  Seq Scan on software
+  ->  Hash
+    ->  Index Scan using comp_hostidx on computer
 
 
     The other possible command is
@@ -1989,8 +1989,8 @@ DELETE FROM computer WHERE hostname ~ '^old';
 
 
 Nestloop
-  ->  Index Scan using comp_hostidx on computer
-  ->  Index Scan using soft_hostidx on software
+  ->  Index Scan using comp_hostidx on computer
+  ->  Index Scan using soft_hostidx on software
 
 
     This shows, that the planner does not realize that the
@@ -2030,8 +2030,8 @@ DELETE FROM software WHERE computer.manufacurer = 'bim'
 
 
 Nestloop
-  ->  Index Scan using comp_manufidx on computer
-  ->  Index Scan using soft_hostidx on software
+  ->  Index Scan using comp_manufidx on computer
+  ->  Index Scan using soft_hostidx on software
 
 
     In any of these cases, the extra commands from the rule system

diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 2f6db62c668919fbc7a75f4d2f894e73708660ca..1994f7230cdf6c68cfeecee7335256fb0d468495 100644 (file)
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -1,5 +1,5 @@
 
 
 
@@ -2931,19 +2931,19 @@ execq(text *sql, int cnt)
      */
     if (ret == SPI_OK_SELECT && SPI_processed > 0)
     {
-        TupleDesc tupdesc = SPI_tuptable->tupdesc;
+        TupleDesc tupdesc = SPI_tuptable->tupdesc;
         SPITupleTable *tuptable = SPI_tuptable;
         char buf[8192];
         int i, j;
         
         for (j = 0; j < proc; j++)
         {
-            HeapTuple tuple = tuptable->vals[j];
+            HeapTuple tuple = tuptable->vals[j];
             
-            for (i = 1, buf[0] = 0; i <= tupdesc->natts; i++)
+            for (i = 1, buf[0] = 0; i <= tupdesc->natts; i++)
                 snprintf(buf + strlen (buf), sizeof(buf) - strlen(buf), " %s%s",
                         SPI_getvalue(tuple, tupdesc, i),
-                        (i == tupdesc->natts) ? " " : " |");
+                        (i == tupdesc->natts) ? " " : " |");
             elog (INFO, "EXECQ: %s", buf);
         }
     }

diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index f7fa39b80207b58a37540ae1e9b22a64d7d0dd89..0708e0b2499832754e18005460161301e5d60588 100644 (file)
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -271,10 +271,10 @@ 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
+    fcinfo->context to type TriggerData
     * and make use of the pointed-to
     TriggerData structure.  The function must
     not alter the TriggerData
@@ -393,8 +393,8 @@ typedef struct TriggerData
         A pointer to a structure describing the relation that the trigger fired for.
         Look at utils/rel.h for details about
         this structure.  The most interesting things are
-        tg_relation->rd_att (descriptor of the relation
-        tuples) and tg_relation->rd_rel->relname
+        tg_relation->rd_att (descriptor of the relation
+        tuples) and tg_relation->rd_rel->relname
         (relation name; the type is not char* but
         NameData; use
         SPI_getrelname(tg_relation) to get a char* if you
@@ -541,7 +541,7 @@ PG_FUNCTION_INFO_V1(trigf);
 Datum
 trigf(PG_FUNCTION_ARGS)
 {
-    TriggerData *trigdata = (TriggerData *) fcinfo->context;
+    TriggerData *trigdata = (TriggerData *) fcinfo->context;
     TupleDesc   tupdesc;
     HeapTuple   rettuple;
     char       *when;
@@ -554,22 +554,22 @@ trigf(PG_FUNCTION_ARGS)
         elog(ERROR, "trigf: not called by trigger manager");
 
     /* tuple to return to executor */
-    if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-        rettuple = trigdata->tg_newtuple;
+    if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
+        rettuple = trigdata->tg_newtuple;
     else
-        rettuple = trigdata->tg_trigtuple;
+        rettuple = trigdata->tg_trigtuple;
 
     /* check for null values */
-    if (!TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)
-        && TRIGGER_FIRED_BEFORE(trigdata->tg_event))
+    if (!TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)
+        && TRIGGER_FIRED_BEFORE(trigdata->tg_event))
         checknull = true;
 
-    if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
+    if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
         when = "before";
     else
         when = "after ";
 
-    tupdesc = trigdata->tg_relation->rd_att;
+    tupdesc = trigdata->tg_relation->rd_att;
 
     /* connect to SPI manager */
     if ((ret = SPI_connect()) < 0)
@@ -582,8 +582,8 @@ trigf(PG_FUNCTION_ARGS)
         elog(NOTICE, "trigf (fired %s): SPI_exec returned %d", when, ret);
 
     /* count(*) returns int8, so be careful to convert */
-    i = DatumGetInt64(SPI_getbinval(SPI_tuptable->vals[0],
-                                    SPI_tuptable->tupdesc,
+    i = DatumGetInt64(SPI_getbinval(SPI_tuptable->vals[0],
+                                    SPI_tuptable->tupdesc,
                                     1,
                                     &isnull));
 

diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index 51566d1056f24f75321d729d6395b55420c67a4a..cc03bb9af4447963765852b12fddc48f32f6837b 100644 (file)
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -1,5 +1,5 @@
 
 
  
@@ -1482,8 +1482,8 @@ makepoint(Point *pointx, Point *pointy)
 {
     Point     *new_point = (Point *) palloc(sizeof(Point));
 
-    new_point->x = pointx->x;
-    new_point->y = pointy->y;
+    new_point->x = pointx->x;
+    new_point->y = pointy->y;
        
     return new_point;
 }
@@ -1665,8 +1665,8 @@ makepoint(PG_FUNCTION_ARGS)
     Point     *pointy = PG_GETARG_POINT_P(1);
     Point     *new_point = (Point *) palloc(sizeof(Point));
 
-    new_point->x = pointx->x;
-    new_point->y = pointy->y;
+    new_point->x = pointx->x;
+    new_point->y = pointy->y;
        
     PG_RETURN_POINT_P(new_point);
 }
@@ -2447,7 +2447,7 @@ my_set_returning_function(PG_FUNCTION_ARGS)
     if (SRF_IS_FIRSTCALL())
     {
         funcctx = SRF_FIRSTCALL_INIT();
-        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
         /* One-time setup code appears here: */
         user code
         if returning composite
@@ -2503,7 +2503,7 @@ testpassbyval(PG_FUNCTION_ARGS)
         funcctx = SRF_FIRSTCALL_INIT();
 
         /* switch to memory context appropriate for multiple function calls */
-        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
+        oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
 
         /* total number of tuples to be returned */
         funcctx->max_calls = PG_GETARG_UINT32(0);