Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 09a9f10

Browse files
committed
Consistenly use colons before '<programlisting>' blocks, where
appropriate.
1 parent e81c138 commit 09a9f10

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+402
-405
lines changed

doc/src/sgml/advanced.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.53 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/advanced.sgml,v 1.54 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<chapter id="tutorial-advanced">
44
<title>Advanced Features</title>
@@ -42,7 +42,7 @@
4242
is of particular interest to your application, but you do not want
4343
to type the query each time you need it. You can create a
4444
<firstterm>view</firstterm> over the query, which gives a name to
45-
the query that you can refer to like an ordinary table.
45+
the query that you can refer to like an ordinary table:
4646

4747
<programlisting>
4848
CREATE VIEW myview AS
@@ -158,7 +158,7 @@ DETAIL: Key (city)=(Berkeley) is not present in table "cities".
158158
customer accounts, as well as total deposit balances for branches.
159159
Suppose that we want to record a payment of $100.00 from Alice's account
160160
to Bob's account. Simplifying outrageously, the SQL commands for this
161-
might look like
161+
might look like:
162162

163163
<programlisting>
164164
UPDATE accounts SET balance = balance - 100.00
@@ -219,7 +219,7 @@ UPDATE branches SET balance = balance + 100.00
219219
In <productname>PostgreSQL</>, a transaction is set up by surrounding
220220
the SQL commands of the transaction with
221221
<command>BEGIN</> and <command>COMMIT</> commands. So our banking
222-
transaction would actually look like
222+
transaction would actually look like:
223223

224224
<programlisting>
225225
BEGIN;
@@ -392,7 +392,7 @@ CREATE TABLE capitals (
392392
<para>
393393
For example, the following query finds the names of all cities,
394394
including state capitals, that are located at an altitude
395-
over 500 ft.:
395+
over 500 feet:
396396

397397
<programlisting>
398398
SELECT name, altitude
@@ -415,7 +415,7 @@ SELECT name, altitude
415415
<para>
416416
On the other hand, the following query finds
417417
all the cities that are not state capitals and
418-
are situated at an altitude of 500 ft. or higher:
418+
are situated at an altitude of 500 feet or higher:
419419

420420
<programlisting>
421421
SELECT name, altitude

doc/src/sgml/array.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.55 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/array.sgml,v 1.56 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<sect1 id="arrays">
44
<title>Arrays</title>
@@ -102,7 +102,7 @@ CREATE TABLE tictactoe (
102102
<literal>box</> uses a semicolon (<literal>;</>) but all the others
103103
use comma (<literal>,</>). Each <replaceable>val</replaceable> is
104104
either a constant of the array element type, or a subarray. An example
105-
of an array constant is
105+
of an array constant is:
106106
<programlisting>
107107
'{{1,2,3},{4,5,6},{7,8,9}}'
108108
</programlisting>
@@ -126,7 +126,7 @@ CREATE TABLE tictactoe (
126126
</para>
127127

128128
<para>
129-
Now we can show some <command>INSERT</command> statements.
129+
Now we can show some <command>INSERT</command> statements:
130130

131131
<programlisting>
132132
INSERT INTO sal_emp
@@ -302,7 +302,7 @@ SELECT array_dims(schedule) FROM sal_emp WHERE name = 'Carol';
302302
for programs. Dimensions can also be retrieved with
303303
<function>array_upper</function> and <function>array_lower</function>,
304304
which return the upper and lower bound of a
305-
specified array dimension, respectively.
305+
specified array dimension, respectively:
306306

307307
<programlisting>
308308
SELECT array_upper(schedule, 1) FROM sal_emp WHERE name = 'Carol';
@@ -368,7 +368,7 @@ UPDATE sal_emp SET pay_by_quarter[1:2] = '{27000,27000}'
368368

369369
<para>
370370
New array values can also be constructed by using the concatenation operator,
371-
<literal>||</literal>.
371+
<literal>||</literal>:
372372
<programlisting>
373373
SELECT ARRAY[1,2] || ARRAY[3,4];
374374
?column?
@@ -623,7 +623,7 @@ SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2
623623
Remember that what you write in an SQL command will first be interpreted
624624
as a string literal, and then as an array. This doubles the number of
625625
backslashes you need. For example, to insert a <type>text</> array
626-
value containing a backslash and a double quote, you'd need to write
626+
value containing a backslash and a double quote, you'd need to write:
627627
<programlisting>
628628
INSERT ... VALUES (E'{"\\\\","\\""}');
629629
</programlisting>

doc/src/sgml/backup.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.96 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.97 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<chapter id="backup">
44
<title>Backup and Restore</title>
@@ -221,20 +221,20 @@ psql -f <replaceable class="parameter">infile</replaceable> postgres
221221
<title>Use compressed dumps.</title>
222222
<para>
223223
You can use your favorite compression program, for example
224-
<application>gzip</application>.
224+
<application>gzip</application>:
225225

226226
<programlisting>
227227
pg_dump <replaceable class="parameter">dbname</replaceable> | gzip &gt; <replaceable class="parameter">filename</replaceable>.gz
228228
</programlisting>
229229

230-
Reload with
230+
Reload with:
231231

232232
<programlisting>
233233
createdb <replaceable class="parameter">dbname</replaceable>
234234
gunzip -c <replaceable class="parameter">filename</replaceable>.gz | psql <replaceable class="parameter">dbname</replaceable>
235235
</programlisting>
236236

237-
or
237+
or:
238238

239239
<programlisting>
240240
cat <replaceable class="parameter">filename</replaceable>.gz | gunzip | psql <replaceable class="parameter">dbname</replaceable>
@@ -254,7 +254,7 @@ cat <replaceable class="parameter">filename</replaceable>.gz | gunzip | psql <re
254254
pg_dump <replaceable class="parameter">dbname</replaceable> | split -b 1m - <replaceable class="parameter">filename</replaceable>
255255
</programlisting>
256256

257-
Reload with
257+
Reload with:
258258

259259
<programlisting>
260260
createdb <replaceable class="parameter">dbname</replaceable>
@@ -296,7 +296,7 @@ pg_dump -Fc <replaceable class="parameter">dbname</replaceable> &gt; <replaceabl
296296
<xref linkend="creating-cluster"> it is explained where these files
297297
are located, but you have probably found them already if you are
298298
interested in this method. You can use whatever method you prefer
299-
for doing usual file system backups, for example
299+
for doing usual file system backups, for example:
300300

301301
<programlisting>
302302
tar -cf backup.tar /usr/local/pgsql/data
@@ -528,7 +528,7 @@ tar -cf backup.tar /usr/local/pgsql/data
528528
i.e., the cluster's data directory.)
529529
Write <literal>%%</> if you need to embed an actual <literal>%</>
530530
character in the command. The simplest useful command is something
531-
like
531+
like:
532532
<programlisting>
533533
archive_command = 'cp -i %p /mnt/server/archivedir/%f &lt;/dev/null'
534534
</programlisting>
@@ -568,7 +568,7 @@ archive_command = 'cp -i %p /mnt/server/archivedir/%f &lt;/dev/null'
568568
this correctly on some platforms but not others. If the chosen command
569569
does not itself handle this case correctly, you should add a command
570570
to test for pre-existence of the archive file. For example, something
571-
like
571+
like:
572572
<programlisting>
573573
archive_command = 'test ! -f .../%f &amp;&amp; cp %p .../%f'
574574
</programlisting>
@@ -657,7 +657,7 @@ archive_command = 'test ! -f .../%f &amp;&amp; cp %p .../%f'
657657
</listitem>
658658
<listitem>
659659
<para>
660-
Connect to the database as a superuser, and issue the command
660+
Connect to the database as a superuser, and issue the command:
661661
<programlisting>
662662
SELECT pg_start_backup('label');
663663
</programlisting>
@@ -685,7 +685,7 @@ SELECT pg_start_backup('label');
685685
</listitem>
686686
<listitem>
687687
<para>
688-
Again connect to the database as a superuser, and issue the command
688+
Again connect to the database as a superuser, and issue the command:
689689
<programlisting>
690690
SELECT pg_stop_backup();
691691
</programlisting>
@@ -924,7 +924,7 @@ SELECT pg_stop_backup();
924924
i.e., the cluster's data directory.)
925925
Write <literal>%%</> if you need to embed an actual <literal>%</>
926926
character in the command. The simplest useful command is
927-
something like
927+
something like:
928928
<programlisting>
929929
restore_command = 'cp /mnt/server/archivedir/%f %p'
930930
</programlisting>
@@ -1669,7 +1669,7 @@ if (!triggered)
16691669
<para>
16701670
The least downtime can be achieved by installing the new server in
16711671
a different directory and running both the old and the new servers
1672-
in parallel, on different ports. Then you can use something like
1672+
in parallel, on different ports. Then you can use something like:
16731673

16741674
<programlisting>
16751675
pg_dumpall -p 5432 | psql -d postgres -p 6543

doc/src/sgml/bki.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/bki.sgml,v 1.20 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/bki.sgml,v 1.21 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<chapter id="bki">
44
<title><acronym>BKI</acronym> Backend Interface</title>
@@ -338,7 +338,7 @@
338338
table <literal>test_table</literal> with OID 420, having two columns
339339
<literal>cola</literal> and <literal>colb</literal> of type
340340
<type>int4</type> and <type>text</type>, respectively, and insert
341-
two rows into the table.
341+
two rows into the table:
342342
<programlisting>
343343
create test_table 420 (cola = int4, colb = text)
344344
open test_table

doc/src/sgml/config.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/config.sgml,v 1.107 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/config.sgml,v 1.108 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<chapter Id="runtime-config">
44
<title>Server Configuration</title>
@@ -71,7 +71,7 @@ shared_buffers = 128MB
7171
In addition to parameter settings, the <filename>postgresql.conf</>
7272
file can contain <firstterm>include directives</>, which specify
7373
another file to read and process as if it were inserted into the
74-
configuration file at this point. Include directives simply look like
74+
configuration file at this point. Include directives simply look like:
7575
<programlisting>
7676
include 'filename'
7777
</programlisting>

doc/src/sgml/cvs.sgml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.40 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.41 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<appendix id="cvs">
44
<appendixinfo>
@@ -109,7 +109,7 @@ cvs -z3 -d :pserver:anoncvs@anoncvs.postgresql.org:/projects/cvsroot co -P pgsql
109109
<para>
110110
Whenever you want to update to the latest <productname>CVS</productname> sources,
111111
<command>cd</command> into
112-
the <filename>pgsql</filename> subdirectory, and issue
112+
the <filename>pgsql</filename> subdirectory, and issue:
113113
<programlisting>
114114
cvs -z3 update -d -P
115115
</programlisting>
@@ -123,7 +123,7 @@ cvs -z3 update -d -P
123123
<step>
124124
<para>
125125
You can save yourself some typing by making a file <filename>.cvsrc</filename>
126-
in your home directory that contains
126+
in your home directory that contains:
127127

128128
<programlisting>
129129
cvs -z3
@@ -132,7 +132,7 @@ update -d -P
132132

133133
This supplies the <option>-z3</option> option to all <command>cvs</> commands, and the
134134
<option>-d</option> and <option>-P</option> options to <command>cvs update</>. Then you just have
135-
to say
135+
to say:
136136
<programlisting>
137137
cvs update
138138
</programlisting>
@@ -252,14 +252,14 @@ cvs checkout -P pgsql
252252
</para>
253253

254254
<para>
255-
After you've done the initial checkout on a branch
255+
After you've done the initial checkout on a branch:
256256

257257
<programlisting>
258258
cvs checkout -r REL6_4
259259
</programlisting>
260260

261261
anything you do within that directory structure is restricted to that
262-
branch. If you apply a patch to that directory structure and do a
262+
branch. If you apply a patch to that directory structure and do a:
263263

264264
<programlisting>
265265
cvs commit
@@ -312,7 +312,7 @@ cvs commit
312312
but had formerly kept it under a
313313
<productname>PostgreSQL</productname> development tree in
314314
<filename>/opt/postgres/cvs/</filename>. If you intend to keep your
315-
repository in <filename>/home/cvs/</filename>, then put
315+
repository in <filename>/home/cvs/</filename>, then put:
316316

317317
<programlisting>
318318
setenv CVSROOT /home/cvs
@@ -349,7 +349,7 @@ CVSROOT/
349349
<para>
350350
Verify that
351351
<application>cvsup</application> is in your path; on most systems
352-
you can do this by typing
352+
you can do this by typing:
353353

354354
<programlisting>
355355
which cvsup

doc/src/sgml/datatype.sgml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.189 2007/01/31 20:56:16 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/datatype.sgml,v 1.190 2007/02/01 00:28:16 momjian Exp $ -->
22

33
<chapter id="datatype">
44
<title id="datatype-title">Data Types</title>
@@ -476,16 +476,16 @@
476476
Both the maximum precision and the maximum scale of a
477477
<type>numeric</type> column can be
478478
configured. To declare a column of type <type>numeric</type> use
479-
the syntax
479+
the syntax:
480480
<programlisting>
481481
NUMERIC(<replaceable>precision</replaceable>, <replaceable>scale</replaceable>)
482482
</programlisting>
483483
The precision must be positive, the scale zero or positive.
484-
Alternatively,
484+
Alternatively:
485485
<programlisting>
486486
NUMERIC(<replaceable>precision</replaceable>)
487487
</programlisting>
488-
selects a scale of 0. Specifying
488+
selects a scale of 0. Specifying:
489489
<programlisting>
490490
NUMERIC
491491
</programlisting>
@@ -741,7 +741,7 @@ NUMERIC
741741
a notational convenience for setting up unique identifier columns
742742
(similar to the <literal>AUTO_INCREMENT</literal> property
743743
supported by some other databases). In the current
744-
implementation, specifying
744+
implementation, specifying:
745745

746746
<programlisting>
747747
CREATE TABLE <replaceable class="parameter">tablename</replaceable> (
@@ -1787,18 +1787,18 @@ SELECT b, char_length(b) FROM test2;
17871787
followed by an optional <literal>AD</literal> or <literal>BC</literal>.
17881788
(Alternatively, <literal>AD</literal>/<literal>BC</literal> can appear
17891789
before the time zone, but this is not the preferred ordering.)
1790-
Thus
1790+
Thus:
17911791

17921792
<programlisting>
17931793
1999-01-08 04:05:06
17941794
</programlisting>
1795-
and
1795+
and:
17961796
<programlisting>
17971797
1999-01-08 04:05:06 -8:00
17981798
</programlisting>
17991799

18001800
are valid values, which follow the <acronym>ISO</acronym> 8601
1801-
standard. In addition, the wide-spread format
1801+
standard. In addition, the wide-spread format:
18021802
<programlisting>
18031803
January 8 04:05:06 1999 PST
18041804
</programlisting>
@@ -2113,7 +2113,7 @@ January 8 04:05:06 1999 PST
21132113
that units like <literal>century</literal> or
21142114
<literal>week</literal> are converted to years and days and
21152115
<literal>ago</literal> is converted to an appropriate sign. In
2116-
ISO mode the output looks like
2116+
ISO mode the output looks like:
21172117

21182118
<programlisting>
21192119
<optional> <replaceable>quantity</> <replaceable>unit</> <optional> ... </> </> <optional> <replaceable>days</> </> <optional> <replaceable>hours</>:<replaceable>minutes</>:<replaceable>seconds</> </optional>
@@ -3115,11 +3115,11 @@ SELECT * FROM test;
31153115
the raw numeric value that type <type>oid</> would use. The alias
31163116
types allow simplified lookup of OID values for objects. For example,
31173117
to examine the <structname>pg_attribute</> rows related to a table
3118-
<literal>mytable</>, one could write
3118+
<literal>mytable</>, one could write:
31193119
<programlisting>
31203120
SELECT * FROM pg_attribute WHERE attrelid = 'mytable'::regclass;
31213121
</programlisting>
3122-
rather than
3122+
rather than:
31233123
<programlisting>
31243124
SELECT * FROM pg_attribute
31253125
WHERE attrelid = (SELECT oid FROM pg_class WHERE relname = 'mytable');
@@ -3444,7 +3444,7 @@ XMLPARSE (CONTENT 'abc<foo>bar</bar><bar>foo</foo>')
34443444
]]></programlisting>
34453445
While this is the only way to convert character strings into XML
34463446
values according to the SQL standard, the PostgreSQL-specific
3447-
syntaxes
3447+
syntaxes:
34483448
<programlisting><![CDATA[
34493449
xml '<foo>bar</foo>'
34503450
'<foo>bar</foo>'::xml

0 commit comments

Comments
 (0)