Fix typos in documentation for pragma short_column_names. Ticket #1130. (CVS 2350)

FossilOrigin-Name: fac56fa1e06e15ffd738cb9b780d422a73a743ae

diff --git a/manifest b/manifest
index 3dcf8d4b794e4263815a7c36c413330005eb1204..c0c7be21f979ce785f5a5251a6ef86b560b08105 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Compile-time\soption\sto\slimit\sthe\ssize\sof\sAUTOINCREMENT\srowids\sto\s32-bits.\s(CVS\s2349)
-D 2005-02-17T00:03:07
+C Fix\stypos\sin\sdocumentation\sfor\spragma\sshort_column_names.\sTicket\s#1130.\s(CVS\s2350)
+D 2005-02-18T01:15:23
 F Makefile.in 76443a83549d1539105e12d13bd0054a05ab2214
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
@@ -264,7 +264,7 @@ F www/oldnews.tcl 1e4c67ca29b4d9621fca846e75702dd9ae9c9868
 F www/omitted.tcl 9f332aea97b47ec53234f4cd9aa4b4a6da8641ec
 F www/opcode.tcl dafa030a5a3cc24a2f9fd4cfbfb7d7323d2151b0
 F www/optimizing.tcl f0b2538988d1bbad16cbfe63ec6e8f48c9eb04e5
-F www/pragma.tcl f2f507d50755fea3636fbb956048aac4b14ee837
+F www/pragma.tcl a4162c4672b9f9944e10282e893acc06968aac11
 F www/quickstart.tcl 6f6f694b6139be2d967b1492eb9a6bdf7058aa60
 F www/speed.tcl 1f8fb33df0d5bebf29508af763db3ee019c45967
 F www/sqlite.tcl b51fd15f0531a54874de785a9efba323eecd5975
@@ -273,7 +273,7 @@ F www/tclsqlite.tcl e73f8f8e5f20e8277619433f7970060ab01088fc
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl 3e522a06ad41992023c80ca29a048ae2331ca5bd
-P d5eb25d8d0d444ab98b26f7f1ac763919e692806
-R 1437f9ebc073df7aac84814cf952caaa
-U drh
-Z d1a958ef419bfdc9162ae87175aeda5a
+P c5366deaf5beca9c99558c0f375ba73f817acd92
+R b75a67c7136a5c5600c1249b41513257
+U danielk1977
+Z 6cb6073f29d2f0c0fa8b11d17ae22e19

diff --git a/manifest.uuid b/manifest.uuid
index f420f0c4bb3513534bbf8c0bc6993bb7a9406f5e..74cb36cc54bb991b1a5254af499bee11cdaf4f91 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c5366deaf5beca9c99558c0f375ba73f817acd92
\ No newline at end of file
+fac56fa1e06e15ffd738cb9b780d422a73a743ae
\ No newline at end of file

diff --git a/www/pragma.tcl b/www/pragma.tcl
index aaefbc454bded3984caca131ea705484d0a35ac2..d29bee61c4e4f5650d86346ed1d3f76d934f6d02 100644 (file)
--- a/www/pragma.tcl
+++ b/www/pragma.tcl
@@ -1,7 +1,7 @@
 #
 # Run this Tcl script to generate the pragma.html file.
 #
-set rcsid {$Id: pragma.tcl,v 1.8 2005/01/10 06:39:57 danielk1977 Exp $}
+set rcsid {$Id: pragma.tcl,v 1.9 2005/02/18 01:15:23 danielk1977 Exp $}
 source common.tcl
 header {Pragma statements supported by SQLite}
 
@@ -175,11 +175,12 @@ puts {
     the way SQLite names columns of data returned by SELECT statements
     when the expression for the column is a table-column name or the
     wildcard "*".  Normally, such result columns are named
-    <table-name/alias>.<column-name> if the SELECT statement joins two or
-    more tables together, or simply <column-name> if the SELECT
+    &lt;table-name/alias&gt;&lt;column-name&gt; if the SELECT statement joins 
+    two or
+    more tables together, or simply &lt;column-name&gt; if the SELECT
     statement queries a single table. When the full-column-names flag
-    is set, such columns are always named <table-name/alias>.<column-name>,
-    regardless of whether or not a join is performed.
+    is set, such columns are always named &lt;table-name/alias&gt;
+    &lt;column-name&gt; regardless of whether or not a join is performed.
     </p>
     <p>If both the short-column-names and full-column-names are set,
     then the behaviour associated with the full-column-names flag is
@@ -199,17 +200,17 @@ puts {
 </li>
 
 <a name="pragma_short_column_names"></a>
-<li><p><b>PRAGMA full_column_names;
-       <br>PRAGMA full_column_names = </b><i>0 | 1</i><b>;</b></p>
+<li><p><b>PRAGMA short_column_names;
+       <br>PRAGMA short_column_names = </b><i>0 | 1</i><b>;</b></p>
     <p>Query or change the short-column-names flag. This flag affects
     the way SQLite names columns of data returned by SELECT statements
     when the expression for the column is a table-column name or the
     wildcard "*".  Normally, such result columns are named
-    <table-name/alias>.<column-name> if the SELECT statement joins two or
-    more tables together, or simply <column-name> if the SELECT
-    statement queries a single table. When the short-column-names flag
-    is set, such columns are always named <column-name>, regardless of
-    whether or not a join is performed.
+    &lt;table-name/alias&gt;lt;column-name&gt; if the SELECT statement 
+    joins two or more tables together, or simply &lt;column-name&gt; if 
+    the SELECT statement queries a single table. When the short-column-names 
+    flag is set, such columns are always named &lt;column-name&gt; 
+    regardless of whether or not a join is performed.
     </p>
     <p>If both the short-column-names and full-column-names are set,
     then the behaviour associated with the full-column-names flag is