From f265f80ab3442c430e9758ffcd7d4ea82a10dc30 Mon Sep 17 00:00:00 2001
From: chc4 <chc4000@gmail.com>
Date: Wed, 7 Oct 2015 00:39:38 -0400
Subject: [PATCH 1/4] Update usage

I didn't list most of the ones that I never heard about before (-r, -l, -b)
---
 vere/main.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/vere/main.c b/vere/main.c
index e5e08da8bb..f167ffc85e 100644
--- a/vere/main.c
+++ b/vere/main.c
@@ -210,8 +210,24 @@ _main_getopt(c3_i argc, c3_c** argv)
 static void
 u3_ve_usage(c3_i argc, c3_c** argv)
 {
-  fprintf(stderr, "%s: usage: [-v] [-k stage] [-p ames_port] computer\n",
-                  argv[0]);
+  c3_c *use_c[] = {"Usage: %s [options...] computer\n",
+    "-w name       Immediately upgrade to ~name\n",
+    "-t ticket     Use ~ticket automatically\n",
+    "-I galaxy     Start as ~galaxy\n",
+    "-F            Fake keys\n",
+    "-L            Local-only network\n",
+    "-n host       Set unix hostname\n",
+    "-p ames_port  Set the HTTP port to bind to\n",
+    "-v            Verbose\n",
+    "-D            Recompute from events\n",
+    "-P            Profiling\n",
+    "-M            Memory madness\n",
+    "-f            Fuzz testing\n",
+    "-k stage      Start at Hoon kernel version stage\n",
+    "-Xwtf         Skip last event\n"};
+  for ( c3_i i=0; i < sizeof(use_c)/sizeof(c3_c*); i++ ) {
+    fprintf(stderr,use_c[i],argv[0]);
+  }
   exit(1);
 }
 

From 26e0060cd1b22e47360958b2607bb5341f50eb98 Mon Sep 17 00:00:00 2001
From: Raymond Pasco <ray@the.ug>
Date: Thu, 8 Oct 2015 13:17:15 -0400
Subject: [PATCH 2/4] C89 compatible for loop

---
 vere/main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vere/main.c b/vere/main.c
index f167ffc85e..484141cf57 100644
--- a/vere/main.c
+++ b/vere/main.c
@@ -225,7 +225,8 @@ u3_ve_usage(c3_i argc, c3_c** argv)
     "-f            Fuzz testing\n",
     "-k stage      Start at Hoon kernel version stage\n",
     "-Xwtf         Skip last event\n"};
-  for ( c3_i i=0; i < sizeof(use_c)/sizeof(c3_c*); i++ ) {
+  c3_i i;
+  for ( i=0; i < sizeof(use_c)/sizeof(c3_c*); i++ ) {
     fprintf(stderr,use_c[i],argv[0]);
   }
   exit(1);

From d73fdfae6135339a912d9b94dc45dbc62142220d Mon Sep 17 00:00:00 2001
From: John Franklin <jfranklin9000@gmail.com>
Date: Mon, 12 Oct 2015 23:32:16 -0500
Subject: [PATCH 3/4] Generalize the message if trying to use -c or -w on an
 existing pier.

---
 vere/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vere/main.c b/vere/main.c
index 484141cf57..35017550b1 100644
--- a/vere/main.c
+++ b/vere/main.c
@@ -342,7 +342,7 @@ main(c3_i   argc,
   if ( c3y == u3_Host.ops_u.nuu ) {
     struct stat s;
     if ( !stat(u3_Host.dir_c, &s) ) {
-      fprintf(stderr, "used -c but %s already exists\n", u3_Host.dir_c);
+      fprintf(stderr, "tried to create, but %s already exists\n", u3_Host.dir_c);
       exit(1);
     }
    }

From 0fdb149c599e0a5e11627066a7b0d48ebf920684 Mon Sep 17 00:00:00 2001
From: John Franklin <jfranklin9000@gmail.com>
Date: Thu, 15 Oct 2015 12:47:52 -0500
Subject: [PATCH 4/4] Fix some comments in vere.h.  No changes to the compiled
 code.

---
 include/vere/vere.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vere/vere.h b/include/vere/vere.h
index 0160640a95..1326d901d9 100644
--- a/include/vere/vere.h
+++ b/include/vere/vere.h
@@ -819,7 +819,7 @@
         void
         u3_term_ef_bake(u3_noun  fav);
 
-      /* u3_term_ef_blit(): send %blit effect to to terminal.
+      /* u3_term_ef_blit(): send %blit effect to terminal.
       */
         void
         u3_term_ef_blit(c3_l    tid_l,
@@ -950,7 +950,7 @@
         void
         u3_unix_ef_ogre(u3_noun mon);
 
-      /* u3_unix_ef_ogre(): delete mount point
+      /* u3_unix_ef_hill(): enumerate mount points
       */
         void
         u3_unix_ef_hill(u3_noun hil);