From: Matthew Vernon <matthew@rapun.sel.cam.ac.uk>
Date: Mon, 7 Jun 2010 16:30:49 +0000 (+0100)
Subject: Merge branch 'master' of /home/matthew/public_html/irc
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~matthewv/git?p=irc.git;a=commitdiff_plain;h=f51b635da737e39a03b9195c0ec9e58357322516;hp=4f4854eda8bb08cc7cf1dbe46ace59ce282745d3

Merge branch 'master' of /home/matthew/public_html/irc
---

diff --git a/servus.html b/servus.html
index 61fae3a..4c37a10 100644
--- a/servus.html
+++ b/servus.html
@@ -180,7 +180,7 @@ in output to the channel of the form:<br />
 class="code">slash target1 / target2 </span><br /> Servus picks a slash at random
 from the slashes list (<span
 class="code">/home/matthew/programming/irc/bot/slashes</span> on rapun),
-and substitutes "target1" for the first "%s" and "target2 for the
+and substitutes "target1" for the first "%s" and "target2" for the
 second "%s" in the slash line. If this command
 is invoked by <span class="code">/msg</span>, there is a 10% chance
 of Servus stating who invoked it by adding "(while nick watches)" to