release 2.0.0.

10 files changed, 22 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 5d4395b..24781da 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DESTDIR=
 
-PACKAGE=runit-1.9.0
+PACKAGE=runit-2.0.0
 DIRS=doc man etc package src
 MANPAGES=runit.8 runit-init.8 runsvdir.8 runsv.8 sv.8 utmpset.8 \
   runsvchdir.8 svlogd.8 chpst.8
diff --git a/doc/index.html b/doc/index.html
index fa53097..2982fff 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -8,10 +8,6 @@
 <hr>
 <h1>runit - a UNIX init scheme with service supervision</h1>
 <hr>
-See <a href="http://smarden.org/runit1/">here</a> for the current stable
-release 1.0.x of <i>runit</i>.
-<p>
-<hr>
 <a href="install.html">How to install runit</a><br>
 <a href="upgrade.html">Upgrading from previous versions of runit</a>
 <p>
diff --git a/doc/install.html b/doc/install.html
index 1c8e505..99e2ec3 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -17,14 +17,14 @@ If you don't have a <tt>/package</tt> directory, create it now:
  # chmod 1755 /package
 </pre>
 Download
-<a href="runit-1.9.0.tar.gz">runit-1.9.0.tar.gz</a> into <tt>/package</tt>
+<a href="runit-2.0.0.tar.gz">runit-2.0.0.tar.gz</a> into <tt>/package</tt>
 and unpack the archive
 <pre>
  # cd /package
- # gunzip runit-1.9.0.tar
- # tar -xpf runit-1.9.0.tar
- # rm runit-1.9.0.tar
- # cd admin/runit-1.9.0
+ # gunzip runit-2.0.0.tar
+ # tar -xpf runit-2.0.0.tar
+ # rm runit-2.0.0.tar
+ # cd admin/runit-2.0.0
 </pre>
 On MacOSX, do
 <pre>
@@ -43,7 +43,7 @@ hierarchy, do:
 </pre>
 To report success:
 <pre>
- # mail pape-runit-1.9.0@smarden.org &lt;compile/sysdeps
+ # mail pape-runit-2.0.0@smarden.org &lt;compile/sysdeps
 </pre>
 If you use <i>runit</i> regularly, please
 <a href="http://smarden.org/pape/#contribution">contribute</a> to the project.
diff --git a/doc/replaceinit.html b/doc/replaceinit.html
index aad85ff..25c9862 100644
--- a/doc/replaceinit.html
+++ b/doc/replaceinit.html
@@ -122,7 +122,7 @@ default Unix process no 1 <i>runit</i>.
 </pre>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.9.0@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.0.0@smarden.org
 </pre>
 <hr>
 
@@ -211,7 +211,7 @@ This will cause <i>runit</i> to enter stage 3 which runs
 <p>
 To report success:
 <pre>
- # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-1.9.0@smarden.org
+ # ( uname -a ; cat /etc/runit/[123] ) |mail pape-runit-2.0.0@smarden.org
 </pre>
 <h3>Step 5: Service migration</h3>
 The goal is to migrate all services from <i>/etc/rc.*</i> scheme to the
diff --git a/doc/runsv.8.html b/doc/runsv.8.html
index 3f430f1..d27deeb 100644
--- a/doc/runsv.8.html
+++ b/doc/runsv.8.html
@@ -116,13 +116,13 @@ to send a TERM signal to the socklog-unix service, either do   # sv term
 directory. 
 <h2><a name='sect4'>Customize Control</a></h2>
 For each control character <i>c</i> sent to the control
-pipe, <b>runsv</b> first checks if <i>service/control/<i>c</i> exists and is executable.
+pipe, <b>runsv</b> first checks if <i>service</i>/control/<i>c</i> exists and is executable.
 If so, it starts <i>service</i>/control/<i>c</i> and waits for it to terminate, before
 interpreting the command. If the program exits with return code 0, <b>runsv</b>
 refrains from sending the service the corresponding signal. The command
-<i>o</i> is always considered as command <i>u</i>. On command <i>d</i> first <i>service</i>/control/t</i>
-is checked, and then <i>service/control/d.</i> On command <i>x</i> first <i>service/control/t</i>
-is checked, and then <i>service/control/x.</i> The control of the optional log
+<i>o</i> is always considered as command <i>u</i>. On command <i>d</i> first <i>service</i>/control/<i>t</i>
+is checked, and then <i>service</i>/control/<i>d</i>. On command <i>x</i> first <i>service</i>/control/<i>t</i>
+is checked, and then <i>service</i>/control/<i>x</i>. The control of the optional log
 service cannot be customized. 
 <h2><a name='sect5'>Signals</a></h2>
 If <b>runsv</b> receives a TERM signal, it
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 11f5925..639bd10 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -9,6 +9,8 @@
 <hr>
 <h1>runit - upgrading from previous versions</h1>
 <hr>
+<h3>1.9.0 to 2.0.0</h3>
+No further action from you is required.
 <h3>1.8.0 to 1.9.0</h3>
 The default directory for services is now <tt>/service/</tt>, and no longer
 <tt>/var/service/</tt>.
diff --git a/package/CHANGES b/package/CHANGES
index 3f011a3..ab432b4 100644
--- a/package/CHANGES
+++ b/package/CHANGES
@@ -1,3 +1,6 @@
+2.0.0
+Sun, 15 Jun 2008 15:31:05 +0000
+
 1.9.0
 Mon, 05 May 2008 22:00:13 +0000
   * doc/upgrade.html: typo.
diff --git a/package/COPYING b/package/COPYING
index 619e45e..d24d1d2 100644
--- a/package/COPYING
+++ b/package/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2001-2007, Gerrit Pape
+Copyright (c) 2001-2008, Gerrit Pape
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/package/upgrade b/package/upgrade
index a1b048e..264b893 100755
--- a/package/upgrade
+++ b/package/upgrade
@@ -8,9 +8,9 @@ test -d src || sh -cx '! : Wrong working directory.'
 here=`env - PATH=$PATH pwd`
 parent=`dirname $here`
 
-echo 'Creating symlink runit -> runit-1.9.0...'
+echo 'Creating symlink runit -> runit-2.0.0...'
 rm -f runit
-ln -s runit-1.9.0 runit
+ln -s runit-2.0.0 runit
 mv -f runit ..
 
 echo 'Making command links in /command...'
diff --git a/package/versions b/package/versions
index 63f1208..ca3bc73 100644
--- a/package/versions
+++ b/package/versions
@@ -48,3 +48,4 @@
 1.7.2
 1.8.0
 1.9.0
+2.0.0