Merge tag 'upstream/3.4.0'

Upstream version 3.4.0

1 files changed, 0 insertions, 49 deletions

diff --git a/help/POT/scanning.page b/help/POT/scanning.page
deleted file mode 100644
index ba34430..0000000
--- a/help/POT/scanning.page
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<page xmlns="http://projectmallard.org/1.0/" type="guide" id="scanning" xml:lang="POT">
-
-    <info>
-        <title type="sort">0</title>
-        <link type="guide" xref="index#acquire"/>
-    </info>
-  
-	<title>Scanning a Page</title>
-
-    <p>
-    To scan a document from your scanner:
-    </p>
-    <steps>
-    <item>
-      <p>
-        Connect the scanner to your computer.
-      </p>
-    </item>
-    <item>
-      <p>
-        Open <app>Simple Scan</app>.
-      </p>
-    </item>
-    <item>
-      <p>
-        Press the scan button in the toolbar (or <keyseq><key>Ctrl</key><key>1</key></keyseq>).
-      </p>
-    </item>
-    </steps>
-
-    <p>
-    The page will be shown as it is scanned.
-    </p>
-
-    <p>
-    Each page you scan is added to the end of your document.  To start a new document select <guiseq><gui>Document</gui><gui>New</gui></guiseq>.
-    Individual pages can be deleted by right clicking a page or pressing the <key>Delete</key> key.
-    </p>
-
-    <p>
-    The type of scan can be changed from the <guiseq><gui>Document</gui><gui>Scan</gui></guiseq> menu.
-    Choose <gui>Text</gui> if you want the document to be quickly scanned in black and white or <gui>Photo</gui> for a high resolution color scan.
-    </p>
-
-    <p>
-    To stop the scan at any time press <key>Escape</key>.
-    </p>
-</page>