Merge branch 'feature/upstream' into develop

9 files changed, 28 insertions, 15 deletions

diff --git a/help/C/adf.page b/help/C/adf.page
index 7c6f81b..83d8274 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -32,7 +32,7 @@
       <steps>
 	<title>Use the Toolbar</title>
 	<item>
-          <p>Click the arrow to the right of the <gui style="button">Scan</gui> button.</p>
+          <p>Click the cog to the right of the <gui style="button">Scan</gui> button.</p>
 	</item>
 	<item>
 	  <p>Select <gui style="button">All Pages From Feeder</gui>.</p>
@@ -50,10 +50,7 @@
         <gui style="menuitem">Preferences</gui>.</p>
       </item>
       <item>
-        <p>Select <gui style="tab">Scanning</gui>.</p>
-      </item>
-      <item>
-        <p>Change the <gui>Scan Sides</gui> value.</p>
+        <p>In <gui style="group">Scanning</gui> section change the <gui>Scan Sides</gui> value.</p>
       </item>
       <item>
         <p>Close the dialog.</p>
diff --git a/help/C/brightness-contrast.page b/help/C/brightness-contrast.page
index 79007ac..baf5c69 100644
--- a/help/C/brightness-contrast.page
+++ b/help/C/brightness-contrast.page
@@ -29,13 +29,11 @@
       <gui style="menuitem">Preferences</gui>.</p>
     </item>
     <item>
-      <p>Select <gui style="tab">Quality</gui>.</p>
-    </item>
-    <item>
-      <p>Drag the <gui>Brightness</gui> and/or <gui>Contrast</gui> sliders.</p>
+      <p>In <gui style="group">Quality</gui> section drag the <gui>Brightness</gui> and/or <gui>Contrast</gui> sliders.</p>
     </item>
     <item>
       <p>Close the dialog.</p>
+      <media type="image" src="figures/preferences.png" />
     </item>
   </steps>
     
diff --git a/help/C/dpi.page b/help/C/dpi.page
index 92ecea7..0bdeef0 100644
--- a/help/C/dpi.page
+++ b/help/C/dpi.page
@@ -29,10 +29,7 @@
         <gui style="menuitem">Preferences</gui>.</p>
       </item>
       <item>
-        <p>Select <gui style="tab">Quality</gui>.</p>
-      </item>
-      <item>
-        <p>Change the <gui>Text Resolution</gui> or <gui>Image Resolution</gui> value.</p>
+        <p>In <gui style="group">Quality</gui> section change the <gui>Text Resolution</gui> or <gui>Image Resolution</gui> value.</p>
       </item>
       <item>
         <p>Close the dialog.</p>
@@ -56,6 +53,10 @@
 		<td><p>150 dpi</p></td>
 	</tr>
 	<tr>
+		<td><p>200 dpi</p></td>
+		<td><p>200 dpi</p></td>
+	</tr>
+	<tr>
 		<td><p>300 dpi</p></td>
 		<td><p>300 dpi (default)</p></td>
 	</tr>
diff --git a/help/C/figures/preferences.png b/help/C/figures/preferences.png
index 1906738..55cf233 100644
--- a/help/C/figures/preferences.png
+++ b/help/C/figures/preferences.png
diff --git a/help/C/figures/scan_toolbar.png b/help/C/figures/scan_toolbar.png
index a708e3e..05bd815 100644
--- a/help/C/figures/scan_toolbar.png
+++ b/help/C/figures/scan_toolbar.png
diff --git a/help/C/figures/scanner_selection.png b/help/C/figures/scanner_selection.png
new file mode 100644
index 0000000..778a0aa
--- /dev/null
+++ b/help/C/figures/scanner_selection.png
diff --git a/help/C/quality.page b/help/C/quality.page
index 8132e1e..617ab19 100644
--- a/help/C/quality.page
+++ b/help/C/quality.page
@@ -18,9 +18,24 @@
 	<title>Setting the Image Quality</title>
 
     <p>
-    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the save dialog.
+    You can adjust the image quality that is used when the scan is converted to a file by changing this setting in the preferences dialog.
     Using a low quality will result in a small file size but may show some blurring or blockiness in the image.
     A high quality will keep all the scanned information but require a larger file size.
     See the <link href="https://en.wikipedia.org/wiki/Lossy_compression">Lossy compression Wikipedia page</link> for more information.
     </p>    
+
+    <steps>
+        <item>
+          <p>Press the menu button in the top-right corner of the window and select
+          <gui style="menuitem">Preferences</gui>.</p>
+        </item>
+        <item>
+          <p>In <gui style="group">Quality</gui> section drag the <gui>Compression</gui> slider.</p>
+        </item>
+        <item>
+          <p>Close the dialog.</p>
+          <media type="image" src="figures/preferences.png" />
+        </item>
+    </steps>
+
 </page>
diff --git a/help/C/scanner.page b/help/C/scanner.page
index 3d57731..79144f2 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -28,4 +28,6 @@
     scanner you will need to restart <app>Document Scanner</app> for the scanner
     to be detected.
     </p>
+    
+    <media type="image" src="figures/scanner_selection.png" />
 </page>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index 4502c0d..884a521 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -26,7 +26,7 @@
     <steps>
       <item><p>Connect the scanner to your computer and power it on.</p></item>
       <item><p>Open <app>Document Scanner</app>.</p></item>
-      <item><p>Click the arrow to the right of the <gui style="button">Scan</gui> button.</p></item>
+      <item><p>Click the cog to the right of the <gui style="button">Scan</gui> button.</p></item>
       <item><p>Select the type of document you are scanning: <gui style="button">Text</gui> or <gui style="button">Image</gui>.</p>
 	     <media type="image" src="figures/scan_toolbar.png"/></item>
       <item><p>Click the "Scan" button on the toolbar (or press <keyseq><key>Ctrl</key><key>1</key></keyseq>).</p></item>