Merge tag 'upstream/3.10.0'

Upstream version 3.10.0

1 files changed, 32 insertions, 11 deletions

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>