Doc: Fixed random QDoc warnings

- Fixed \snippet paths
- Minor language edits
- Removed unnecessary multiple page commands in a single comment
block. For example, \fn and \qmlsignal in a single comment block
is not allowed. Such instances must be documented in separate
comment blocks.

Change-Id: I65f4518499e2600c4e1807356d4116c575e48c19
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/src/multimedia/camera/qcamera.cpp b/src/multimedia/camera/qcamera.cpp
index 919732a73..73b9b2d46 100644
--- a/src/multimedia/camera/qcamera.cpp
+++ b/src/multimedia/camera/qcamera.cpp
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
 
     See the \l{Camera Overview}{camera overview} for more information.
 
-    \snippet doc/src/snippets/multimedia-snippets/media.cpp Request control
+    \snippet multimedia-snippets/media.cpp Request control
 
 */
 
diff --git a/src/multimedia/camera/qcamerafocus.cpp b/src/multimedia/camera/qcamerafocus.cpp
index 83576aba5..cae285167 100644
--- a/src/multimedia/camera/qcamerafocus.cpp
+++ b/src/multimedia/camera/qcamerafocus.cpp
@@ -162,7 +162,7 @@ public:
     rectangles around areas of the camera frame that are in focus, or changing the
     color of a zone as it comes into focus.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones
+    \snippet multimedia-snippets/camera.cpp Camera focus zones
 
     \sa QCameraFocus
 */
@@ -291,7 +291,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     interesting area of the viewfinder for the hardware to attempt
     to focus on.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera custom zoom
+    \snippet multimedia-snippets/camera.cpp Camera custom zoom
 
     Zooming can be accomplished in a number of ways - usually the more
     expensive but higher quality approach is an optical zoom, which allows
@@ -303,7 +303,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     checked.  The \l zoomTo() method allows changing both optical and
     digital zoom at once.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera combined zoom
+    \snippet multimedia-snippets/camera.cpp Camera combined zoom
 
     \section2 Some notes on autofocus
     Some hardware supports a movable focus lens assembly, and typically
@@ -319,7 +319,7 @@ void QCameraFocusZone::setStatus(QCameraFocusZone::FocusZoneStatus status)
     are in focus or are being used for autofocusing via the \l focusZones()
     property:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera focus zones
+    \snippet multimedia-snippets/camera.cpp Camera focus zones
 
     \sa QCameraFocusZone
 */
diff --git a/src/multimedia/camera/qcameraimagecapture.cpp b/src/multimedia/camera/qcameraimagecapture.cpp
index f7d133961..0471ef3b0 100644
--- a/src/multimedia/camera/qcameraimagecapture.cpp
+++ b/src/multimedia/camera/qcameraimagecapture.cpp
@@ -69,9 +69,9 @@ QT_BEGIN_NAMESPACE
     It's not intended to be used alone but for accessing the media
     recording functions of other media objects, like QCamera.
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera
+    \snippet multimedia-snippets/camera.cpp Camera
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera keys
+    \snippet multimedia-snippets/camera.cpp Camera keys
 
     \sa QCamera
 */
diff --git a/src/multimedia/camera/qcameraimageprocessing.cpp b/src/multimedia/camera/qcameraimageprocessing.cpp
index cc42fad23..7df222458 100644
--- a/src/multimedia/camera/qcameraimageprocessing.cpp
+++ b/src/multimedia/camera/qcameraimageprocessing.cpp
@@ -87,11 +87,11 @@ QT_BEGIN_NAMESPACE
     For example, you can set the white balance (or color temperature) used
     for processing images:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera image whitebalance
+    \snippet multimedia-snippets/camera.cpp Camera image whitebalance
 
     Or adjust the amount of denoising performed:
 
-    \snippet doc/src/snippets/multimedia-snippets/camera.cpp Camera image denoising
+    \snippet multimedia-snippets/camera.cpp Camera image denoising
 
     In some cases changing these settings may result in a longer delay
     before an image is ready.