Update license.

56 files changed, 56 insertions, 56 deletions

diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp
index ade97003709..d63c0fd6d44 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h
index 1489b1ba003..7de19e68c3c 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirmodelpluginplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp
index 688f25173f1..b9cc3c032db 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h
index 2a0e52e72a7..845ec5fe099 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/dirnavigationfactory.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp
index 463fa778604..ebadf91dd2c 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp
+++ b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h
index d40bef78486..da0856c347b 100644
--- a/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h
+++ b/doc/pluginhowto/examples/dirmodelplugin/filesystemmodel.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/donothing/donothingplugin.cpp b/doc/pluginhowto/examples/donothing/donothingplugin.cpp
index 11d4892ff24..9141cc35ceb 100644
--- a/doc/pluginhowto/examples/donothing/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/donothing/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/donothing/donothingplugin.h b/doc/pluginhowto/examples/donothing/donothingplugin.h
index 73fc0f9f993..cfb7443c315 100644
--- a/doc/pluginhowto/examples/donothing/donothingplugin.h
+++ b/doc/pluginhowto/examples/donothing/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/headerfilter/headerfilter.cpp b/doc/pluginhowto/examples/headerfilter/headerfilter.cpp
index fac2037c306..5ce16e53df5 100644
--- a/doc/pluginhowto/examples/headerfilter/headerfilter.cpp
+++ b/doc/pluginhowto/examples/headerfilter/headerfilter.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/headerfilter/headerfilter.h b/doc/pluginhowto/examples/headerfilter/headerfilter.h
index 483f70a5d66..ebe3127f040 100644
--- a/doc/pluginhowto/examples/headerfilter/headerfilter.h
+++ b/doc/pluginhowto/examples/headerfilter/headerfilter.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp
index 03a362cceb1..a863f0ce39f 100644
--- a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp
+++ b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h
index db2d2313ded..19a82b3a8b4 100644
--- a/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h
+++ b/doc/pluginhowto/examples/headerfilter/headerfilterplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditor.cpp b/doc/pluginhowto/examples/htmleditor/htmleditor.cpp
index 78d4f33a1cf..eee20e2d514 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditor.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditor.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditor.h b/doc/pluginhowto/examples/htmleditor/htmleditor.h
index f3c0d801d09..89090943ab7 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditor.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditor.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp
index 2f6644730a6..b87c42bd5c7 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h
index 6b6580df8e1..953247e1202 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorfactory.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp
index a3c34227283..d6f95854778 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h
index 6604665ec34..7c9f349dffc 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp
index a2a94513633..8f24db866cd 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h
index 9318d2bba4a..a09a1312946 100644
--- a/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h
+++ b/doc/pluginhowto/examples/htmleditor/htmleditorwidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmlfile.cpp b/doc/pluginhowto/examples/htmleditor/htmlfile.cpp
index ca1c5eba61e..fba4500d22c 100644
--- a/doc/pluginhowto/examples/htmleditor/htmlfile.cpp
+++ b/doc/pluginhowto/examples/htmleditor/htmlfile.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/htmleditor/htmlfile.h b/doc/pluginhowto/examples/htmleditor/htmlfile.h
index 87a067399a8..e021d038e49 100644
--- a/doc/pluginhowto/examples/htmleditor/htmlfile.h
+++ b/doc/pluginhowto/examples/htmleditor/htmlfile.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermode.cpp b/doc/pluginhowto/examples/loggermode/loggermode.cpp
index bf1b15bb7c0..f43339353d0 100644
--- a/doc/pluginhowto/examples/loggermode/loggermode.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermode.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermode.h b/doc/pluginhowto/examples/loggermode/loggermode.h
index 09013b3c222..d9ee4249ed2 100644
--- a/doc/pluginhowto/examples/loggermode/loggermode.h
+++ b/doc/pluginhowto/examples/loggermode/loggermode.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp b/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp
index 46c7feac144..de157687dea 100644
--- a/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermodePlugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermodePlugin.h b/doc/pluginhowto/examples/loggermode/loggermodePlugin.h
index 0d742ea1265..2a22839f459 100644
--- a/doc/pluginhowto/examples/loggermode/loggermodePlugin.h
+++ b/doc/pluginhowto/examples/loggermode/loggermodePlugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp b/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp
index 844629b9786..def52933f11 100644
--- a/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp
+++ b/doc/pluginhowto/examples/loggermode/loggermodewidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/loggermode/loggermodewidget.h b/doc/pluginhowto/examples/loggermode/loggermodewidget.h
index 37841e4a691..81edc05a974 100644
--- a/doc/pluginhowto/examples/loggermode/loggermodewidget.h
+++ b/doc/pluginhowto/examples/loggermode/loggermodewidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp
index e46070c724d..e1a029865db 100644
--- a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h
index 9a722a61e02..0c8944d674d 100644
--- a/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/addingmenu/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp
index 53afb2ccc09..526b7cd5c51 100644
--- a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h
index 73fc0f9f993..cfb7443c315 100644
--- a/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/placingmenu/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp
index 0ed53c6985a..b3d22f42fb1 100644
--- a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h
index 73fc0f9f993..cfb7443c315 100644
--- a/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/registeringmenuitem/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp
index d34ecf676fb..77ea0367c42 100644
--- a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp
+++ b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h
index 9a722a61e02..0c8944d674d 100644
--- a/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h
+++ b/doc/pluginhowto/examples/menu/respondingtomenuitems/donothingplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp
index d576e3d2868..2d45476e308 100644
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h
index 8130341532c..6a89e0495fa 100644
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelister.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp
index 599be2377ba..1cddc65696a 100644
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h
index 4aa2872b084..0a3be980db6 100644
--- a/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h
+++ b/doc/pluginhowto/examples/preferencepane/modifiedfilelistwidget.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp
index 8a66cec9109..0eec536e57c 100644
--- a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp
+++ b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h
index 9d664a3a50a..cb81093a326 100644
--- a/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h
+++ b/doc/pluginhowto/examples/preferencepane/preferencepaneplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp b/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp
index 0670749c695..61a89310260 100644
--- a/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp
+++ b/doc/pluginhowto/examples/progressbar/headerfilteprogress.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/progressbar/headerfilterprogress.h b/doc/pluginhowto/examples/progressbar/headerfilterprogress.h
index 10e35dd00d5..acaaf28525a 100644
--- a/doc/pluginhowto/examples/progressbar/headerfilterprogress.h
+++ b/doc/pluginhowto/examples/progressbar/headerfilterprogress.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp b/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp
index f47dd6e34e3..a4a402e6817 100644
--- a/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp
+++ b/doc/pluginhowto/examples/progressbar/progressbarplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/progressbar/progressbarplugin.h b/doc/pluginhowto/examples/progressbar/progressbarplugin.h
index f19e2b8db7f..4c4665fe6aa 100644
--- a/doc/pluginhowto/examples/progressbar/progressbarplugin.h
+++ b/doc/pluginhowto/examples/progressbar/progressbarplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp
index 4e6acbc8375..0a513ad8546 100644
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h
index 7db6cd7d20c..bed7f782138 100644
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp
index 35a363adf60..f8ff70cee4a 100644
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h
index 34966dac6a3..cc2c9862ce7 100644
--- a/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h
+++ b/doc/pluginhowto/examples/wizard/customproject/customprojectwizard.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp
index 1d34ee9e190..287ab8427d2 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h
index d55d3aec689..b61f275d5c2 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/itemmodelwizardplugin.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp
index 9a01f2a884a..fc10d70a33a 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h
index 777a5d875eb..20ee81e7107 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelclasswizard.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp
index 2e0d3685793..7ea0391de95 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.cpp
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **
diff --git a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h
index 7bd9f6d5375..8ba3d70da20 100644
--- a/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h
+++ b/doc/pluginhowto/examples/wizard/itemmodelwizard/modelnamepage.h
@@ -2,7 +2,7 @@
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
 **
 ** This file is part of the documentation of Qt Creator.
 **