7 files changed, 9 insertions, 17 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp
index 5d1d5dfe23..008aea27cf 100644
--- a/src/corelib/io/qfileselector.cpp
+++ b/src/corelib/io/qfileselector.cpp
@@ -229,7 +229,7 @@ static QString qrcScheme()
 }
 
 /*!
-   This is a convenience version of select operating on QUrls. If the scheme is not file or qrc,
+   This is a convenience version of select operating on QUrl objects. If the scheme is not file or qrc,
    \a filePath is returned immediately. Otherwise selection is applied to the path of \a filePath
    and a QUrl is returned with the selected path and other QUrl parts the same as \a filePath.
 
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index 72ec6ff403..f1c42c9bb5 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -708,7 +708,7 @@ bool QIODevice::reset()
     number of bytes to allocate in a buffer before reading.
 
     Subclasses that reimplement this function must call the base
-    implementation in order to include the size of QIODevices' buffer. Example:
+    implementation in order to include the size of the buffer of QIODevice. Example:
 
     \snippet code/src_corelib_io_qiodevice.cpp 1
 
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 939cecfb44..94912ad616 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1446,7 +1446,7 @@ void QProcess::setStandardErrorFile(const QString &fileName, OpenMode mode)
     The following shell command:
     \snippet code/src_corelib_io_qprocess.cpp 2
 
-    Can be accomplished with QProcesses with the following code:
+    Can be accomplished with QProcess with the following code:
     \snippet code/src_corelib_io_qprocess.cpp 3
 */
 void QProcess::setStandardOutputProcess(QProcess *destination)
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index ed6bfb4e0d..64c20dead2 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -197,7 +197,7 @@ Q_GLOBAL_STATIC(QStringList, resourceSearchPaths)
     path requested in setFileName().
 
     The unregisterResource() function removes a reference to a particular
-    file. If there are QResources that currently reference resources related
+    file. If there are QResource objects that currently reference resources related
     to the unregistered file, they will continue to be valid but the resource
     file itself will be removed from the resource roots, and thus no further
     QResource can be created pointing into this resource data. The resource
diff --git a/src/corelib/io/qstandardpaths.cpp b/src/corelib/io/qstandardpaths.cpp
index b41aee55d2..9d047123a1 100644
--- a/src/corelib/io/qstandardpaths.cpp
+++ b/src/corelib/io/qstandardpaths.cpp
@@ -77,15 +77,10 @@ QT_BEGIN_NAMESPACE
     this user, but should still be assumed to be unreachable by applications by
     other users.
 
-    The only exception is QStandardPaths::TempLocation (which is the same as
-    QDir::tempPath()): the path returned may be application-specific, but files
-    stored there may be accessed by other applications run by the same user.
-
     Data interchange with other users is out of the scope of QStandardPaths.
 
     \value DesktopLocation Returns the user's desktop directory. This is a generic value.
-           On systems with no concept of a desktop, this is the same as
-           QStandardPaths::HomeLocation.
+           On systems with no concept of a desktop.
     \value DocumentsLocation Returns the directory containing user document files.
            This is a generic value. The returned path is never empty.
     \value FontsLocation Returns the directory containing user's fonts. This is a generic value.
@@ -118,9 +113,6 @@ QT_BEGIN_NAMESPACE
     \value GenericCacheLocation Returns a directory location where user-specific non-essential
            (cached) data, shared across applications, should be written. This is a generic value.
            Note that the returned path may be empty if the system has no concept of shared cache.
-    \value GenericDataLocation Returns a directory location where persistent
-           data shared across applications can be stored. This is a generic value. The returned
-           path is never empty.
     \value RuntimeLocation Returns a directory location where runtime communication
            files should be written, like Unix local sockets. This is a generic value.
            The returned path may be empty on some systems.
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index f459928110..750437c2b0 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -82,7 +82,7 @@
     For the convenience of generating encoded URL strings or query
     strings, there are two static functions called
     fromPercentEncoding() and toPercentEncoding() which deal with
-    percent encoding and decoding of QStrings.
+    percent encoding and decoding of QString objects.
 
     Calling isRelative() will tell whether or not the URL is
     relative. A relative URL can be resolved by passing it as argument
@@ -172,7 +172,7 @@
                        setters setting components of a URL; it is not permitted in
                        the QUrl constructor, in fromEncoded() or in setUrl().
                        For more information on this mode, see the documentation for
-                       QUrl::FullyDecoded.
+                       \l {QUrl::ComponentFormattingOption}{QUrl::FullyDecoded}.
 
     In TolerantMode, the parser has the following behaviour:
 
@@ -4055,7 +4055,7 @@ QString QUrl::errorString() const
 /*!
     \since 5.1
 
-    Converts a list of \a urls into a list of QStrings, using toString(\a options).
+    Converts a list of \a urls into a list of QString objects, using toString(\a options).
 */
 QStringList QUrl::toStringList(const QList<QUrl> &urls, FormattingOptions options)
 {
diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp
index 451f2c0ca7..abe05e4c4d 100644
--- a/src/corelib/io/qurlquery.cpp
+++ b/src/corelib/io/qurlquery.cpp
@@ -414,7 +414,7 @@ bool QUrlQuery::operator ==(const QUrlQuery &other) const
 }
 
 /*!
-    Returns \c true if this QUrlQUery object contains no key-value pairs, such as
+    Returns \c true if this QUrlQuery object contains no key-value pairs, such as
     after being default-constructed or after parsing an empty query string.
 
     \sa setQuery(), clear()