Skip to content

Commit 4c12830

Browse files
tglsfdctglsfdc
committed
Entity-ify a passel of & < > characters. Per gripe from Devrim.
1 parent f538329 commit 4c12830

21 files changed

+134
-135
lines changed

‎doc/src/sgml/btree-gist.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
-- create index
2020
CREATE INDEX testidx ON test USING gist (a);
2121
-- query
22-
SELECT * FROM test WHERE a < 10;
22+
SELECT * FROM test WHERE a &lt; 10;
2323
</programlisting>
2424
</sect2>
2525

‎doc/src/sgml/cube.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -287,28 +287,28 @@ a = b Same as
287287
</para>
288288

289289
<programlisting>
290-
a && b Overlaps
290+
a &amp;&amp; b Overlaps
291291
</programlisting>
292292
<para>
293293
The cubements a and b overlap.
294294
</para>
295295

296296
<programlisting>
297-
a @> b Contains
297+
a @&gt; b Contains
298298
</programlisting>
299299
<para>
300300
The cubement a contains the cubement b.
301301
</para>
302302

303303
<programlisting>
304-
a <@ b Contained in
304+
a &lt;@ b Contained in
305305
</programlisting>
306306
<para>
307307
The cubement a is contained in b.
308308
</para>
309309

310310
<para>
311-
(Before PostgreSQL 8.2, the containment operators @> and <@ were
311+
(Before PostgreSQL 8.2, the containment operators @&gt; and &lt;@ were
312312
respectively called @ and ~. These names are still available, but are
313313
deprecated and will eventually be retired. Notice that the old names
314314
are reversed from the convention formerly followed by the core geometric
@@ -326,8 +326,8 @@ a <@ b Contained in
326326
</para>
327327

328328
<programlisting>
329-
[a, b] < [c, d] Less than
330-
[a, b] > [c, d] Greater than
329+
[a, b] &lt; [c, d] Less than
330+
[a, b] &gt; [c, d] Greater than
331331
</programlisting>
332332

333333
<para>
@@ -462,10 +462,10 @@ a <@ b Contained in
462462
is useful for creating bounding boxes around a point for searching for
463463
nearby points. All defined dimensions are changed by the radius. If n
464464
is greater than the number of defined dimensions and the cube is being
465-
increased (r >= 0) then 0 is used as the base for the extra coordinates.
465+
increased (r &gt;= 0) then 0 is used as the base for the extra coordinates.
466466
LL coordinates are decreased by r and UR coordinates are increased by r.
467467
If a LL coordinate is increased to larger than the corresponding UR
468-
coordinate (this can only happen when r < 0) than both coordinates are
468+
coordinate (this can only happen when r &lt; 0) than both coordinates are
469469
set to their average. To make it harder for people to break things there
470470
is an effective maximum on the dimension of cubes of 100. This is set
471471
in cubedata.h if you need something bigger.

‎doc/src/sgml/datatype.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.220 2007/11/27 16:46:36 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.221 2007/12/03 23:49:50 tgl Exp $ -->
22

33
<chapter id="datatype">
44
<title id="datatype-title">Data Types</title>
@@ -3440,10 +3440,10 @@ SELECT 'fat:ab &amp; cat'::tsquery;
34403440
function is convenient for performing such normalization:
34413441

34423442
<programlisting>
3443-
SELECT to_tsquery('Fat:ab & Cats');
3443+
SELECT to_tsquery('Fat:ab &amp; Cats');
34443444
to_tsquery
34453445
------------------
3446-
'fat':AB & 'cat'
3446+
'fat':AB &amp; 'cat'
34473447
</programlisting>
34483448
</para>
34493449

‎doc/src/sgml/ddl.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.79 2007/12/03 04:59:55 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ddl.sgml,v 1.80 2007/12/03 23:49:50 tgl Exp $ -->
22

33
<chapter id="ddl">
44
<title>Data Definition</title>
@@ -2312,7 +2312,7 @@ VALUES ('New York', NULL, NULL, 'NY');
23122312

23132313
<para>
23142314
To set up a partitioned table, do the following:
2315-
<orderedlist spacing=compact>
2315+
<orderedlist spacing="compact">
23162316
<listitem>
23172317
<para>
23182318
Create the <quote>master</quote> table, from which all of the
@@ -2430,7 +2430,7 @@ CREATE TABLE measurement (
24302430
</para>
24312431

24322432
<para>
2433-
<orderedlist spacing=compact>
2433+
<orderedlist spacing="compact">
24342434
<listitem>
24352435
<para>
24362436
The master table is the <structname>measurement</> table, declared

‎doc/src/sgml/dml.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/dml.sgml,v 1.16 2007/02/01 00:28:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/dml.sgml,v 1.17 2007/12/03 23:49:50 tgl Exp $ -->
22

33
<chapter id="dml">
44
<title>Data Manipulation</title>
@@ -135,7 +135,7 @@ INSERT INTO products (product_no, name, price) VALUES
135135

136136
<para>
137137
To perform an update, you need three pieces of information:
138-
<orderedlist spacing=compact>
138+
<orderedlist spacing="compact">
139139
<listitem>
140140
<para>The name of the table and column to update,</para>
141141
</listitem>

‎doc/src/sgml/earthdistance.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
</entry>
115115
</row>
116116
<row>
117-
<entry><literal><@></literal> operator</entry>
117+
<entry><literal>&lt;@&gt;</literal> operator</entry>
118118
<entry>gives the distance in statute miles between
119119
two points on the Earth's surface. Coordinates are in degrees. Points are
120120
taken as (longitude, latitude) and not vice versa as longitude is closer

‎doc/src/sgml/ecpg.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.84 2007/11/07 12:24:23 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/ecpg.sgml,v 1.85 2007/12/03 23:49:50 tgl Exp $ -->
22

33
<chapter id="ecpg">
44
<title><application>ECPG</application> - Embedded <acronym>SQL</acronym> in C</title>
@@ -4695,7 +4695,7 @@ cc -o myprog prog1.o prog2.o ... -lecpg
46954695
ECPG = ecpg
46964696

46974697
%.c: %.pgc
4698-
$(ECPG) $<
4698+
$(ECPG) $&lt;
46994699
</programlisting>
47004700
</para>
47014701

‎doc/src/sgml/func.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.414 2007/11/28 15:42:31 petere Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/func.sgml,v 1.415 2007/12/03 23:49:50 tgl Exp $ -->
22

33
<chapter id="functions">
44
<title>Functions and Operators</title>
@@ -7752,15 +7752,15 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
77527752
<entry><literal><function>to_tsquery</function>(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</literal></entry>
77537753
<entry><type>tsquery</type></entry>
77547754
<entry>normalize words and convert to <type>tsquery</></entry>
7755-
<entry><literal>to_tsquery('english', 'The & Fat & Rats')</literal></entry>
7756-
<entry><literal>'fat' & 'rat'</literal></entry>
7755+
<entry><literal>to_tsquery('english', 'The &amp; Fat &amp; Rats')</literal></entry>
7756+
<entry><literal>'fat' &amp; 'rat'</literal></entry>
77577757
</row>
77587758
<row>
77597759
<entry><literal><function>plainto_tsquery</function>(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</literal></entry>
77607760
<entry><type>tsquery</type></entry>
77617761
<entry>produce <type>tsquery</> ignoring punctuation</entry>
77627762
<entry><literal>plainto_tsquery('english', 'The Fat Rats')</literal></entry>
7763-
<entry><literal>'fat' & 'rat'</literal></entry>
7763+
<entry><literal>'fat' &amp; 'rat'</literal></entry>
77647764
</row>
77657765
<row>
77667766
<entry><literal><function>numnode</function>(<type>tsquery</>)</literal></entry>
@@ -7773,7 +7773,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
77737773
<entry><literal><function>querytree</function>(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>)</literal></entry>
77747774
<entry><type>text</type></entry>
77757775
<entry>get indexable part of a <type>tsquery</></entry>
7776-
<entry><literal>querytree('foo & ! bar'::tsquery)</literal></entry>
7776+
<entry><literal>querytree('foo &amp; ! bar'::tsquery)</literal></entry>
77777777
<entry><literal>'foo'</literal></entry>
77787778
</row>
77797779
<row>

‎doc/src/sgml/fuzzystrmatch.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,30 @@ INSERT INTO s VALUES ('jack');
4141

4242
SELECT * FROM s WHERE soundex(nm) = soundex('john');
4343

44-
SELECT a.nm, b.nm FROM s a, s b WHERE soundex(a.nm) = soundex(b.nm) AND a.oid <> b.oid;
44+
SELECT a.nm, b.nm FROM s a, s b WHERE soundex(a.nm) = soundex(b.nm) AND a.oid &lt;&gt; b.oid;
4545

4646
CREATE FUNCTION text_sx_eq(text, text) RETURNS boolean AS
4747
'select soundex($1) = soundex($2)'
4848
LANGUAGE SQL;
4949

5050
CREATE FUNCTION text_sx_lt(text, text) RETURNS boolean AS
51-
'select soundex($1) < soundex($2)'
51+
'select soundex($1) &lt; soundex($2)'
5252
LANGUAGE SQL;
5353

5454
CREATE FUNCTION text_sx_gt(text, text) RETURNS boolean AS
55-
'select soundex($1) > soundex($2)'
55+
'select soundex($1) &gt; soundex($2)'
5656
LANGUAGE SQL;
5757

5858
CREATE FUNCTION text_sx_le(text, text) RETURNS boolean AS
59-
'select soundex($1) <= soundex($2)'
59+
'select soundex($1) &lt;= soundex($2)'
6060
LANGUAGE SQL;
6161

6262
CREATE FUNCTION text_sx_ge(text, text) RETURNS boolean AS
63-
'select soundex($1) >= soundex($2)'
63+
'select soundex($1) &gt;= soundex($2)'
6464
LANGUAGE SQL;
6565

6666
CREATE FUNCTION text_sx_ne(text, text) RETURNS boolean AS
67-
'select soundex($1) <> soundex($2)'
67+
'select soundex($1) &lt;&gt; soundex($2)'
6868
LANGUAGE SQL;
6969

7070
DROP OPERATOR #= (text, text);
@@ -75,7 +75,7 @@ SELECT * FROM s WHERE text_sx_eq(nm, 'john');
7575

7676
SELECT * FROM s WHERE s.nm #= 'john';
7777

78-
SELECT * FROM s WHERE difference(s.nm, 'john') > 2;
78+
SELECT * FROM s WHERE difference(s.nm, 'john') &gt; 2;
7979
</programlisting>
8080
</sect2>
8181

‎doc/src/sgml/intarray.sgml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,15 +131,15 @@ test=# select intset(1);
131131
</thead>
132132
<tbody>
133133
<row>
134-
<entry><literal>int[] && int[]</literal></entry>
134+
<entry><literal>int[] &amp;&amp; int[]</literal></entry>
135135
<entry>overlap - returns TRUE if arrays have at least one common element</entry>
136136
</row>
137137
<row>
138-
<entry><literal>int[] @> int[]</literal></entry>
138+
<entry><literal>int[] @&gt; int[]</literal></entry>
139139
<entry>contains - returns TRUE if left array contains right array</entry>
140140
</row>
141141
<row>
142-
<entry><literal>int[] <@ int[]</literal></entry>
142+
<entry><literal>int[] &lt;@ int[]</literal></entry>
143143
<entry>contained - returns TRUE if left array is contained in right array</entry>
144144
</row>
145145
<row>
@@ -172,7 +172,7 @@ test=# select intset(1);
172172
</row>
173173

174174
<row>
175-
<entry><literal>int[] & int[]</literal></entry>
175+
<entry><literal>int[] &amp; int[]</literal></entry>
176176
<entry>returns intersection of arrays</entry>
177177
</row>
178178

@@ -192,7 +192,7 @@ test=# select intset(1);
192192
</tgroup>
193193
</table>
194194
<para>
195-
(Before PostgreSQL 8.2, the containment operators @> and <@ were
195+
(Before PostgreSQL 8.2, the containment operators @&gt; and &lt;@ were
196196
respectively called @ and ~. These names are still available, but are
197197
deprecated and will eventually be retired. Notice that the old names
198198
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 );
213213
CREATE INDEX message_rdtree_idx ON message USING GIST ( sections gist__int_ops);
214214

215215
-- select some messages with section in 1 OR 2 - OVERLAP operator
216-
SELECT message.mid FROM message WHERE message.sections && '{1,2}';
216+
SELECT message.mid FROM message WHERE message.sections &amp;&amp; '{1,2}';
217217

218218
-- select messages contains in sections 1 AND 2 - CONTAINS operator
219-
SELECT message.mid FROM message WHERE message.sections @> '{1,2}';
219+
SELECT message.mid FROM message WHERE message.sections @&gt; '{1,2}';
220220
-- the same, CONTAINED operator
221-
SELECT message.mid FROM message WHERE '{1,2}' <@ message.sections;
221+
SELECT message.mid FROM message WHERE '{1,2}' &lt;@ message.sections;
222222
</programlisting>
223223
</sect2>
224224

@@ -230,7 +230,7 @@ SELECT message.mid FROM message WHERE '{1,2}' <@ message.sections;
230230
<programlisting>
231231
cd ./bench
232232
1. createdb TEST
233-
2. psql TEST < ../_int.sql
233+
2. psql TEST &lt; ../_int.sql
234234
3. ./create_test.pl | psql TEST
235235
4. ./bench.pl - perl script to benchmark queries, supports OR, AND queries
236236
with/without RD-Tree. Run script without arguments to

‎doc/src/sgml/isn.sgml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,52 +244,52 @@
244244
<itemizedlist>
245245
<listitem>
246246
<para>
247-
ISBN13 -> EAN13
247+
ISBN13 -&gt; EAN13
248248
</para>
249249
</listitem>
250250
<listitem>
251251
<para>
252-
ISMN13 -> EAN13
252+
ISMN13 -&gt; EAN13
253253
</para>
254254
</listitem>
255255
<listitem>
256256
<para>
257-
ISSN13 -> EAN13
257+
ISSN13 -&gt; EAN13
258258
</para>
259259
</listitem>
260260
<listitem>
261261
<para>
262-
ISBN -> EAN13
262+
ISBN -&gt; EAN13
263263
</para>
264264
</listitem>
265265
<listitem>
266266
<para>
267-
ISMN -> EAN13
267+
ISMN -&gt; EAN13
268268
</para>
269269
</listitem>
270270
<listitem>
271271
<para>
272-
ISSN -> EAN13
272+
ISSN -&gt; EAN13
273273
</para>
274274
</listitem>
275275
<listitem>
276276
<para>
277-
UPC -> EAN13
277+
UPC -&gt; EAN13
278278
</para>
279279
</listitem>
280280
<listitem>
281281
<para>
282-
ISBN <-> ISBN13
282+
ISBN &lt;-&gt; ISBN13
283283
</para>
284284
</listitem>
285285
<listitem>
286286
<para>
287-
ISMN <-> ISMN13
287+
ISMN &lt;-&gt; ISMN13
288288
</para>
289289
</listitem>
290290
<listitem>
291291
<para>
292-
ISSN <-> ISSN13
292+
ISSN &lt;-&gt; ISSN13
293293
</para>
294294
</listitem>
295295
</itemizedlist>

‎doc/src/sgml/lo.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
</itemizedlist>
103103

104104
<para>
105-
As the ODBC driver needs a permanent lo type (& JDBC could be optimised to
105+
As the ODBC driver needs a permanent lo type (&amp; JDBC could be optimised to
106106
use it if it's Oid is fixed), and as the above issues can only be fixed by
107107
some internal changes, I feel it should become a permanent built-in type.
108108
</para>

0 commit comments

Comments
 (0)