<li><a href="#say">say</a></li>
<li><a href="#slash">slash</a></li>
<li><a href="#trout">trout</a></li>
+<li><a href="#twit">twit</a></li>
<li><a href="#units">units</a></li>
<li><a href="#url">url</a></li>
</ul>
admirer)" to the end of the flirt. Further suggestions for flirts
should be submitted by email; a list of current flirts may be found
online at <a
-href="flirts">http://www.pick.ucam.org/~matthew/irc/flirts</a>.</p>
+href="flirts">http://www.chiark.greenend.org.uk/~matthewv/irc/flirts</a>.</p>
<h3><a name="google">google</a></h3>
<p>This command returns (either on-channel or by <span
of Servus stating who invoked it by adding "(while nick watches)" to
the end of the slash. Further suggestions for slashes should be
submitted by email; a list of current slashes may be found online at <a
-href="slashes">http://www.pick.ucam.org/~matthew/irc/slashes</a>.</p>
+href="slashes">http://www.chiark.greenend.org.uk/~matthewv/irc/slashes</a>.</p>
<h3><a name="trout">trout</a></h3>
<p>The syntax is:<br /> <span
of Servus stating who invoked it by adding "(at the instigation of
nick)" to the end of the trout. Further suggestions for trouts should
be submitted by email; a list of current trouts may be found online at
-<a href="trouts">http://www.pick.ucam.org/~matthew/irc/trouts</a>.</p>
+<a href="trouts">http://www.chiark.greenend.org.uk/~matthewv/irc/trouts</a>.</p>
+
+<h3><a name="twit">twit</a></h3>
+<p>The syntax is:<br /><span
+class="code">twit twitter-url</span><br /> Servus returns (either on-channel or by <span
+class="code">/msg</span>) the content
+of the tweet and the twitter user who posted it.</p>
<h3><a name="units">units</a></h3>
<p>The syntax is:<br /> <span
Servus will either paste the URL into channel, or <span
class="code">/msg</span> you to tell you it was a duplicate. Although
you can use this command in-channel (and get a response by <span
-class="code">/msg </span>), this is discouraged.</p>
+class="code">/msg </span>), this is discouraged. Servus also
+understands <span class="code">nsfw://</span>
+and <span class="code">nsfws://</span> URLs, and knows they are an
+obfuscation of the relevant <span class="code">http://</span>
+or <span class="code">https://</span> URL for URLs that are not
+work-safe. You can make your firefox understand <span
+class="code">nsfw://</span> URLS by visiting <a
+href="http://www.chiark.greenend.org.uk/~owend/free/nsfw/">http://www.chiark.greenend.org.uk/~owend/free/nsfw/</a>.</p>
<hr />
<address>
- <a href="mailto:matthew@sel.cam.ac.uk">Matthew Vernon</a><br />
- Cambridge, England
+ <a href="mailto:matthewv@chiark.greenend.org.uk">Matthew Vernon</a><br />
+ Coventry, England
</address>
<p>
<a href="http://validator.w3.org/check/referer"><img