copy from markup/output.py
copy to genshi/output.py
--- a/markup/output.py
+++ b/genshi/output.py
@@ -5,11 +5,11 @@
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
-# are also available at http://markup.edgewall.org/wiki/License.
+# are also available at http://genshi.edgewall.org/wiki/License.
 #
 # This software consists of voluntary contributions made by many
 # individuals. For the exact contribution history, see the revision
-# history and logs, available at http://markup.edgewall.org/log/.
+# history and logs, available at http://genshi.edgewall.org/log/.
 
 """This module provides different kinds of serialization methods for XML event
 streams.
@@ -22,8 +22,8 @@
     from sets import ImmutableSet as frozenset
 import re
 
-from markup.core import escape, Markup, Namespace, QName, StreamEventKind
-from markup.core import DOCTYPE, START, END, START_NS, TEXT, START_CDATA, \
+from genshi.core import escape, Markup, Namespace, QName, StreamEventKind
+from genshi.core import DOCTYPE, START, END, START_NS, TEXT, START_CDATA, \
                         END_CDATA, PI, COMMENT, XML_NAMESPACE
 
 __all__ = ['DocType', 'XMLSerializer', 'XHTMLSerializer', 'HTMLSerializer',
@@ -49,7 +49,7 @@
 class XMLSerializer(object):
     """Produces XML text from an event stream.
     
-    >>> from markup.builder import tag
+    >>> from genshi.builder import tag
     >>> elem = tag.div(tag.a(href='foo'), tag.br, tag.hr(noshade=True))
     >>> print ''.join(XMLSerializer()(elem.generate()))
     <div><a href="foo"/><br/><hr noshade="True"/></div>
@@ -169,7 +169,7 @@
 class XHTMLSerializer(XMLSerializer):
     """Produces XHTML text from an event stream.
     
-    >>> from markup.builder import tag
+    >>> from genshi.builder import tag
     >>> elem = tag.div(tag.a(href='foo'), tag.br, tag.hr(noshade=True))
     >>> print ''.join(XHTMLSerializer()(elem.generate()))
     <div><a href="foo"></a><br /><hr noshade="noshade" /></div>
@@ -292,7 +292,7 @@
 class HTMLSerializer(XHTMLSerializer):
     """Produces HTML text from an event stream.
     
-    >>> from markup.builder import tag
+    >>> from genshi.builder import tag
     >>> elem = tag.div(tag.a(href='foo'), tag.br, tag.hr(noshade=True))
     >>> print ''.join(HTMLSerializer()(elem.generate()))
     <div><a href="foo"></a><br><hr noshade></div>
@@ -396,7 +396,7 @@
     Only text events are included in the output. Unlike the other serializer,
     special XML characters are not escaped:
     
-    >>> from markup.builder import tag
+    >>> from genshi.builder import tag
     >>> elem = tag.div(tag.a('<Hello!>', href='foo'), tag.br)
     >>> print elem
     <div><a href="foo">&lt;Hello!&gt;</a><br/></div>