5 files changed, 15 insertions, 28 deletions
diff --git a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
index 12691da7a2..b381ae7b6e 100644
--- a/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
+++ b/src/network/doc/snippets/code/src_network_ssl_qsslcertificate.cpp
@@ -55,3 +55,11 @@ for (const QSslCertificate &cert : certs) {
     qDebug() << cert.issuerInfo(QSslCertificate::Organization);
 }
 //! [0]
+
+//! [1]
+const auto certs = QSslCertificate::fromPath("C:/ssl/certificate.*.pem",
+                                             QSsl::Pem, QSslCertificate::Wildcard);
+for (const QSslCertificate &cert : certs) {
+    qDebug() << cert.issuerInfo(QSslCertificate::Organization);
+}
+//! [1]
diff --git a/src/network/doc/snippets/network/tcpwait.cpp b/src/network/doc/snippets/network/tcpwait.cpp
index 97856e157f..d57305930c 100644
--- a/src/network/doc/snippets/network/tcpwait.cpp
+++ b/src/network/doc/snippets/network/tcpwait.cpp
@@ -51,8 +51,6 @@
 #include <QtGui>
 #include <QTcpSocket>
 
-#include "server.h"
-
 int main(int argv, char **args)
 {
     QCoreApplication app(argv, args);
diff --git a/src/network/doc/snippets/snippets.pro b/src/network/doc/snippets/snippets.pro
new file mode 100644
index 0000000000..39153e0c8e
--- /dev/null
+++ b/src/network/doc/snippets/snippets.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+
+TARGET = network_cppsnippets
+
+QT += network
+
+SOURCES += network/tcpwait.cpp
diff --git a/src/network/doc/src/network-programming.qdoc b/src/network/doc/src/network-programming.qdoc
index ce99af034b..654227f971 100644
--- a/src/network/doc/src/network-programming.qdoc
+++ b/src/network/doc/src/network-programming.qdoc
@@ -261,29 +261,4 @@
     by passing a factory to QNetworkProxyFactory::setApplicationProxyFactory()
     and a custom proxying policy can be created by subclassing
     QNetworkProxyFactory; see the class documentation for details.
-
-    \section1 Bearer Management Support
-
-    Bearer Management controls the connectivity state of the device such that
-    the application can start or stop network interfaces and roam
-    transparently between access points.
-
-    The QNetworkConfigurationManager class manages the list of network
-    configurations known to the device. A network configuration describes the
-    set of parameters used to start a network interface and is represented by
-    the QNetworkConfiguration class.
-
-    A network interface is started by openning a QNetworkSession based on a
-    given network configuration. In most situations creating a network session
-    based on the platform specified default network configuration is
-    appropriate. The default network configuration is returned by the
-    QNetworkConfigurationManager::defaultConfiguration() function.
-
-    On some platforms it is a platform requirement that the application open a
-    network session before any network operations can be performed. This can be
-    tested by the presents of the
-    QNetworkConfigurationManager::NetworkSessionRequired flag in the value
-    returned by the QNetworkConfigurationManager::capabilities() function.
-
-    \sa {Bearer Management}
 */
diff --git a/src/network/doc/src/qtnetwork.qdoc b/src/network/doc/src/qtnetwork.qdoc
index c931a1c19f..85a3c198a0 100644
--- a/src/network/doc/src/qtnetwork.qdoc
+++ b/src/network/doc/src/qtnetwork.qdoc
@@ -54,7 +54,6 @@
     applications with networking capabilities.
     \list
     \li \l{Network Programming with Qt} - Programming applications with networking capabilities
-    \li \l{Bearer Management} - An API to control the system's connectivity state
     \li \l{Secure Sockets Layer (SSL) Classes} - Classes for secure communication over network sockets
     \endlist