Imported Upstream version 3.10.0upstream/3.10.0

11 files changed, 268 insertions, 76 deletions

diff --git a/help/C/adf.page b/help/C/adf.page
index 8d8a3dc..91886ce 100644
--- a/help/C/adf.page
+++ b/help/C/adf.page
@@ -9,10 +9,44 @@
 	<title>Using an Automatic Document Feeder</title>
 
     <p>
-    If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the <guiseq><gui>Document</gui><gui>Scan</gui><gui>All Pages From Feeder</gui></guiseq> menu.
+    If your scanner features an Automatic Document Feeder (ADF) 
+    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>
+	</item>      
+      </steps>
+      
+      <steps>
+	<title>Use a Menu</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>
+	</item>
+	<item>
+	  <p>Choose "All Pages From Feeder".</p>
+	  <media type="image" src="figures/scan_toolbar.png"/>
+	</item>
+      </steps>
+    
+    
+    <note style="tip">
     <p>
-    By default both sides of the paper will be scanned if your scanned supports this.
-    Single side scanning can be configured from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    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.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    </note>
+    
 </page>
diff --git a/help/C/crop.page b/help/C/crop.page
index 4102c9d..b65893e 100644
--- a/help/C/crop.page
+++ b/help/C/crop.page
@@ -9,16 +9,37 @@
 	<title>Cropping</title>
 
     <p>
-    To use only part of the scanned page enable crop by selecting the crop button in the toolbar.
-    A mask will be shown over the current page with the area not being used shown in gray.
-    </p>
-    <p>
-    The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse.
-    </p>
-    <p>
-    Fixed crop sizes can be chosen from the <guiseq><gui>Page</gui><gui>Crop</gui></guiseq> menu that match commonly used paper sizes.
-    </p>
-    <p>
-    Each new page that is scanned will use the previous crop.
+    The cropping feature in <app>Simple Scan</app> allows you to use only a part of a scanned image. You can
+    enable crop either before or after scanning a page, and you can always change the dimensions of the crop
+    frame. When crop is enabled, a mask will apper over the current page with the area not being used shown
+    in gray. You can enable crop and choose the desired dimensions via one of the following methods:
     </p>
+    
+    <steps>
+      <title>Use a Right Click</title>
+      <item><p>Right click anywhere on the image area and select "Crop".</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>
+    </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>
+	    <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>
+
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous crop.
+    </p></note>
 </page>
diff --git a/help/C/dpi.page b/help/C/dpi.page
index a274bca..ea8deeb 100644
--- a/help/C/dpi.page
+++ b/help/C/dpi.page
@@ -9,7 +9,49 @@
 	<title>Setting the Scan Resolution</title>
 
     <p>
-    By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi.
-    To change these settings open the preferences from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    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.
     </p>
+    <media type="image" src="figures/preferences.png"/>
+    
+    <p>The available scanning resolutions for both document types (Text and Photo) 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>
+	</tr>
+	<tr>
+		<td><p>75 dpi (draft)</p></td>
+		<td><p>75 dpi (draft)</p></td>
+	</tr>
+	<tr>
+		<td><p>150 dpi (default)</p></td>
+		<td><p>150 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>300 dpi</p></td>
+		<td><p>300 dpi (default)</p></td>
+	</tr>
+	<tr>
+		<td><p>600 dpi</p></td>
+		<td><p>600 dpi</p></td>
+	</tr>
+	<tr>
+		<td><p>1200 dpi (high resolution)</p></td>
+		<td><p>1200 dpi (high resolution)</p></td>
+	</tr>
+	<tr>
+		<td><p>2400 dpi</p></td>
+		<td><p>2400 dpi</p></td>
+	</tr>
+    </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
+      resolution!</p>
+    </note>
+
 </page>
diff --git a/help/C/email.page b/help/C/email.page
index 42540c2..e918e84 100644
--- a/help/C/email.page
+++ b/help/C/email.page
@@ -9,11 +9,14 @@
 	<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 a new message containing the scanned document as an attachment.
+    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
+    a new message containing the scanned document as an attachment.
     </p>
     <p>
-    If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page.    
+    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
+    attachment for each page.    
     </p>
     <p>
     See <link xref="save"/> for more information about file formats.
diff --git a/help/C/index.page b/help/C/index.page
index 6f5bff1..c9d8425 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -7,10 +7,14 @@
 			<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>
 
-	<title>Simple Scan Help</title>
+	<title><media type="image" src="figures/icon.png"/> Simple Scan Manual</title>
     
     <section id="acquire" style="2column">
         <title>Scanning Pages</title>
@@ -23,4 +27,8 @@
     <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/print.page b/help/C/print.page
index 8f182ca..5c7794a 100644
--- a/help/C/print.page
+++ b/help/C/print.page
@@ -9,6 +9,22 @@
 	<title>Printing</title>
 
     <p>
-    To print the current document use the <guiseq><gui>Document</gui><gui>Print</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>P</key></keyseq>).
+    <app>Simple Scan</app> allows you print a scanned document directly from the its
+    interface, without having to save the document first. This feature makes <app>Simple
+    Scan</app> a very convenient tool for making copies of documents or photos. 
     </p>
+    <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>
+      </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>
+      </item>
+     </steps>
 </page>
diff --git a/help/C/reorder.page b/help/C/reorder.page
index 0892e4c..f816acb 100644
--- a/help/C/reorder.page
+++ b/help/C/reorder.page
@@ -9,9 +9,13 @@
 	<title>Reordering Pages</title>
 
     <p>
-    To move a page, select it and move the page left or right using the <key>&lt;</key> and <key>&gt;</key> keys.
-    </p>
+    To move a page, right click on it and choose <gui><em>Move Left</em></gui> or 
+    <gui><em>Move Right</em></gui>.
+    </p> 
+    
     <p>
-    To remove the selected page use the <key>Delete</key> key.
-    </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.
+    </p> 
+
 </page>
diff --git a/help/C/rotate.page b/help/C/rotate.page
index caa8532..b64c69f 100644
--- a/help/C/rotate.page
+++ b/help/C/rotate.page
@@ -6,10 +6,52 @@
         <link type="guide" xref="index#modify"/>
     </info>
   
-	<title>Rotating Pages</title>
+	<title>Rotating a Page</title>
 
     <p>
-    To rotate a page use the rotation buttons in the toolbar or the <key>[</key> and <key>]</key> keys.
-    Each new page that is scanned will use the previous rotation.
+    In <app>Simple Scan</app>, you can change the rotation of a page either before or after scanning the page.
+    Currently, there are four ways to rotate a page: 
     </p>
+    
+    <steps>
+      <title>Use Toolbar Buttons</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>
+    </steps>
+    
+    <steps>
+      <title>Use Shortcuts</title>
+      <item><p>Select the page you want to rotate by clicking on it once.</p></item>
+      <item><p>Press one of the following shortcut keys:</p>
+	<table frame="bottom left right" rules="rows cols" shade="rows">
+	<tr>
+		<td><p><em>Command</em></p></td>
+		<td><p><em>Shortcut Key</em></p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Left</p></td>
+		<td><p><key>[</key> (left bracket)</p></td>
+	</tr>
+	<tr>
+		<td><p>Rotate Right</p></td>
+		<td><p><key>]</key> (right bracket)</p></td>
+	</tr>
+	</table>
+      </item>
+    </steps>
+    
+    <note><p>
+    Each new scanned page will use the previous rotation.
+    </p></note>
 </page>
diff --git a/help/C/save.page b/help/C/save.page
index 8c1a7b1..575c36a 100644
--- a/help/C/save.page
+++ b/help/C/save.page
@@ -8,25 +8,61 @@
   
 	<title>Saving to a File</title>
 
-    <p>
-    To save the current document to a file use the <guiseq><gui>Document</gui><gui>Save</gui></guiseq> menu (<keyseq><key>Ctrl</key><key>S</key></keyseq>).
-    When you save, there is a choice of three file types.
-    </p>
-    <terms>
+    <steps>
       <item>
-        <title>Portable Document Format (PDF)</title>
-        <p>A PDF can contain multiple pages (like a book) and is easy to distribute to other people.  Most people do not have software to modify PDF documents so this format is best used for archiving.</p>
-        <p>Use this type if you have scanned multiple pages of text.</p>
+	<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>
       </item>
       <item>
-        <title>JPEG</title>
-        <p>JPEG file is the file format used by digital cameras and is very small and so easy to distribute.  Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites.  If you have scanned multiple pages then a JPEG file will be written for each page.</p>
-        <p>Use this type if you want to modify or upload the scanned images.</p>
+	<p>From the "Save As" dialog box, choose one of the supported file
+	types, or simply change the extension in the "Name" field. 
+	</p>
       </item>
       <item>
-        <title>PNG</title>
-        <p>PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page.</p>
-        <p>Use this type if you need high resolution files for editing</p>
+	<p>Press the "Save" button.</p>
       </item>
-    </terms>
+    </steps>
+    
+    
+<table frame="bottom left right top" rules="rows cols" shade="rows">
+	<title>Supported File Types</title>
+	<tr>
+		<td><p><em>Type</em></p></td>
+		<td><p><em>Brief Description</em></p></td>
+	</tr>
+	<tr>
+		<td><p>PDF</p></td>
+		<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.
+		See the <link href="http://en.wikipedia.org/wiki/pdf">PDF Wiki page</link> for more information.
+		    </p></td>
+	</tr>
+	<tr>
+		<td><p>JPEG</p></td>
+		<td><p>JPEG is the file format used by digital cameras to save pictures. A JPEG file is relatively
+		small, very easy to distribute, and suitable for uploading to social networking sites. Most operating
+		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.
+		See the <link href="http://en.wikipedia.org/wiki/jpeg">JPEG Wiki 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
+		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 Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+	<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 Wiki page</link>
+		for more information.
+		    </p></td>
+	</tr>
+
+</table>    
 </page>
diff --git a/help/C/scanner.page b/help/C/scanner.page
index d7decd2..3762cc1 100644
--- a/help/C/scanner.page
+++ b/help/C/scanner.page
@@ -9,11 +9,12 @@
 	<title>Selecting a Scanner</title>
 
     <p>
-    If you have multiple scanners you can change which scanner is selected from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
+    If you have multiple scanning devices you can change the selected device from the <guiseq><gui>Document</gui><gui>Preferences</gui></guiseq> menu.
     </p>
-
+    <media type="image" src="figures/preferences.png"/>
     <p>
-    Your local scanners are automatically detected each time you start <app>Simple Scan</app> and each time you plug in USB scanner.
-    If you have a network scanner you will need to restart <app>Simple Scan</app> for it to be detected.
+    Your local scanners are automatically detected each time you start <app>Simple Scan</app>
+    and each time you plug in a USB scanner. If you connect a network scanner while <app>Simple Scan</app>
+    is running, you will need to restart <app>Simple Scan</app> for the scanner to be detected.
     </p>
 </page>
diff --git a/help/C/scanning.page b/help/C/scanning.page
index 5d0b470..c48a99d 100644
--- a/help/C/scanning.page
+++ b/help/C/scanning.page
@@ -13,38 +13,23 @@
     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>
+      <item><p>Connect the scanner to your computer and power it on.</p></item>
+      <item><p>Open <app>Simple Scan</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>
+	     <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>
 
-    <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>
+    <note><p>
+    The page will be shown as it is scanned. To stop the scan at any time press the <key>Esc</key>
+    key on the keyboard. Each page you scan is placed at the end of the document.
+    </p></note>
 
     <p>
-    To stop the scan at any time press <key>Escape</key>.
+      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.
     </p>
 </page>