5 files changed, 77 insertions, 9 deletions
diff --git a/src/network/doc/images/network-examples.png b/src/network/doc/images/network-examples.png
new file mode 100644
index 0000000000..15dfba850a
--- /dev/null
+++ b/src/network/doc/images/network-examples.png
diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 17aa5e4251..702338e224 100644
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -3,21 +3,21 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 project                 = QtNetwork
 description             = Qt Network Reference Documentation
 url                     = http://qt-project.org/doc/qtnetwork
-version                 = 5.0.0
+version                 = 5.0.1
 
 examplesinstallpath     = network
 
 qhp.projects            = QtNetwork
 
 qhp.QtNetwork.file         = qtnetwork.qhp
-qhp.QtNetwork.namespace           = org.qt-project.qtnetwork.500
+qhp.QtNetwork.namespace           = org.qt-project.qtnetwork.501
 qhp.QtNetwork.virtualFolder       = qtnetwork
 qhp.QtNetwork.indexTitle          = Qt Network
 qhp.QtNetwork.indexRoot           =
 
-qhp.QtNetwork.filterAttributes    = qtnetwork 5.0.0 qtrefdoc
-qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.0
-qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.0
+qhp.QtNetwork.filterAttributes    = qtnetwork 5.0.1 qtrefdoc
+qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.1
+qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.1
 
 qhp.QtNetwork.subprojects         = classes
 qhp.QtNetwork.subprojects.classes.title = C++ Classes
diff --git a/src/network/doc/snippets/code/src_network_access_qftp.cpp b/src/network/doc/snippets/code/src_network_access_qftp.cpp
index 77f5ee2df2..4fa81efd84 100644
--- a/src/network/doc/snippets/code/src_network_access_qftp.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qftp.cpp
@@ -40,13 +40,13 @@
 
 //! [0]
 QFtp *ftp = new QFtp(parent);
-ftp->connectToHost("ftp.qt.nokia.com");
+ftp->connectToHost("ftp.qt-project.org");
 ftp->login();
 //! [0]
 
 
 //! [1]
-ftp->connectToHost("ftp.qt.nokia.com");   // id == 1
+ftp->connectToHost("ftp.qt-project.org");   // id == 1
 ftp->login();                             // id == 2
 ftp->cd("qt");                            // id == 3
 ftp->get("INSTALL");                      // id == 4
diff --git a/src/network/doc/src/examples.qdoc b/src/network/doc/src/examples.qdoc
new file mode 100644
index 0000000000..1d3b83ae80
--- /dev/null
+++ b/src/network/doc/src/examples.qdoc
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \group examples-network
+    \ingroup all-examples
+    \title Network Examples
+    \brief How to do network programming in Qt.
+
+    \image network-examples.png
+
+    Qt is provided with an extensive set of network classes to support both
+    client-based and server side network programming.
+
+    These examples demonstrate the fundamental aspects of network programming
+    with Qt.
+
+*/
+
+/*
+     \list
+    \li  \l{network/blockingfortuneclient}{Blocking Fortune Client}\raisedaster
+    \li  \l{network/broadcastreceiver}{Broadcast Receiver}
+    \li  \l{network/broadcastsender}{Broadcast Sender}
+    \li  \l{network/download}{Download}
+    \li  \l{network/downloadmanager}{Download Manager}
+    \li  \l{network/network-chat}{Network Chat}
+    \li  \l{network/fortuneclient}{Fortune Client}\raisedaster
+    \li  \l{network/fortuneserver}{Fortune Server}\raisedaster
+    \li  \l{network/qftp}{FTP}\raisedaster
+    \li  \l{network/http}{HTTP}
+    \li  \l{network/loopback}{Loopback}
+    \li  \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster
+    \li  \l{network/torrent}{Torrent}
+    \li  \l{network/googlesuggest}{Google Suggest}
+    \li  \l{network/bearercloud}{Bearer Cloud}\raisedaster
+    \li  \l{network/bearermonitor}{Bearer Monitor}
+    \li  \l{network/securesocketclient}{Secure Socket Client}
+    \li  \l{network/multicastreceiver}{Multicast Receiver}
+    \li  \l{network/multicastsender}{Multicast Sender}
+    \endlist
+
+    Examples marked with an asterisk (*) are fully documented.
+*/
diff --git a/src/network/doc/src/ssl.qdoc b/src/network/doc/src/ssl.qdoc
index 0a07e72f93..751c7cd668 100644
--- a/src/network/doc/src/ssl.qdoc
+++ b/src/network/doc/src/ssl.qdoc
@@ -33,8 +33,8 @@
     \keyword SSL
 
     The classes below provide support for secure network communication using
-    the Secure Sockets Layer (SSL) protocol, using the \l{OpenSSL Toolkit} to
-    perform encryption and protocol handling.
+    the Secure Sockets Layer (SSL) protocol, using the OpenSSL Toolkit (\l{http://www.openssl.org/})
+    to perform encryption and protocol handling.
 
     See the \l{General Qt Requirements} page for information about the
     versions of OpenSSL that are known to work with Qt.