diff --git a/linkcheck/HtmlParser/htmllib.py b/linkcheck/HtmlParser/htmllib.py
index 08e6782d..4ea21eaf 100644
--- a/linkcheck/HtmlParser/htmllib.py
+++ b/linkcheck/HtmlParser/htmllib.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Default HTML parser handler classes.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Default HTML parser handler classes.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Default HTML parser handler classes.
+"""
 
 import sys
 
diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py
index 66f287a8..27be69b4 100644
--- a/linkcheck/__init__.py
+++ b/linkcheck/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""main function module for link checking"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Main function module for link checking.
+"""
 
 # imports and checks
 import sys
diff --git a/linkcheck/ansicolor.py b/linkcheck/ansicolor.py
index 5957d108..04d0e58f 100644
--- a/linkcheck/ansicolor.py
+++ b/linkcheck/ansicolor.py
@@ -1,5 +1,21 @@
 # -*- coding: iso-8859-1 -*-
-"""ANSI Color definitions and functions.
+# Copyright (C) 2000-2005  Bastian Kleineidam
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+ANSI Color definitions and functions.
 
 From Term::ANSIColor, applies also to this module:
 
@@ -61,21 +77,6 @@ The current version of this module is always available from its web site at
 http://www.eyrie.org/~eagle/software/ansicolor/. It is also part of the Perl
 core distribution as of 5.6.0.
 """
-# Copyright (C) 2000-2005  Bastian Kleineidam
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 import os
 import logging
diff --git a/linkcheck/checker/__init__.py b/linkcheck/checker/__init__.py
index 21afd923..3c56d36b 100644
--- a/linkcheck/checker/__init__.py
+++ b/linkcheck/checker/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Main functions for link checking.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Main functions for link checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Main functions for link checking.
+"""
 
 import time
 import sys
diff --git a/linkcheck/checker/cache.py b/linkcheck/checker/cache.py
index 0d92197d..b2c43807 100644
--- a/linkcheck/checker/cache.py
+++ b/linkcheck/checker/cache.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Store cached data during checking.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Store cached data during checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Store cached data during checking.
+"""
 
 import Cookie
 try:
diff --git a/linkcheck/checker/consumer.py b/linkcheck/checker/consumer.py
index c3924873..d04367a1 100644
--- a/linkcheck/checker/consumer.py
+++ b/linkcheck/checker/consumer.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Url consumer class.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Url consumer class.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Url consumer class.
+"""
 
 import sys
 import time
diff --git a/linkcheck/checker/errorurl.py b/linkcheck/checker/errorurl.py
index e8f85246..392e6448 100644
--- a/linkcheck/checker/errorurl.py
+++ b/linkcheck/checker/errorurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle for unknown links.
-"""
 # Copyright (C) 2001-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,9 +14,11 @@ Handle for unknown links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle for unknown links.
+"""
 
 import urlbase
-
 import linkcheck
 
 class ErrorUrl (urlbase.UrlBase):
diff --git a/linkcheck/checker/fileurl.py b/linkcheck/checker/fileurl.py
index f724124c..9c026bac 100644
--- a/linkcheck/checker/fileurl.py
+++ b/linkcheck/checker/fileurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle local file: links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle local file: links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle local file: links.
+"""
 
 import re
 import os
diff --git a/linkcheck/checker/ftpurl.py b/linkcheck/checker/ftpurl.py
index 9fea970b..7c5f6b25 100644
--- a/linkcheck/checker/ftpurl.py
+++ b/linkcheck/checker/ftpurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle FTP links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle FTP links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle FTP links.
+"""
 
 import ftplib
 import time
diff --git a/linkcheck/checker/gopherurl.py b/linkcheck/checker/gopherurl.py
index 58ed4c3d..8f953b1f 100644
--- a/linkcheck/checker/gopherurl.py
+++ b/linkcheck/checker/gopherurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle Gopher links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle Gopher links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle Gopher links.
+"""
 
 import urlbase
 
diff --git a/linkcheck/checker/httpsurl.py b/linkcheck/checker/httpsurl.py
index 4909eeeb..49ccbb1a 100644
--- a/linkcheck/checker/httpsurl.py
+++ b/linkcheck/checker/httpsurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle https links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle https links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle https links.
+"""
 
 import httpurl
 
diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py
index 9ccbe9e4..740cb5f5 100644
--- a/linkcheck/checker/httpurl.py
+++ b/linkcheck/checker/httpurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle http links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle http links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle http links.
+"""
 
 import urlparse
 import sys
diff --git a/linkcheck/checker/ignoredurl.py b/linkcheck/checker/ignoredurl.py
index acdf7df7..1598e4bf 100644
--- a/linkcheck/checker/ignoredurl.py
+++ b/linkcheck/checker/ignoredurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle for uncheckable application-specific links.
-"""
 # Copyright (C) 2001-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle for uncheckable application-specific links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle for uncheckable application-specific links.
+"""
 
 import urlbase
 
diff --git a/linkcheck/checker/mailtourl.py b/linkcheck/checker/mailtourl.py
index a9eb292b..6ecb3732 100644
--- a/linkcheck/checker/mailtourl.py
+++ b/linkcheck/checker/mailtourl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle for mailto: links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle for mailto: links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle for mailto: links.
+"""
 
 import sys
 import cgi
diff --git a/linkcheck/checker/nntpurl.py b/linkcheck/checker/nntpurl.py
index 5fcdf9a4..b965a418 100644
--- a/linkcheck/checker/nntpurl.py
+++ b/linkcheck/checker/nntpurl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle nntp: and news: links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle nntp: and news: links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle nntp: and news: links.
+"""
 
 import re
 import time
diff --git a/linkcheck/checker/proxysupport.py b/linkcheck/checker/proxysupport.py
index b475a878..f70387f5 100644
--- a/linkcheck/checker/proxysupport.py
+++ b/linkcheck/checker/proxysupport.py
@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Mixin class for URLs that can be fetched over a proxy.
+"""
 
 import urllib
 
diff --git a/linkcheck/checker/telneturl.py b/linkcheck/checker/telneturl.py
index 58f1432e..c577dbb4 100644
--- a/linkcheck/checker/telneturl.py
+++ b/linkcheck/checker/telneturl.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Handle telnet: links.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Handle telnet: links.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Handle telnet: links.
+"""
 
 import telnetlib
 import urlparse
diff --git a/linkcheck/checker/urlbase.py b/linkcheck/checker/urlbase.py
index 5563ac69..ef33cfa7 100644
--- a/linkcheck/checker/urlbase.py
+++ b/linkcheck/checker/urlbase.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Base URL handler.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Base URL handler.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Base URL handler.
+"""
 
 import sys
 import os
diff --git a/linkcheck/configuration.py b/linkcheck/configuration.py
index 7f7ebad6..c42f3823 100644
--- a/linkcheck/configuration.py
+++ b/linkcheck/configuration.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""store metadata and options"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Store metadata and options.
+"""
 
 import ConfigParser
 import sys
diff --git a/linkcheck/containers.py b/linkcheck/containers.py
index 30db1f38..2cc46396 100644
--- a/linkcheck/containers.py
+++ b/linkcheck/containers.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""special container classes"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Special container classes.
+"""
 
 
 class SetList (list):
diff --git a/linkcheck/dns/ChangeLog b/linkcheck/dns/ChangeLog
index 5dd6ac28..8367892b 100644
--- a/linkcheck/dns/ChangeLog
+++ b/linkcheck/dns/ChangeLog
@@ -1,4 +1,4 @@
-The following changes were made to the original dnspython 1.3.1
+The following changes were made to the original dnspython 1.3.2
 sources:
 
 * moved everything into the linkcheck package
@@ -21,7 +21,7 @@ sources:
 
 * added set of localhost addresses to resolver config
   Changed: resolver.py
-  Added: IfConfig.py
+  Added: ifconfig.py
 
 * added search patters for domain names
   Changed: resolver.py
diff --git a/linkcheck/ftests/__init__.py b/linkcheck/ftests/__init__.py
index cd5892af..460f109b 100644
--- a/linkcheck/ftests/__init__.py
+++ b/linkcheck/ftests/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Define standard test support classes funtional for LinkChecker tests.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Define standard test support classes funtional for LinkChecker tests.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Define standard test support classes funtional for LinkChecker tests.
+"""
 
 import os
 import codecs
diff --git a/linkcheck/ftests/httptest.py b/linkcheck/ftests/httptest.py
index 09988e5d..b353d5f5 100644
--- a/linkcheck/ftests/httptest.py
+++ b/linkcheck/ftests/httptest.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Define http test support classes for LinkChecker tests.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Define http test support classes for LinkChecker tests.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Define http test support classes for LinkChecker tests.
+"""
 
 import SimpleHTTPServer
 import BaseHTTPServer
diff --git a/linkcheck/ftests/test_anchor.py b/linkcheck/ftests/test_anchor.py
index 0c22ce08..a95849df 100644
--- a/linkcheck/ftests/test_anchor.py
+++ b/linkcheck/ftests/test_anchor.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test html anchor parsing and checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test html anchor parsing and checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test html anchor parsing and checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_base.py b/linkcheck/ftests/test_base.py
index 541c4099..ec96fc18 100644
--- a/linkcheck/ftests/test_base.py
+++ b/linkcheck/ftests/test_base.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test html <base> tag parsing.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test html <base> tag parsing.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test html <base> tag parsing.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_error.py b/linkcheck/ftests/test_error.py
index 238e9b21..449e6f69 100644
--- a/linkcheck/ftests/test_error.py
+++ b/linkcheck/ftests/test_error.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test error checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test error checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test error checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_file.py b/linkcheck/ftests/test_file.py
index 85ff5b2b..bcf9c062 100644
--- a/linkcheck/ftests/test_file.py
+++ b/linkcheck/ftests/test_file.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test file parsing.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test file parsing.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test file parsing.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/ftests/test_frames.py b/linkcheck/ftests/test_frames.py
index bab2ba71..769f9477 100644
--- a/linkcheck/ftests/test_frames.py
+++ b/linkcheck/ftests/test_frames.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""test html <frame> tag parsing"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test html <frame> tag parsing.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_ftp.py b/linkcheck/ftests/test_ftp.py
index 21e148ab..157d6ff3 100644
--- a/linkcheck/ftests/test_ftp.py
+++ b/linkcheck/ftests/test_ftp.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test ftp checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test ftp checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test ftp checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_http.py b/linkcheck/ftests/test_http.py
index 7c09df7b..f5152df5 100644
--- a/linkcheck/ftests/test_http.py
+++ b/linkcheck/ftests/test_http.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test http checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test http checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test http checking.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/ftests/test_https.py b/linkcheck/ftests/test_https.py
index 5f0fccba..ca817fb2 100644
--- a/linkcheck/ftests/test_https.py
+++ b/linkcheck/ftests/test_https.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test news checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test news checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test news checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_mail.py b/linkcheck/ftests/test_mail.py
index 446614e6..9d457762 100644
--- a/linkcheck/ftests/test_mail.py
+++ b/linkcheck/ftests/test_mail.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test mail checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test mail checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test mail checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_news.py b/linkcheck/ftests/test_news.py
index 189e868a..8f16150d 100644
--- a/linkcheck/ftests/test_news.py
+++ b/linkcheck/ftests/test_news.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test news checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test news checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test news checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/ftests/test_robotstxt.py b/linkcheck/ftests/test_robotstxt.py
index eb5cb0b4..f8ca6d45 100644
--- a/linkcheck/ftests/test_robotstxt.py
+++ b/linkcheck/ftests/test_robotstxt.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test HTML robots.txt parsing.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test HTML robots.txt parsing.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test HTML robots.txt parsing.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/ftests/test_telnet.py b/linkcheck/ftests/test_telnet.py
index f7e8dadd..93684020 100644
--- a/linkcheck/ftests/test_telnet.py
+++ b/linkcheck/ftests/test_telnet.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test telnet checking.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test telnet checking.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test telnet checking.
+"""
 
 import unittest
 
diff --git a/linkcheck/i18n.py b/linkcheck/i18n.py
index e8cb42e2..fb2560f0 100644
--- a/linkcheck/i18n.py
+++ b/linkcheck/i18n.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""application internationalization support"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Application internationalization support.
+"""
 
 # i18n suppport
 import os
diff --git a/linkcheck/lc_cgi.py b/linkcheck/lc_cgi.py
index 32ae0f78..6d070ee6 100644
--- a/linkcheck/lc_cgi.py
+++ b/linkcheck/lc_cgi.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""common CGI functions used by the CGI scripts"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Common CGI functions used by the CGI scripts.
+"""
 
 import sys
 import os
diff --git a/linkcheck/linkname.py b/linkcheck/linkname.py
index 72792436..08e07ab7 100644
--- a/linkcheck/linkname.py
+++ b/linkcheck/linkname.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""parse name of common link types"""
 # Copyright (C) 2001-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Parse name of common link types.
+"""
 
 import re
 import linkcheck
diff --git a/linkcheck/linkparse.py b/linkcheck/linkparse.py
index dd9713b3..1dc8ee3f 100644
--- a/linkcheck/linkparse.py
+++ b/linkcheck/linkparse.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""Find link tags in HTML text"""
 # Copyright (C) 2001-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Find link tags in HTML text.
+"""
 
 import re
 import linkcheck
diff --git a/linkcheck/log.py b/linkcheck/log.py
index bfeeea07..fff6d938 100644
--- a/linkcheck/log.py
+++ b/linkcheck/log.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Logging and debug functions.
-"""
 # Copyright (C) 2003-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Logging and debug functions.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Logging and debug functions.
+"""
 
 # public api
 __all__ = ["debug", "info", "warn", "error", "critical", "exception", ]
diff --git a/linkcheck/logger/__init__.py b/linkcheck/logger/__init__.py
index 22fedff0..41018ed6 100644
--- a/linkcheck/logger/__init__.py
+++ b/linkcheck/logger/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Output logging support for different formats.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Output logging support for different formats.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Output logging support for different formats.
+"""
 
 import sys
 import os
diff --git a/linkcheck/logger/blacklist.py b/linkcheck/logger/blacklist.py
index f79f66d3..fe57aab8 100644
--- a/linkcheck/logger/blacklist.py
+++ b/linkcheck/logger/blacklist.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-A blacklist logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ A blacklist logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A blacklist logger.
+"""
 
 import sys
 import os
diff --git a/linkcheck/logger/csvlog.py b/linkcheck/logger/csvlog.py
index 41027042..26e906bc 100644
--- a/linkcheck/logger/csvlog.py
+++ b/linkcheck/logger/csvlog.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""A CSV logger."""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A CSV logger.
+"""
 
 import time
 import csv
diff --git a/linkcheck/logger/gml.py b/linkcheck/logger/gml.py
index 9dabf60f..8290fd4b 100644
--- a/linkcheck/logger/gml.py
+++ b/linkcheck/logger/gml.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-A gml logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ A gml logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A gml logger.
+"""
 
 import time
 import os
diff --git a/linkcheck/logger/html.py b/linkcheck/logger/html.py
index 590166c2..19fce548 100644
--- a/linkcheck/logger/html.py
+++ b/linkcheck/logger/html.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-A HTML logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ A HTML logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A HTML logger.
+"""
 
 import time
 import cgi
diff --git a/linkcheck/logger/none.py b/linkcheck/logger/none.py
index 73fa0bd7..a6c3900f 100644
--- a/linkcheck/logger/none.py
+++ b/linkcheck/logger/none.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-A dummy logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ A dummy logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A dummy logger.
+"""
 
 import linkcheck.logger
 
diff --git a/linkcheck/logger/sql.py b/linkcheck/logger/sql.py
index b7c2f953..33b79c80 100644
--- a/linkcheck/logger/sql.py
+++ b/linkcheck/logger/sql.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-A SQL logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ A SQL logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+A SQL logger.
+"""
 
 import time
 import os
diff --git a/linkcheck/logger/text.py b/linkcheck/logger/text.py
index 7b3cc52e..f2ac276a 100644
--- a/linkcheck/logger/text.py
+++ b/linkcheck/logger/text.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-The default text logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ The default text logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+The default text logger.
+"""
 
 import sys
 import os
diff --git a/linkcheck/logger/xmllog.py b/linkcheck/logger/xmllog.py
index d3678364..16a86cd7 100644
--- a/linkcheck/logger/xmllog.py
+++ b/linkcheck/logger/xmllog.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-An xml logger.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ An xml logger.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+An xml logger.
+"""
 
 import os
 import time
diff --git a/linkcheck/mem.py b/linkcheck/mem.py
index 5b8ec78e..89510dac 100644
--- a/linkcheck/mem.py
+++ b/linkcheck/mem.py
@@ -1,10 +1,10 @@
 # -*- coding: iso-8859-1 -*-
-""" Copied from the Python Cookbook recipe at
-    http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286222
-
-    To find the memory usage in a particular section of code these
-    functions are typically used as follows:
+"""
+Copied from the Python Cookbook recipe at
+http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/286222
 
+To find the memory usage in a particular section of code these
+functions are typically used as follows:
     m0 = memory()
     ...
     m1 = memory(m0)
diff --git a/linkcheck/robotparser2.py b/linkcheck/robotparser2.py
index 26292056..c76169e3 100755
--- a/linkcheck/robotparser2.py
+++ b/linkcheck/robotparser2.py
@@ -1,9 +1,4 @@
-"""
-robotparser.py
-
-The robots.txt Exclusion Protocol is implemented as specified in
-http://www.robotstxt.org/wc/norobots-rfc.html
-"""
+# -*- coding: iso-8859-1 -*-
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -19,6 +14,13 @@ http://www.robotstxt.org/wc/norobots-rfc.html
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+robotparser.py
+
+The robots.txt Exclusion Protocol is implemented as specified in
+http://www.robotstxt.org/wc/norobots-rfc.html
+"""
+
 import urlparse
 import httplib
 import urllib
diff --git a/linkcheck/strformat.py b/linkcheck/strformat.py
index d448d227..ee9d808c 100644
--- a/linkcheck/strformat.py
+++ b/linkcheck/strformat.py
@@ -1,8 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Various string utility functions. Note that these functions are not
-necessarily optimised for large strings, so use with care.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -18,6 +14,10 @@ necessarily optimised for large strings, so use with care.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Various string utility functions. Note that these functions are not
+necessarily optimised for large strings, so use with care.
+"""
 
 import re
 import textwrap
diff --git a/linkcheck/tests/__init__.py b/linkcheck/tests/__init__.py
index ae1c1b00..f8dbea52 100644
--- a/linkcheck/tests/__init__.py
+++ b/linkcheck/tests/__init__.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Unit tests for the linkcheck module.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Unit tests for the linkcheck module.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Unit tests for the linkcheck module.
+"""
 
 import linkcheck
 linkcheck.init_i18n()
diff --git a/linkcheck/tests/test_cgi.py b/linkcheck/tests/test_cgi.py
index b7f9dac3..5ba34cf8 100644
--- a/linkcheck/tests/test_cgi.py
+++ b/linkcheck/tests/test_cgi.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test cgi form routines.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test cgi form routines.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test cgi form routines.
+"""
 
 import unittest
 import linkcheck.lc_cgi
diff --git a/linkcheck/tests/test_containers.py b/linkcheck/tests/test_containers.py
index 0bc7abc1..6bc7ca58 100644
--- a/linkcheck/tests/test_containers.py
+++ b/linkcheck/tests/test_containers.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test container routines.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test container routines.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test container routines.
+"""
 
 import unittest
 import random
diff --git a/linkcheck/tests/test_filenames.py b/linkcheck/tests/test_filenames.py
index d3840ae6..c2d9f147 100644
--- a/linkcheck/tests/test_filenames.py
+++ b/linkcheck/tests/test_filenames.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test filename routines.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test filename routines.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test filename routines.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/tests/test_linkname.py b/linkcheck/tests/test_linkname.py
index 6f40fbee..605e08e6 100644
--- a/linkcheck/tests/test_linkname.py
+++ b/linkcheck/tests/test_linkname.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test linkname routines.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test linkname routines.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test linkname routines.
+"""
 
 import unittest
 import linkcheck.linkname
diff --git a/linkcheck/tests/test_parser.py b/linkcheck/tests/test_parser.py
index e73f2213..883c26c6 100644
--- a/linkcheck/tests/test_parser.py
+++ b/linkcheck/tests/test_parser.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test html parsing.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test html parsing.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test html parsing.
+"""
 
 import linkcheck.HtmlParser
 import linkcheck.HtmlParser.htmlsax
diff --git a/linkcheck/tests/test_robotparser.py b/linkcheck/tests/test_robotparser.py
index f1b588b8..5fe99443 100644
--- a/linkcheck/tests/test_robotparser.py
+++ b/linkcheck/tests/test_robotparser.py
@@ -14,6 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test robots.txt parsing.
+"""
 
 import unittest
 
diff --git a/linkcheck/tests/test_strformat.py b/linkcheck/tests/test_strformat.py
index 7d11dbc5..651f8e61 100644
--- a/linkcheck/tests/test_strformat.py
+++ b/linkcheck/tests/test_strformat.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test string formatting operations.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test string formatting operations.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test string formatting operations.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/tests/test_url.py b/linkcheck/tests/test_url.py
index df19bc18..a584c063 100644
--- a/linkcheck/tests/test_url.py
+++ b/linkcheck/tests/test_url.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test url routines.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test url routines.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test url routines.
+"""
 
 import unittest
 import os
diff --git a/linkcheck/tests/test_urlbuild.py b/linkcheck/tests/test_urlbuild.py
index 5006f6ed..d461c13e 100644
--- a/linkcheck/tests/test_urlbuild.py
+++ b/linkcheck/tests/test_urlbuild.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Test url build method from url data objects.
-"""
 # Copyright (C) 2004-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Test url build method from url data objects.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Test url build method from url data objects.
+"""
 
 import unittest
 import linkcheck.checker.httpurl
diff --git a/linkcheck/threader.py b/linkcheck/threader.py
index d263538f..7f76ca59 100644
--- a/linkcheck/threader.py
+++ b/linkcheck/threader.py
@@ -1,5 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""Threading support"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +14,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Threading support.
+"""
+
 import time
 try:
     import threading
diff --git a/linkcheck/url.py b/linkcheck/url.py
index dcbc847f..2a220706 100644
--- a/linkcheck/url.py
+++ b/linkcheck/url.py
@@ -1,7 +1,4 @@
 # -*- coding: iso-8859-1 -*-
-"""
-Functions for parsing and matching URL strings.
-"""
 # Copyright (C) 2000-2005  Bastian Kleineidam
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,6 +14,9 @@ Functions for parsing and matching URL strings.
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+"""
+Functions for parsing and matching URL strings.
+"""
 
 import re
 import os