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

Commit f3d2b2e

Browse files
author
Thomas G. Lockhart
committed
Markup changes for v6.5 release.
Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
1 parent 214e8f3 commit f3d2b2e

10 files changed

+1104
-1372
lines changed

doc/src/sgml/admin.sgml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.14 1999/05/26 17:30:27 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/Attic/admin.sgml,v 1.15 1999/06/03 04:21:47 thomas Exp $
33

44
Postgres Administrator's Guide.
55
Derived from postgres.sgml.
66
- thomas 1998-10-27
77

88
$Log: admin.sgml,v $
9+
Revision 1.15 1999/06/03 04:21:47 thomas
10+
Markup changes for v6.5 release.
11+
Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
12+
913
Revision 1.14 1999/05/26 17:30:27 thomas
1014
Add chapters on CVS access, MVCC, SQL theory to the docs.
1115
Add an appendix with more details on date/time attributes and handling.
@@ -108,7 +112,7 @@ Bigger updates to the installation instructions (install and config).
108112

109113
<LegalNotice>
110114
<Para>
111-
<ProductName>PostgreSQL</ProductName> is &copy; 1998-9
115+
<ProductName>PostgreSQL</ProductName> is Copyright &copy; 1996-9
112116
by the Postgres Global Development Group.
113117
</Para>
114118
</LegalNotice>

doc/src/sgml/installation.sgml

+56-43
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.4 1999/05/26 17:30:29 thomas Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/installation.sgml,v 1.5 1999/06/03 04:21:48 thomas Exp $
33

44
Postgres quick Installation Guide.
55
- thomas 1998-10-26
66

77
$Log: installation.sgml,v $
8+
Revision 1.5 1999/06/03 04:21:48 thomas
9+
Markup changes for v6.5 release.
10+
Clean out duplicate stuff in odbc.sgml resulting from a faulty patch.
11+
812
Revision 1.4 1999/05/26 17:30:29 thomas
913
Add chapters on CVS access, MVCC, SQL theory to the docs.
1014
Add an appendix with more details on date/time attributes and handling.
@@ -37,7 +41,6 @@ First cut at standalone installation guide to replace INSTALL text source.
3741
<!entity y2k SYSTEM "y2k.sgml">
3842

3943
<!entity config SYSTEM "config.sgml">
40-
<!entity current SYSTEM "current.sgml">
4144
<!entity intro-ag SYSTEM "intro-ag.sgml">
4245
<!entity install SYSTEM "install.sgml">
4346
<!entity options SYSTEM "pg_options.sgml">
@@ -51,27 +54,27 @@ First cut at standalone installation guide to replace INSTALL text source.
5154
<!entity biblio SYSTEM "biblio.sgml">
5255
]>
5356

54-
<Book Id="installation">
57+
<book>
5558

5659
<!-- Title information -->
5760

58-
<Title>PostgreSQL Installation Guide</Title>
59-
<BookInfo>
60-
<ReleaseInfo>Covering v6.5 for general release</ReleaseInfo>
61-
<BookBiblio>
62-
<AuthorGroup>
63-
<CorpAuthor>The PostgreSQL Development Team</CorpAuthor>
64-
</AuthorGroup>
61+
<title>PostgreSQL Installation Guide</title>
62+
<bookinfo>
63+
<releaseinfo>Covering v6.5 for general release</releaseinfo>
64+
<bookbiblio>
65+
<authorgroup>
66+
<corpauthor>The PostgreSQL Development Team</corpauthor>
67+
</authorgroup>
6568
<!-- editor in authorgroup is not supported
6669
<AuthorGroup>
6770
-->
68-
<Editor>
69-
<FirstName>Thomas</FirstName>
70-
<SurName>Lockhart</SurName>
71-
<Affiliation>
72-
<OrgName>Caltech/JPL</OrgName>
73-
</Affiliation>
74-
</Editor>
71+
<editor>
72+
<firstname>Thomas</firstname>
73+
<surname>Lockhart</surname>
74+
<affiliation>
75+
<orgname>Caltech/JPL</orgname>
76+
</affiliation>
77+
</editor>
7578
<!--
7679
</AuthorGroup>
7780
-->
@@ -80,17 +83,17 @@ First cut at standalone installation guide to replace INSTALL text source.
8083
<AuthorInitials>TGL</AuthorInitials>
8184
-->
8285

83-
<Date>(last updated 1999-06-01)</Date>
84-
</BookBiblio>
86+
<date>(last updated 1999-06-01)</date>
87+
</bookbiblio>
8588

86-
<LegalNotice>
87-
<Para>
88-
<ProductName>PostgreSQL</ProductName> is &copy; 1998-9
89+
<legalnotice>
90+
<para>
91+
<productname>PostgreSQL</productname> is &copy; 1998-9
8992
by the Postgres Global Development Group.
90-
</Para>
91-
</LegalNotice>
93+
</para>
94+
</legalnotice>
9295

93-
</BookInfo>
96+
</bookinfo>
9497

9598
<!--
9699
<TOC> </TOC>
@@ -105,22 +108,22 @@ Your name here...
105108
</Dedication>
106109
-->
107110

108-
<Preface>
109-
<Title>Summary</Title>
111+
<preface>
112+
<title>Summary</title>
110113

111-
<Para>
112-
<ProductName>Postgres</ProductName>,
114+
<para>
115+
<productname>Postgres</productname>,
113116
developed originally in the UC Berkeley Computer Science Department,
114117
pioneered many of the object-relational concepts
115118
now becoming available in some commercial databases.
116119
It provides SQL92/SQL3 language support,
117120
transaction integrity, and type extensibility.
118-
<ProductName>PostgreSQL</ProductName> is a public-domain, open source descendant
121+
<productname>PostgreSQL</productname> is a public-domain, open source descendant
119122
of this original Berkeley code.
120-
</Para>
121-
</Preface>
123+
</para>
124+
</preface>
122125

123-
<chapter id="intro">
126+
<chapter>
124127
<title>Introduction</title>
125128

126129
<para>
@@ -129,24 +132,34 @@ and runtime environment for your system. This may be adequate for many installat
129132
and is almost certainly adequate for a first installation. But you may want to
130133
do an initial installation up to the point of unpacking the source tree
131134
and installing documentation, and then print or browse the
132-
<citetitle>Administrator's Guide</citetitle>.
135+
<citetitle>Administrator's Guide</citetitle>.</para>
133136

134137
</chapter>
135138

136139
&ports;
137140
&install;
138141
&config;
139-
140-
<chapter id="release">
141-
<title>Release Notes</title>
142-
143-
&current;
144-
145-
</chapter>
142+
&release;
146143

147144
<!--
148145
<INDEX> </INDEX>
149146
-->
150147

151-
</Book>
152-
148+
</book>
149+
150+
<!-- Keep this comment at the end of the file
151+
Local variables:
152+
mode: sgml
153+
sgml-omittag:nil
154+
sgml-shorttag:t
155+
sgml-minimize-attributes:nil
156+
sgml-always-quote-attributes:t
157+
sgml-indent-step:1
158+
sgml-indent-data:t
159+
sgml-parent-document:nil
160+
sgml-default-dtd-file:"./reference.ced"
161+
sgml-exposed-tags:nil
162+
sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
163+
sgml-local-ecat-files:nil
164+
End:
165+
-->

doc/src/sgml/legal.sgml

+55-39
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,59 @@
1-
<Sect1>
2-
<Title>Copyrights and Trademarks</Title>
1+
<sect1>
2+
<title>Copyrights and Trademarks</title>
33

4-
<Para>
5-
<ProductName>PostgreSQL</ProductName> is copyright (C) 1996-8
6-
by the PostgreSQL Global Development Group,
7-
and is distributed under the terms of the Berkeley license.
8-
</Para>
4+
<para>
5+
<productname>PostgreSQL</productname> is Copyright &copy; 1996-9
6+
by the PostgreSQL Global Development Group,
7+
and is distributed under the terms of the Berkeley license.
8+
</para>
99

10-
<Para>
11-
<ProductName>Postgres95</ProductName> is copyright (C) 1994-5
12-
by the Regents of the University of California.
13-
Permission to use, copy, modify, and distribute this software and its documentation
14-
for any purpose, without fee, and without a written agreement is hereby granted,
15-
provided that the above copyright notice and this paragraph and the following two
16-
paragraphs appear in all copies.
17-
</Para>
18-
<Para>
19-
In no event shall the University of California be liable to
20-
any party for direct, indirect, special, incidental, or consequential
21-
damages, including lost profits, arising out of the use of this
22-
software and its documentation, even if the University of California
23-
has been advised of the possibility of such damage.
24-
</Para>
25-
<Para>
26-
The University of California specifically disclaims any
27-
warranties, including, but not limited to, the implied warranties
28-
of merchantability and fitness for a particular purpose.
29-
The software provided hereunder is on an "as-is" basis, and
30-
the University of California has no obligations to provide
31-
maintainance, support, updates, enhancements, or modifications.
32-
</Para>
10+
<para>
11+
<productname>Postgres95</productname> is Copyright &copy; 1994-5
12+
by the Regents of the University of California.
13+
Permission to use, copy, modify, and distribute this software and its documentation
14+
for any purpose, without fee, and without a written agreement is hereby granted,
15+
provided that the above copyright notice and this paragraph and the following two
16+
paragraphs appear in all copies.
17+
</para>
18+
<para>
19+
In no event shall the University of California be liable to
20+
any party for direct, indirect, special, incidental, or consequential
21+
damages, including lost profits, arising out of the use of this
22+
software and its documentation, even if the University of California
23+
has been advised of the possibility of such damage.
24+
</para>
25+
<para>
26+
The University of California specifically disclaims any
27+
warranties, including, but not limited to, the implied warranties
28+
of merchantability and fitness for a particular purpose.
29+
The software provided hereunder is on an "as-is" basis, and
30+
the University of California has no obligations to provide
31+
maintainance, support, updates, enhancements, or modifications.
32+
</para>
3333

34-
<Para>
35-
<Acronym>UNIX</Acronym> is a trademark of X/Open, Ltd. Sun4, SPARC, SunOS
36-
and Solaris are trademarks of Sun Microsystems, Inc. DEC,
37-
DECstation, Alpha AXP and ULTRIX are trademarks of Digital
38-
Equipment Corp. PA-RISC and HP-UX are trademarks of
39-
Hewlett-Packard Co. OSF/1 is a trademark of the Open
40-
Software Foundation.
41-
</Para>
42-
</Sect1>
34+
<para>
35+
<acronym>UNIX</acronym> is a trademark of X/Open, Ltd. Sun4, SPARC, SunOS
36+
and Solaris are trademarks of Sun Microsystems, Inc. DEC,
37+
DECstation, Alpha AXP and ULTRIX are trademarks of Digital
38+
Equipment Corp. PA-RISC and HP-UX are trademarks of
39+
Hewlett-Packard Co. OSF/1 is a trademark of the Open
40+
Software Foundation.
41+
</para>
42+
</sect1>
4343

44+
<!-- Keep this comment at the end of the file
45+
Local variables:
46+
mode: sgml
47+
sgml-omittag:nil
48+
sgml-shorttag:t
49+
sgml-minimize-attributes:nil
50+
sgml-always-quote-attributes:t
51+
sgml-indent-step:1
52+
sgml-indent-data:t
53+
sgml-parent-document:nil
54+
sgml-default-dtd-file:"./reference.ced"
55+
sgml-exposed-tags:nil
56+
sgml-local-catalogs:"/usr/lib/sgml/CATALOG"
57+
sgml-local-ecat-files:nil
58+
End:
59+
-->

0 commit comments

Comments
 (0)