Index: twisted/scripts/tap2rpm.py
===================================================================
--- twisted/scripts/tap2rpm.py	(revision 27593)
+++ twisted/scripts/tap2rpm.py	(working copy)
@@ -225,7 +225,7 @@
     description = config['description'] or ('A TCP server for %(protocol)s' %
                                             vars())
     long_description = (config['long_description']
-                        or 'Automatically created by tap2deb')
+                        or "Automatically created by tap2rpm")
     twistd_option = type_dict[config['type']]
     date = time.strftime('%a %b %d %Y', time.localtime(time.time()))
     directory = rpm_file + '-' + version
Index: doc/words/examples/aimbot.py
===================================================================
--- doc/words/examples/aimbot.py	(revision 27593)
+++ doc/words/examples/aimbot.py	(working copy)
@@ -1,62 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2009 Twisted Matrix Laboratories.
-# See LICENSE for details.
-
-"""
-AIM echo bot.
-"""
-
-from twisted.words.protocols import toc
-from twisted.internet import reactor, protocol
-import twisted.words.im.tocsupport as ts
-
-# account info
-screenname = 'username'
-password = 'password'
-
-class aimBot(toc.TOCClient):
-    """AOL Instant Messenger echo bot"""
-
-    def gotConfig(self, mode, buddylist, permit, deny):
-        """called when the server sends us config info"""
-        global screename
-
-        # add someone to our deny list?
-        self.add_deny([])
-
-        # add ourself to our buddy list
-        self.add_buddy([screenname])
-
-        # finish up the signon procedure
-        self.signon()
-
-    def updateBuddy(self,username,online,evilness,signontime,idletime,userclass,away):
-        """called when a buddy changes state"""
-        print "status changed for",username
-
-    def hearWarning(self, warnlvl, screenname):
-        """called when someone warns us"""
-        print screenname,"warned us"
-
-    def hearError(self, errcode, *args):
-        """called when server sends error"""
-        print "recieved error:",errcode
-
-    def hearMessage(self, username, message, autoreply):
-        """called when a message is recieved"""
-
-        # remove the incoming message' html
-        msg = ts.dehtml(message)
-        
-        print "got message:",msg
-        
-        # construct the reply, and turn it into html
-        reply = ts.html("echo: %s" % msg)
-
-        self.say(username, reply)
-
-cc = protocol.ClientCreator(reactor, aimBot, screenname, password)
-cc.connectTCP("toc.oscar.aol.com", 9898)
-
-reactor.run()