Merge branch 'feature/upstream' into develop

5 files changed, 55 insertions, 6 deletions

diff --git a/help/C/adf.page b/help/C/adf.page
index 91886ce..6074808 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -13,7 +13,6 @@
     you can scan all the pages from the feeder via one of following methods:
     </p>
       <steps>
-	<title></title>
 	<title>Use a Keyboard Shortcut</title>
 	<item>
 	  <p>Press <keyseq><key>Ctrl</key><key>F</key></keyseq></p>
diff --git a/help/C/delete.page b/help/C/delete.page
new file mode 100644
index 0000000..ce0dc83
--- /dev/null
+++ b/help/C/delete.page
@@ -0,0 +1,32 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="delete">
+
+    <info>
+        <link type="guide" xref="index#modify"/>
+    </info>
+
+    <title>Deleting a Page</title>
+
+    <steps>
+      <title>Use a Right Click</title>
+      <item><p>Right click on the page you want to delete.</p></item>
+      <item><p>Choose "Delete" from the context menu.</p></item>
+    </steps>
+
+    <steps>
+      <title>Use a Shortcut Key</title>
+      <item><p>Select the page you want to delete (by clicking on it once).</p></item>
+      <item><p>Press the <key>Delete</key> key on the keyboard.</p>
+      </item>
+    </steps>
+
+    <steps>
+      <title>Use a Menu</title>
+      <item><p>Select the page you want to delete (by clicking on it once).</p></item>
+      <item><p>Go to the "Page" menu and click "Delete".</p></item>
+    </steps>
+
+    <note style="warning"><p>WARNING: The deletion of a page cannot be undone!</p></note>
+
+</page>
diff --git a/help/C/external.page b/help/C/external.page
new file mode 100644
index 0000000..34e214e
--- /dev/null
+++ b/help/C/external.page
@@ -0,0 +1,22 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="guide"
+      id="external">
+
+    <info>
+        <link type="guide" xref="index#use"/>
+    </info>
+  
+    <title>Externally View a Page</title>
+
+    <p>
+    Double click a scanned page to view it with your default image viewer. This action
+    creates a TIFF file containing the raw data from the scanner in your /tmp directory
+    named "<em>scanned-pageXXXXXX.tiff</em>".
+    </p>
+    <p>
+    If you double click the scanned page after crop is enabled, only the cropped part will open.
+    You can, therefore, use this feature to check more accurately whether you have
+    positioned the crop frame exactly where you wanted it.    
+    </p>
+    
+</page>
diff --git a/help/C/index.page b/help/C/index.page
index c9d8425..9ddb34f 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -27,8 +27,4 @@
     <section id="use" style="2column">
         <title>Using the Document</title>
     </section>
-
-    <section id="shortcuts" style="2column">
-	<title>Simple Scan Shortcuts</title>
-    </section>
 </page>
diff --git a/help/C/quality.page b/help/C/quality.page
index 1075783..53e8d45 100644
--- a/help/C/quality.page
+++ b/help/C/quality.page
@@ -9,7 +9,7 @@
 	<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 <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    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.
     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.