Differences From:

File src/db.c part of check-in [1c2d878d12] - Merge with trunk by btheado on 2009-12-13 01:16:13. [view]

To:

File src/db.c part of check-in [76bc05d739] - merge with trunk by btheado on 2009-12-30 20:33:59. [view]

@@ -1470,16 +1470,19 @@
 **
 ** The "unset" command clears a property setting.
 **
 **
-**    anon-login-enable-captcha-filler
-**                     If enabled, the Login page will provide a button
+**    auto-captcha     If enabled, the Login page will provide a button
 **                     which uses JavaScript to fill out the captcha for
-**                     the user. (Most bots cannot use JavaScript.)
+**                     the "anonymous" user. (Most bots cannot use JavaScript.)
 **
 **    autosync         If enabled, automatically pull prior to
 **                     commit or update and automatically push
 **                     after commit or tag or branch creation.
+**
+**    clearsign        When enabled (the default), fossil will attempt to
+**                     sign all commits with gpg.  When disabled, commits will
+**                     be unsigned.
 **
 **    diff-command     External command to run when performing a diff.
 **                     If undefined, the internal text diff will be used.
 **
@@ -1487,28 +1490,24 @@
 **                     server.  Useful when setting up a private branch.
 **
 **    editor           Text editor command used for check-in comments.
 **
+**    gdiff-command    External command to run when performing a graphical
+**                     diff. If undefined, text diff will be used.
+**
 **    http-port        The TCP/IP port number to use by the "server"
 **                     and "ui" commands.  Default: 8080
-**
-**    gdiff-command    External command to run when performing a graphical
-**                     diff. If undefined, text diff will be used.
 **
 **    localauth        If enabled, require that HTTP connections from
 **                     127.0.0.1 be authenticated by password.  If
 **                     false, all HTTP requests from localhost have
 **                     unrestricted access to the repository.
 **
-**    clearsign        When enabled (the default), fossil will attempt to
-**                     sign all commits with gpg.  When disabled, commits will
-**                     be unsigned.
+**    mtime-changes    Use file modification times (mtimes) to detect when
+**                     files have been modified.
 **
 **    pgp-command      Command used to clear-sign manifests at check-in.
 **                     The default is "gpg --clearsign -o ".
-**
-**    mtime-changes    Use file modification times (mtimes) to detect when
-**                     files have been modified.
 **
 **    proxy            URL of the HTTP proxy.  If undefined or "off" then
 **                     the "http_proxy" environment variable is consulted.
 **                     If the http_proxy environment variable is undefined
@@ -1520,19 +1519,19 @@
 **                     and "firefox" on Unix.
 */
 void setting_cmd(void){
   static const char *azName[] = {
-    "anon-login-enable-captcha-filler",
+    "auto-captcha",
     "autosync",
+    "clearsign",
     "diff-command",
     "dont-push",
     "editor",
     "gdiff-command",
     "http-port",
     "localauth",
-    "clearsign",
-    "pgp-command",
     "mtime-changes",
+    "pgp-command",
     "proxy",
     "web-browser",
   };
   int i;