From 7ed738b34c16604c6d96aed725c9de1eb1ccceea Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Tue, 23 Nov 2004 07:37:25 +0000
Subject: [PATCH] fix some typos; move to 0.0.9rc1

svn:r2951
---
 configure.in         | 2 +-
 contrib/tor.nsi      | 2 +-
 doc/tor.1.in         | 6 +++---
 src/or/config.c      | 2 +-
 src/or/hibernate.c   | 3 ++-
 src/win32/orconfig.h | 2 +-
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index ed2b626323..36bffe03fc 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.0.9rc1-cvs)
+AM_INIT_AUTOMAKE(tor, 0.0.9rc1)
 AM_CONFIG_HEADER(orconfig.h)
 
 AC_CANONICAL_HOST
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index c9cfa8c8c1..6fedac5b2e 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -31,7 +31,7 @@
 
 !include "MUI.nsh"
 
-!define VERSION "0.0.9rc1-cvs"
+!define VERSION "0.0.9rc1"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://freehaven.net/tor/"
 
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 66224e6b56..fdc1223bb4 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -43,7 +43,7 @@ are sent to all the logs that match their severity level.
 .TP
 \fBBandwidthRate \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 A token bucket limits the average incoming bandwidth on this node to
-the specified number of bytes second. (Default: 780 KB)
+the specified number of bytes per second. (Default: 780 KB)
 .TP
 \fBBandwidthBurst \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 Limit the maximum token bucket size (also known as the burst) to the given number of bytes. (Default: 48 MB)
@@ -110,7 +110,7 @@ security.
 \fBDirFetchPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 Every time the specified period elapses, Tor downloads a directory.
 A directory contains a signed list of all known servers as well as
-their current their liveness status.  (Default: 1 hour)
+their current liveness status.  (Default: 1 hour)
 .TP
 \fBStatusFetchPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 Every time the specified period elapses, Tor downloads signed status
@@ -285,7 +285,7 @@ uploaded whenever it changes.  (Default: 10 minutes.)
 .TP
 \fBAccountingMax \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 Never send more than the specified number of bytes in a given
-accounting period,or receive more than that number in the period.
+accounting period, or receive more than that number in the period.
 When the number of bytes is exhausted, Tor will hibernate until some
 time in the next accounting period.  To prevent all servers from
 waking at the same time, Tor will also wait until a random point in
diff --git a/src/or/config.c b/src/or/config.c
index 21321796e5..6465969ce7 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2257,7 +2257,7 @@ static struct unit_table_t memory_units[] = {
 };
 
 static struct unit_table_t time_units[] = {
-  { "second",  1 },
+  { "second",   1 },
   { "seconds",  1 },
   { "minute",   60 },
   { "minutes",  60 },
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 394bf4ff0d..ee8f6e105d 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -480,7 +480,7 @@ accounting_set_wakeup_time(void)
 
     log_fn(LOG_NOTICE, "Configured hibernation.  This interval begins at %s; "
            "we will hibernate until %s; "
-           "we expect to stay up until approximatly %s; "
+           "we expect to stay up until approximately %s; "
            "we will start a new interval at %s (all times local)",
            buf1, buf2, buf3, buf4);
   }
@@ -792,3 +792,4 @@ void consider_hibernation(time_t now) {
     }
   }
 }
+
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e7edad873e..decf1e21c0 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -199,4 +199,4 @@
 #define UNALIGNED_INT_ACCESS_OK
 
 /* Version number of package */
-#define VERSION "0.0.9rc1-cvs"
+#define VERSION "0.0.9rc1"