cli: change "setup" to "set up" where used as a verb

The word "setup" is a noun, not a verb.  Change occurrences of "setup"
where used as a verb to "set up".

diff --git a/NEWS b/NEWS
index 463b6b62a8ebcb2b402c34acd20d875593371c9f..64388cd333720d1bbeb5a0498209818d46bd404c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2751,7 +2751,7 @@ New 'G' key binding to trigger mail refresh (G == "Get new mail")
 
   The 'G' key works wherever '=' works. Before refreshing the screen
   it calls an external program that can be used to poll email servers,
-  run notmuch new and setup specific tags for the new emails. The
+  run notmuch new and set up specific tags for the new emails. The
   script to be called should be configured with the "Notmuch Poll
   Script" setting in the customize interface. This script will
   typically invoke "notmuch new" and then perhaps several "notmuch

diff --git a/lib/database.cc b/lib/database.cc
index cffab62c895b3dd318855ae27445ad55488de97b..78a24f7e0a43fe6fc9787c0d28ad4947d26280f4 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -1336,7 +1336,7 @@ notmuch_database_upgrade (notmuch_database_t *notmuch,
        return NOTMUCH_STATUS_SUCCESS;
 
     if (progress_notify) {
-       /* Setup our handler for SIGALRM */
+       /* Set up our handler for SIGALRM */
        memset (&action, 0, sizeof (struct sigaction));
        action.sa_handler = handle_sigalrm;
        sigemptyset (&action.sa_mask);

diff --git a/notmuch-insert.c b/notmuch-insert.c
index 90fe3bad2bfb7291d3d81e6deafb50e6b62d913e..41a11443ef8f6d0ef5c7d84d68791ac32a32e62c 100644 (file)
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -521,7 +521,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
            return EXIT_FAILURE;
     }
 
-    /* Setup our handler for SIGINT. We do not set SA_RESTART so that copying
+    /* Set up our handler for SIGINT. We do not set SA_RESTART so that copying
      * from standard input may be interrupted. */
     memset (&action, 0, sizeof (struct sigaction));
     action.sa_handler = handle_sigint;

diff --git a/notmuch-new.c b/notmuch-new.c
index e6c283eb7ca123b762f0db4fa69cb33cb17d3e31..5ac7eedff70bfff763bbe29e39a3f369f7537650 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -662,7 +662,7 @@ setup_progress_printing_timer (void)
     struct sigaction action;
     struct itimerval timerval;
 
-    /* Setup our handler for SIGALRM */
+    /* Set up our handler for SIGALRM */
     memset (&action, 0, sizeof (struct sigaction));
     action.sa_handler = handle_sigalrm;
     sigemptyset (&action.sa_mask);
@@ -1047,7 +1047,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
     if (notmuch == NULL)
        return EXIT_FAILURE;
 
-    /* Setup our handler for SIGINT. We do this after having
+    /* Set up our handler for SIGINT. We do this after having
      * potentially done a database upgrade we this interrupt handler
      * won't support. */
     memset (&action, 0, sizeof (struct sigaction));

diff --git a/notmuch-tag.c b/notmuch-tag.c
index 5b2f1e48d6a7ce7d19bae37f9838ad040cbf2642..2c6e442aa93903f29b3792b73e0f24afab612677 100644 (file)
--- a/notmuch-tag.c
+++ b/notmuch-tag.c
@@ -195,7 +195,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])
     int opt_index;
     int ret;
 
-    /* Setup our handler for SIGINT */
+    /* Set up our handler for SIGINT */
     memset (&action, 0, sizeof (struct sigaction));
     action.sa_handler = handle_sigint;
     sigemptyset (&action.sa_mask);

diff --git a/notmuch.c b/notmuch.c
index a5b2877aee09243044b960d6b3b1f833fbf091af..e5c2aeb383c23fa404e1034308435e2d0129f7ec 100644 (file)
--- a/notmuch.c
+++ b/notmuch.c
@@ -47,7 +47,7 @@ static command_t commands[] = {
     { NULL, notmuch_command, TRUE,
       "Notmuch main command." },
     { "setup", notmuch_setup_command, TRUE,
-      "Interactively setup notmuch for first use." },
+      "Interactively set up notmuch for first use." },
     { "new", notmuch_new_command, FALSE,
       "Find and import new messages to the notmuch database." },
     { "insert", notmuch_insert_command, FALSE,

diff --git a/performance-test/perf-test-lib.sh b/performance-test/perf-test-lib.sh
index 75e3d8787ad6db09aeda709707950f5be839468f..88601fc79f884bf418ca53ed320fbde4fdca5831 100644 (file)
--- a/performance-test/perf-test-lib.sh
+++ b/performance-test/perf-test-lib.sh
@@ -203,7 +203,7 @@ time_done ()
     fi
 }
 
-cd -P "$test" || error "Cannot setup test environment"
+cd -P "$test" || error "Cannot set up test environment"
 test_failure=0
 test_count=0
 

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 486d1c430adbd714f1d08297612c390b4853e3f3..23085e74fa5a09322a53796927d4485f43544b87 100644 (file)
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -1231,7 +1231,7 @@ emacs_generate_script
 
 # Use -P to resolve symlinks in our working directory so that the cwd
 # in subprocesses like git equals our $PWD (for pathname comparisons).
-cd -P "$test" || error "Cannot setup test environment"
+cd -P "$test" || error "Cannot set up test environment"
 
 if test "$verbose" = "t"
 then