--- /dev/null
+Return-Path: <jlmuir@mink.imca.aps.anl.gov>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 8A1186DE1552\r
+ for <notmuch@notmuchmail.org>; Thu, 28 May 2015 10:10:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.289\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.289 tagged_above=-999 required=5 tests=[AWL=0.829, \r
+ RP_MATCHES_RCVD=-0.55, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id Vh6Ty24VagoF for <notmuch@notmuchmail.org>;\r
+ Thu, 28 May 2015 10:10:06 -0700 (PDT)\r
+X-Greylist: delayed 83754 seconds by postgrey-1.35 at arlo;\r
+ Thu, 28 May 2015 10:10:06 PDT\r
+Received: from mink.imca.aps.anl.gov (mink.imca.aps.anl.gov [164.54.200.120])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 4351D6DE0274\r
+ for <notmuch@notmuchmail.org>; Thu, 28 May 2015 10:10:06 -0700 (PDT)\r
+Received: by mink.imca.aps.anl.gov (Postfix, from userid 501)\r
+ id D21E16054B2A; Wed, 27 May 2015 12:54:09 -0500 (CDT)\r
+From: "J. Lewis Muir" <jlmuir@imca-cat.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] cli: change "setup" to "set up" where used as a verb\r
+Date: Wed, 27 May 2015 12:53:52 -0500\r
+Message-Id: <1432749232-72654-1-git-send-email-jlmuir@imca-cat.org>\r
+X-Mailer: git-send-email 2.3.2 (Apple Git-55)\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 28 May 2015 17:10:08 -0000\r
+\r
+The word "setup" is a noun, not a verb. Change occurrences of "setup"\r
+where used as a verb to "set up".\r
+\r
+---\r
+\r
+The only user-visible change is to the short description of the setup\r
+command in the "notmuch help" output. The rest of the changes are just\r
+to source code comments or test case status messages.\r
+---\r
+ NEWS | 2 +-\r
+ lib/database.cc | 2 +-\r
+ notmuch-insert.c | 2 +-\r
+ notmuch-new.c | 4 ++--\r
+ notmuch-tag.c | 2 +-\r
+ notmuch.c | 2 +-\r
+ performance-test/perf-test-lib.sh | 2 +-\r
+ test/test-lib.sh | 2 +-\r
+ 8 files changed, 9 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/NEWS b/NEWS\r
+index eeaf0d4..393411a 100644\r
+--- a/NEWS\r
++++ b/NEWS\r
+@@ -2756,7 +2756,7 @@ New 'G' key binding to trigger mail refresh (G == "Get new mail")\r
+ \r
+ The 'G' key works wherever '=' works. Before refreshing the screen\r
+ it calls an external program that can be used to poll email servers,\r
+- run notmuch new and setup specific tags for the new emails. The\r
++ run notmuch new and set up specific tags for the new emails. The\r
+ script to be called should be configured with the "Notmuch Poll\r
+ Script" setting in the customize interface. This script will\r
+ typically invoke "notmuch new" and then perhaps several "notmuch\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index cffab62..78a24f7 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -1336,7 +1336,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,\r
+ return NOTMUCH_STATUS_SUCCESS;\r
+ \r
+ if (progress_notify) {\r
+- /* Setup our handler for SIGALRM */\r
++ /* Set up our handler for SIGALRM */\r
+ memset (&action, 0, sizeof (struct sigaction));\r
+ action.sa_handler = handle_sigalrm;\r
+ sigemptyset (&action.sa_mask);\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 90fe3ba..41a1144 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -521,7 +521,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])\r
+ return EXIT_FAILURE;\r
+ }\r
+ \r
+- /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying\r
++ /* Set up our handler for SIGINT. We do not set SA_RESTART so that copying\r
+ * from standard input may be interrupted. */\r
+ memset (&action, 0, sizeof (struct sigaction));\r
+ action.sa_handler = handle_sigint;\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index e6c283e..5ac7eed 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -662,7 +662,7 @@ setup_progress_printing_timer (void)\r
+ struct sigaction action;\r
+ struct itimerval timerval;\r
+ \r
+- /* Setup our handler for SIGALRM */\r
++ /* Set up our handler for SIGALRM */\r
+ memset (&action, 0, sizeof (struct sigaction));\r
+ action.sa_handler = handle_sigalrm;\r
+ sigemptyset (&action.sa_mask);\r
+@@ -1047,7 +1047,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])\r
+ if (notmuch == NULL)\r
+ return EXIT_FAILURE;\r
+ \r
+- /* Setup our handler for SIGINT. We do this after having\r
++ /* Set up our handler for SIGINT. We do this after having\r
+ * potentially done a database upgrade we this interrupt handler\r
+ * won't support. */\r
+ memset (&action, 0, sizeof (struct sigaction));\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index 5b2f1e4..2c6e442 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -195,7 +195,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ int opt_index;\r
+ int ret;\r
+ \r
+- /* Setup our handler for SIGINT */\r
++ /* Set up our handler for SIGINT */\r
+ memset (&action, 0, sizeof (struct sigaction));\r
+ action.sa_handler = handle_sigint;\r
+ sigemptyset (&action.sa_mask);\r
+diff --git a/notmuch.c b/notmuch.c\r
+index a5b2877..e5c2aeb 100644\r
+--- a/notmuch.c\r
++++ b/notmuch.c\r
+@@ -47,7 +47,7 @@ static command_t commands[] = {\r
+ { NULL, notmuch_command, TRUE,\r
+ "Notmuch main command." },\r
+ { "setup", notmuch_setup_command, TRUE,\r
+- "Interactively setup notmuch for first use." },\r
++ "Interactively set up notmuch for first use." },\r
+ { "new", notmuch_new_command, FALSE,\r
+ "Find and import new messages to the notmuch database." },\r
+ { "insert", notmuch_insert_command, FALSE,\r
+diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh\r
+index 75e3d87..88601fc 100644\r
+--- a/performance-test/perf-test-lib.sh\r
++++ b/performance-test/perf-test-lib.sh\r
+@@ -203,7 +203,7 @@ time_done ()\r
+ fi\r
+ }\r
+ \r
+-cd -P "$test" || error "Cannot setup test environment"\r
++cd -P "$test" || error "Cannot set up test environment"\r
+ test_failure=0\r
+ test_count=0\r
+ \r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 486d1c4..23085e7 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -1231,7 +1231,7 @@ emacs_generate_script\r
+ \r
+ # Use -P to resolve symlinks in our working directory so that the cwd\r
+ # in subprocesses like git equals our $PWD (for pathname comparisons).\r
+-cd -P "$test" || error "Cannot setup test environment"\r
++cd -P "$test" || error "Cannot set up test environment"\r
+ \r
+ if test "$verbose" = "t"\r
+ then\r
+-- \r
+2.3.2 (Apple Git-55)\r
+\r
projects / notmuch-archives.git / commitdiff