Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

1 files changed, 2 insertions, 2 deletions

diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.cpp b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
index b2beb404e..cc26c5d70 100644
--- a/doc/src/snippets/textdocument-frames/xmlwriter.cpp
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -47,7 +47,7 @@ QDomDocument *XmlWriter::toXml()
 {
     QDomImplementation implementation;
     QDomDocumentType docType = implementation.createDocumentType(
-        "scribe-document", "scribe", "qtsoftware.com/scribe");
+        "scribe-document", "scribe", "qt,nokia.com/scribe");
 
     document = new QDomDocument(docType);