Fix typo in comment and update help text.

FossilOrigin-Name: 289092bb64463efe78a5f01b06b24aa664a31feb

diff --git a/manifest b/manifest
index 0a878d2dde7bfb3a41825a514ad5f18c344822fc..3db2a79fc608cc47a5eba393dc86a779c219224f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.
-D 2014-07-24T22:13:12.489
+C Fix\stypo\sin\scomment\sand\supdate\shelp\stext.
+D 2014-07-24T22:20:23.336
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -223,7 +223,7 @@ F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 5fc110baeacf120a73fe34e103f052632ff11a02
 F src/rowset.c a9c9aae3234b44a6d7c6f5a3cadf90dce1e627be
 F src/select.c 6762c62e11b504aa014edceab8886495165e3a77
-F src/shell.c 3af679cad9c2e7caf7f8b997fb543afbc76d7c13
+F src/shell.c e1177e053e214be9c1549dac5bbcb2164b6114dd
 F src/sqlite.h.in ac4451c9da2771d2f4d702ef89722407242906d9
 F src/sqlite3.rc 11094cc6a157a028b301a9f06b3d03089ea37c3e
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1184,7 +1184,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 7fe601ead0d0ae26cb09d0dbc7d6367785376567 fb1048cb2b613a0dbfe625a5df05e9dcd736a433
-R 551b1710cff332eae579e1d24ac340a5
+P 8dc0cdf652f099d464d3de416dffd83efb895009
+R df3c0e791329cbe951d92033daed226e
 U mistachkin
-Z 5a827010d4d8351c000cbf9e79de9417
+Z b422ee17d0b3078b84860803513f7cb8

diff --git a/manifest.uuid b/manifest.uuid
index 3cf998f636680814a04a9de43429bb0dccf38ace..27a93d5aad716fe2b8ad82707c8024d7c207495b 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8dc0cdf652f099d464d3de416dffd83efb895009
\ No newline at end of file
+289092bb64463efe78a5f01b06b24aa664a31feb
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index 55b41662eaa4338d35cc384302d294214d0c5d6a..78339db8b4e8c302b71e11bf9bb5ce3135e19419 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1623,7 +1623,8 @@ static char zHelp[] =
   ".backup ?DB? FILE      Backup DB (default \"main\") to FILE\n"
   ".bail on|off           Stop after hitting an error.  Default OFF\n"
   ".clone NEWDB           Clone data into NEWDB from the existing database\n"
-  ".colseparator STRING   This is an alias for .separator\n"
+  ".colseparator STRING   This is an alias for the one argument version of\n"
+  "                         .separator\n"
   ".databases             List names and files of attached databases\n"
   ".dump ?TABLE? ...      Dump the database in an SQL text format\n"
   "                         If TABLE specified, only dump tables matching\n"
@@ -2646,7 +2647,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
     int nSep;                   /* Number of bytes in p->colSeparator[] */
     char *zSql;                 /* An SQL statement */
     ImportCtx sCtx;             /* Reader context */
-    char *(*xRead)(ImportCtx*); /* Procecure to read one value */
+    char *(*xRead)(ImportCtx*); /* Procedure to read one value */
     int (*xCloser)(FILE*);      /* Procedure to close th3 connection */
 
     if( nArg!=3 ){
@@ -3899,7 +3900,7 @@ static const char zOptions[] =
   "   -ascii               set output mode to 'ascii'\n"
   "   -bail                stop after hitting an error\n"
   "   -batch               force batch I/O\n"
-  "   -colseparator SEP    same as -separator\n"
+  "   -colseparator SEP    same as -separator with one argument\n"
   "   -column              set output mode to 'column'\n"
   "   -cmd COMMAND         run \"COMMAND\" before reading stdin\n"
   "   -csv                 set output mode to 'csv'\n"