Merge branch 'release/debian/3.36.1-1'debian/3.36.1-1

16 files changed, 293 insertions, 113 deletions

diff --git a/help/C/adf.page b/help/C/adf.page
index 6074808..7c6f81b 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="adf">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#acquire"/>
     </info>
 
@@ -20,32 +30,35 @@
       </steps>
       
       <steps>
-	<title>Use a Menu</title>
+	<title>Use the Toolbar</title>
 	<item>
-	  <p>Navigate to <guiseq><gui>Document</gui>
-	  <gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq>.
-	  </p>
-	</item>
-      </steps>
-      
-      <steps>
-	<title>Use the Toolbar Buttons</title>
-	<item>
-	  <p>Click on the arrow to the right of the "Scan" button.</p>
+          <p>Click the arrow to the right of the <gui style="button">Scan</gui> button.</p>
 	</item>
 	<item>
-	  <p>Choose "All Pages From Feeder".</p>
+	  <p>Select <gui style="button">All Pages From Feeder</gui>.</p>
 	  <media type="image" src="figures/scan_toolbar.png"/>
 	</item>
       </steps>
-    
-    
-    <note style="tip">
+
     <p>
-    By default, both sides of a sheet will scan if your scanner has this capability.
-    You can choose single side scanning from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    By default, both sides of a page will be scanned if your scanner has this
+    capability. To scan only a single side:
     </p>
-    <media type="image" src="figures/preferences.png"/>
-    </note>
+    <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>Select <gui style="tab">Scanning</gui>.</p>
+      </item>
+      <item>
+        <p>Change the <gui>Scan Sides</gui> value.</p>
+      </item>
+      <item>
+        <p>Close the dialog.</p>
+        <media type="image" src="figures/preferences.png"/>
+      </item>
+    </steps>
     
 </page>
diff --git a/help/C/brightness-contrast.page b/help/C/brightness-contrast.page
index 7f0c743..79007ac 100644
--- a/help/C/brightness-contrast.page
+++ b/help/C/brightness-contrast.page
@@ -1,15 +1,42 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="brightness-contrast">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#acquire"/>
     </info>
 
-	<title>Setting brightness and Contrast</title>
+	<title>Setting Brightness and Contrast</title>
 
     <p>
     Some scanners allow the user to adjust the brightness and contrast when scanning.
-    If your scans come out too dark or too light you can adjust these settings from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    If your scans come out too dark or too light you can adjust these settings:
     </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>Select <gui style="tab">Quality</gui>.</p>
+    </item>
+    <item>
+      <p>Drag the <gui>Brightness</gui> and/or <gui>Contrast</gui> sliders.</p>
+    </item>
+    <item>
+      <p>Close the dialog.</p>
+    </item>
+  </steps>
+    
 </page>
diff --git a/help/C/crop.page b/help/C/crop.page
index 69ca197..a4d6f45 100644
--- a/help/C/crop.page
+++ b/help/C/crop.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="crop">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#modify"/>
     </info>
   
@@ -16,27 +26,22 @@
     </p>
     
     <steps>
-      <title>Use a Right Click</title>
-      <item><p>Right click anywhere on the image area and select "Crop".</p></item>
+      <title>Use Right Click</title>
+      <item><p>Right click anywhere on the page.</p></item>
+      <item><p>Select <gui style="menuitem">Crop</gui>.</p></item>
       <item><p>Choose one of the fixed crop frames, or select "Custom" to manually
 	set the crop frame's dimensions by dragging its borders.</p></item>
-      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
+      <item><p>Click and hold the frame to move it to the desired position.</p></item>
+      <item><p>Drag the borders of the frame to set the desired dimensions.</p></item>
     </steps>
-    
-    <steps>
-      <title>Use a Menu</title>
-      <item><p>Navigate to the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu.</p></item>
-      <item><p>Choose one of the fixed crop frames, or select "Custom" to manually adjust the frame's dimensions by dragging its borders.</p></item>
-      <item><p>Click and hold the frame, then move it to the desired position.</p></item>
-    </steps>
-    
+
     <steps>
       <title>Use the Toolbar</title>
-      <item><p>Click the "<gui>Crop</gui>" button in the toolbar.</p>
+      <item><p>Press the <gui style="button">Crop the selected page</gui> button in the toolbar.</p>
 	    <note style="tip"><p>This is the same as choosing "Custom" in step 2 of the
 	      aforementioned methods.</p></note></item>      
-      <item><p>Drag the borders of the frame to set the desired dimensions and position.</p></item>
-
+      <item><p>Click and hold the frame to move it to the desired position.</p></item>
+      <item><p>Drag the borders of the frame to set the desired dimensions.</p></item>
     </steps>
     
     <note><p>
diff --git a/help/C/delete.page b/help/C/delete.page
index ce0dc83..237e060 100644
--- a/help/C/delete.page
+++ b/help/C/delete.page
@@ -1,30 +1,39 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="delete">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#modify"/>
     </info>
 
     <title>Deleting a Page</title>
 
     <steps>
-      <title>Use a Right Click</title>
+      <title>Use 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>
+      <item><p>Select <gui style="menuitem">Delete</gui>.</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>
+      <item><p>Press the <key>Delete</key> key on the keyboard.</p></item>
     </steps>
 
     <steps>
-      <title>Use a Menu</title>
+      <title>Use the Toolbar</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>
+      <item><p>Press the <gui style="button">Delete the selected page</gui> button in the toolbar.</p></item>
     </steps>
 
     <note style="warning"><p>WARNING: The deletion of a page cannot be undone!</p></note>
diff --git a/help/C/dpi.page b/help/C/dpi.page
index ea8deeb..92ecea7 100644
--- a/help/C/dpi.page
+++ b/help/C/dpi.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="dpi">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#acquire"/>
     </info>
   
@@ -10,18 +20,32 @@
 
     <p>
     The default resolution for document type <gui><em>Text</em></gui> is 150 dpi (dots per inch)
-    and for document type <gui><em>Photo</em></gui> is 300 dpi. You can change these settings
-    from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    and for document type <gui><em>Image</em></gui> is 300 dpi. To change these settings:
     </p>
-    <media type="image" src="figures/preferences.png"/>
+
+    <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>Select <gui style="tab">Quality</gui>.</p>
+      </item>
+      <item>
+        <p>Change the <gui>Text Resolution</gui> or <gui>Image Resolution</gui> value.</p>
+      </item>
+      <item>
+        <p>Close the dialog.</p>
+      </item>
+    </steps>
     
-    <p>The available scanning resolutions for both document types (Text and Photo) are the same
+    <p>The available scanning resolutions for both document types (Text and Image) are the same
     and are listed in the following table:</p>
     
     <table frame="bottom left right" rules="rows cols" shade="rows">
 	<tr>
 		<td><p><em>Text Resolution</em></p></td>
-		<td><p><em>Photo Resolution</em></p></td>
+		<td><p><em>Image Resolution</em></p></td>
 	</tr>
 	<tr>
 		<td><p>75 dpi (draft)</p></td>
@@ -50,7 +74,7 @@
     </table>
     
     <note style="important"><p><gui><em>Text</em></gui> documents are always scanned in black
-      and white, while <gui><em>Photo</em></gui> documents are always scanned in color, at any
+      and white, while <gui><em>Image</em></gui> documents are always scanned in color, at any
       resolution!</p>
     </note>
 
diff --git a/help/C/email.page b/help/C/email.page
index e918e84..ba3b03f 100644
--- a/help/C/email.page
+++ b/help/C/email.page
@@ -1,21 +1,32 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="email">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#use"/>
     </info>
   
 	<title>Sending via Email</title>
 
     <p>
-    To email the current document use the <guiseq><gui>Document</gui><gui>Email</gui></guiseq>
-    menu (<keyseq><key>Ctrl</key><key>E</key></keyseq>). Your email program will be opened with
+    To email the current document, press the menu button in the top-right corner
+    of the window and select <gui style="menuitem">Email</gui>. Alternatively,
+    press <keyseq><key>Ctrl</key><key>E</key></keyseq>. Your email program will be opened with
     a new message containing the scanned document as an attachment.
     </p>
     <p>
     If the document type was set to "Text" the email will have a PDF attachment for each page. 
-    Conversely, if the document type was set to "Photo", the email will have a JPEG
+    Conversely, if the document type was set to "Image", the email will have a JPEG
     attachment for each page.    
     </p>
     <p>
diff --git a/help/C/external.page b/help/C/external.page
index 34e214e..a324aff 100644
--- a/help/C/external.page
+++ b/help/C/external.page
@@ -1,8 +1,17 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="external">
 
     <info>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#use"/>
     </info>
   
diff --git a/help/C/figures/scan_toolbar.png b/help/C/figures/scan_toolbar.png
index d4d4ab8..a708e3e 100644
--- a/help/C/figures/scan_toolbar.png
+++ b/help/C/figures/scan_toolbar.png
diff --git a/help/C/index.page b/help/C/index.page
index 2c734e5..ab3ca88 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -1,20 +1,20 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="index">
 
-	<info>
-		<credit type="author">
-			<name>Robert Ancell</name>
-			<email>robert.ancell@gmail.com</email>
-		</credit>
-		<credit type="author">
-			<name>Ali Shtarbanov</name>
-			<email>ametedinov@gmail.com</email>
-		</credit>
-		<include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
-	</info>
+    <info>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+    </info>
 
-       <title><media type="image" src="figures/icon.svg" height="32px"/>Document Scanner Manual</title>
+    <title><media type="image" its:translate="no" src="figures/icon.svg" height="32px"/>Document Scanner Manual</title>
 
     <section id="acquire" style="2column">
         <title>Scanning Pages</title>
diff --git a/help/C/print.page b/help/C/print.page
index 9726bee..ab08808 100644
--- a/help/C/print.page
+++ b/help/C/print.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="print">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#use"/>
     </info>
   
@@ -15,15 +25,17 @@
     <steps>
       <title>To Print a Document</title>
       <item>
-	<p>Go to the <guiseq><gui>Document</gui><gui>Print</gui>
-	</guiseq> menu or use the keyboard shortcut <keyseq><key>Ctrl</key><key>P</key></keyseq>.
-	This will open the "Print" dialog box.
+	<p>Press the menu button in the top-right corner of the window and select
+        <gui style="menuitem">Print</gui>. Alternatively, press
+        <keyseq><key>Ctrl</key><key>P</key></keyseq>.
 	</p>
       </item>
       <item>
-	<p>From the "Print" dialog box choose your desired printing settings and/or Print Preview
-	the document, then press the "Print" button.
+	<p>Choose your desired printing settings and/or preview the document,
+	then press <gui style="button">Print</gui>.
 	</p>
+        <note><p>See <link xref="help:gnome-help/printing" href="https://help.gnome.org/users/gnome-help/stable/printing">the
+        desktop help</link> for general information on printing.</p></note>
       </item>
      </steps>
 </page>
diff --git a/help/C/quality.page b/help/C/quality.page
index 53e8d45..8132e1e 100644
--- a/help/C/quality.page
+++ b/help/C/quality.page
@@ -1,8 +1,17 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="quality">
 
     <info>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#use"/>
     </info>
 
diff --git a/help/C/reorder.page b/help/C/reorder.page
index f816acb..1c43cef 100644
--- a/help/C/reorder.page
+++ b/help/C/reorder.page
@@ -1,21 +1,31 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="reorder">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#modify"/>
     </info>
   
 	<title>Reordering Pages</title>
 
     <p>
-    To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
-    <gui><em>Move Right</em></gui>.
+    To move a page, right click on it and choose <gui style="menuitem">Move
+    Left</gui> or <gui style="menuitem">Move Right</gui>.
     </p> 
     
     <p>
-    Alternatively, you can move a page by first selecting it and then choosing 
-    <gui><em>Move Left</em></gui> or <gui><em>Move Right</em></gui> from the "Page" menu.
+    Alternatively, press the menu button in the top-right corner of the window
+    and select <gui style="menuitem">Reorder Pages</gui>.
     </p> 
 
 </page>
diff --git a/help/C/rotate.page b/help/C/rotate.page
index 3dc7508..fce9311 100644
--- a/help/C/rotate.page
+++ b/help/C/rotate.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="rotate">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#modify"/>
     </info>
   
@@ -14,20 +24,15 @@
     </p>
     
     <steps>
-      <title>Use Toolbar Buttons</title>
+      <title>Use the Toolbar</title>
       <item><p>Select the page you want to rotate by clicking on it once.</p></item>
       <item><p>Press one of the arrows on the toolbar to rotate the page in the desired direction.</p></item>
     </steps>
     <steps>
       <title>Use Right Click</title>
       <item><p>Right click on the page you want to rotate.</p></item>
-      <item><p>From the context menu choose "Rotate Left" or "Rotate Right".</p></item>
-    </steps>
-    
-    <steps>
-      <title>Use a Menu</title>
-      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
-      <item><p>Click the "Page" menu and select "Rotate Left" or "Rotate Right".</p></item>
+      <item><p>Select <gui style="menuitem">Rotate Left</gui> or
+      <gui style="menuitem">Rotate Right</gui>.</p></item>
     </steps>
     
     <steps>
diff --git a/help/C/save.page b/help/C/save.page
index 8b0b9d0..e0fea13 100644
--- a/help/C/save.page
+++ b/help/C/save.page
@@ -1,8 +1,18 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="save">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-04"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#use"/>
     </info>
   
@@ -10,17 +20,17 @@
 
     <steps>
       <item>
-	<p>Navigate to the <guiseq><gui>Document</gui><gui>Save As</gui></guiseq> menu 
-	(or press <keyseq><key>Shift</key><key>Ctrl</key><key>S</key></keyseq>).
+	<p>Press the <gui style="button">Save document to a file</gui> button in the
+	top bar of the window (or press <keyseq><key>Ctrl</key><key>S</key></keyseq>).
 	</p>
       </item>
       <item>
-	<p>From the "Save As" dialog box, choose one of the supported file
-	types, or simply change the extension in the "Name" field. 
+	<p>Choose one of the supported file types, or change the file extension
+        in the <gui>Name</gui> field. 
 	</p>
       </item>
       <item>
-	<p>Press the "Save" button.</p>
+	<p>Press the <gui style="button">Save</gui> button.</p>
       </item>
     </steps>
     
@@ -36,7 +46,7 @@
 		<td><p>A PDF can contain multiple pages, like a book, and is easy to distribute. Only a small number
 		of linux programs can modify PDF documents, so this format is recommended primarily for archiving.
         The size of the PDF document is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wikipedia page</link> for more information.
+		See the <link href="https://en.wikipedia.org/wiki/PDF">PDF Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
@@ -46,25 +56,26 @@
 		systems come with a JPEG editor by default. If you have scanned multiple pages, a JPEG file will be
 		created for each page. Use this file type if you want to modify or upload the scanned images.
         The size of the JPEG file is affected by the <link xref="quality">image quality</link>.
-		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wikipedia page</link> for more information.
+		See the <link href="https://en.wikipedia.org/wiki/JPEG">JPEG Wikipedia page</link> for more information.
 		    </p></td>
 	</tr>
 	<tr>
 		<td><p>PNG</p></td>
-		<td><p>PNG files contain the raw data from the scanner. This makes them very large and not suitable
+		<td><p>PNG files support lossless data compression. This can make files very large and not suitable
 		for distributing. If you have scanned multiple pages, a PNG file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
+		See the <link href="https://en.wikipedia.org/wiki/Portable_Network_Graphics">PNG Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
+<!-- TIFF support not available as long as https://gitlab.gnome.org/GNOME/simple-scan/issues/52 is open
 	<tr>
 		<td><p>TIFF</p></td>
 		<td><p>TIFF files contain the raw data from the scanner. This makes them very large and not suitable
-		for distributing. If you have scanned multipe pages, a TIFF file will be created for each page.
-		See the <link href="http://en.wikipedia.org/wiki/Tagged_Image_File_Format">TIFF Wikipedia page</link>
+		for distributing. If you have scanned multiple pages, a TIFF file will be created for each page.
+		See the <link href="https://en.wikipedia.org/wiki/TIFF">TIFF Wikipedia page</link>
 		for more information.
 		    </p></td>
 	</tr>
-
+-->
 </table>    
 </page>
diff --git a/help/C/scanner.page b/help/C/scanner.page
index efcbb0f..6a5d19b 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -1,16 +1,43 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="scanner">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
         <link type="guide" xref="index#acquire"/>
     </info>
   
 	<title>Selecting a Scanner</title>
 
     <p>
-    If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    If you have multiple scanning devices you can change the selected device:
     </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>Select <gui style="tab">Scanning</gui>.</p>
+      </item>
+      <item>
+        <p>Change the <gui>Scanner</gui> value.</p>
+      </item>
+      <item>
+        <p>Close the dialog.</p>
+      </item>
+    </steps>
+
+
     <media type="image" src="figures/preferences.png"/>
     <p>
     Local scanners are automatically detected each time <app>Document Scanner</app>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index a106dc8..4502c0d 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -1,9 +1,20 @@
-<page xmlns="http://projectmallard.org/1.0/"
+<page xmlns="http://projectmallard.org/1.0/" xmlns:its="http://www.w3.org/2005/11/its"
       type="guide"
       id="scanning">
 
     <info>
+        <revision pkgversion="3.35.90" date="2020-02-07"/>
         <title type="sort">0</title>
+        <credit type="author" its:translate="no">
+            <name>Robert Ancell</name>
+            <email>robert.ancell@gmail.com</email>
+        </credit>
+        <credit type="author" its:translate="no">
+            <name>Ali Shtarbanov</name>
+            <email>ametedinov@gmail.com</email>
+        </credit>
+        <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude" />
+        <title type="sort" its:translate="no">0</title>
         <link type="guide" xref="index#acquire"/>
     </info>
   
@@ -15,8 +26,8 @@
     <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 "Scan" button and choose the type
-	     of document you are scanning: <em>Photo</em> or <em>Text</em>.</p>
+      <item><p>Click the arrow 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>
     </steps>
@@ -27,9 +38,6 @@
     </p></note>
 
     <p>
-      The document type can be also be changed from the <guiseq><gui>Document</gui>
-      <gui>Scan</gui></guiseq> menu. Choose <gui><em>Text</em></gui> if you want the document
-      to be quickly scanned in black and white; choose <gui><em>Photo</em></gui> for a high 
-      resolution color scan. See <link xref="dpi"/> for more details and more options.
+      To change the quality of a scanned page, see <link xref="dpi"/>.
     </p>
 </page>