Merge alias-doc-6637: Fix docstrings and whitespace in alias.py

Author: shira
Reviewer: thijs, rwall
Fixes: #6637


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41590 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb
Merge 6648: Fix docstrings and whitespace in tap.py

Author: shira
Reviewer: hynek, exarkun
Fixes: #6648


git-svn-id: svn://svn.twistedmatrix.com/svn/Twisted/trunk@41591 bbbe8e31-12d6-0310-92fd-ac37d47ddeeb