Browse Source

fix some typos; move to 0.0.9rc1

svn:r2951
Roger Dingledine 21 years ago
parent
commit
7ed738b34c
6 changed files with 9 additions and 8 deletions
  1. 1 1
      configure.in
  2. 1 1
      contrib/tor.nsi
  3. 3 3
      doc/tor.1.in
  4. 1 1
      src/or/config.c
  5. 2 1
      src/or/hibernate.c
  6. 1 1
      src/win32/orconfig.h

+ 1 - 1
configure.in

@@ -1,6 +1,6 @@
 
 
 AC_INIT
 AC_INIT
-AM_INIT_AUTOMAKE(tor, 0.0.9rc1-cvs)
+AM_INIT_AUTOMAKE(tor, 0.0.9rc1)
 AM_CONFIG_HEADER(orconfig.h)
 AM_CONFIG_HEADER(orconfig.h)
 
 
 AC_CANONICAL_HOST
 AC_CANONICAL_HOST

+ 1 - 1
contrib/tor.nsi

@@ -31,7 +31,7 @@
 
 
 !include "MUI.nsh"
 !include "MUI.nsh"
 
 
-!define VERSION "0.0.9rc1-cvs"
+!define VERSION "0.0.9rc1"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "http://freehaven.net/tor/"
 !define WEBSITE "http://freehaven.net/tor/"
 
 

+ 3 - 3
doc/tor.1.in

@@ -43,7 +43,7 @@ are sent to all the logs that match their severity level.
 .TP
 .TP
 \fBBandwidthRate \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 \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
 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
 .TP
 \fBBandwidthBurst \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 \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)
 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
 \fBDirFetchPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 Every time the specified period elapses, Tor downloads a directory.
 Every time the specified period elapses, Tor downloads a directory.
 A directory contains a signed list of all known servers as well as
 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
 .TP
 \fBStatusFetchPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 \fBStatusFetchPeriod \fR\fIN\fR \fBseconds\fR|\fBminutes\fR|\fBhours\fR|\fBdays\fR|\fBweeks\fP
 Every time the specified period elapses, Tor downloads signed status
 Every time the specified period elapses, Tor downloads signed status
@@ -285,7 +285,7 @@ uploaded whenever it changes.  (Default: 10 minutes.)
 .TP
 .TP
 \fBAccountingMax \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
 \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
 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
 When the number of bytes is exhausted, Tor will hibernate until some
 time in the next accounting period.  To prevent all servers from
 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
 waking at the same time, Tor will also wait until a random point in

+ 1 - 1
src/or/config.c

@@ -2257,7 +2257,7 @@ static struct unit_table_t memory_units[] = {
 };
 };
 
 
 static struct unit_table_t time_units[] = {
 static struct unit_table_t time_units[] = {
-  { "second",  1 },
+  { "second",   1 },
   { "seconds",  1 },
   { "seconds",  1 },
   { "minute",   60 },
   { "minute",   60 },
   { "minutes",  60 },
   { "minutes",  60 },

+ 2 - 1
src/or/hibernate.c

@@ -480,7 +480,7 @@ accounting_set_wakeup_time(void)
 
 
     log_fn(LOG_NOTICE, "Configured hibernation.  This interval begins at %s; "
     log_fn(LOG_NOTICE, "Configured hibernation.  This interval begins at %s; "
            "we will hibernate until %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)",
            "we will start a new interval at %s (all times local)",
            buf1, buf2, buf3, buf4);
            buf1, buf2, buf3, buf4);
   }
   }
@@ -792,3 +792,4 @@ void consider_hibernation(time_t now) {
     }
     }
   }
   }
 }
 }
+

+ 1 - 1
src/win32/orconfig.h

@@ -199,4 +199,4 @@
 #define UNALIGNED_INT_ACCESS_OK
 #define UNALIGNED_INT_ACCESS_OK
 
 
 /* Version number of package */
 /* Version number of package */
-#define VERSION "0.0.9rc1-cvs"
+#define VERSION "0.0.9rc1"