[gnome-user-docs] g-h/files-copy: Edits, also removed files-move

[Shaun McCance <shaunm src gnome org>]

commit 51003df1045f0420fa35d0ed7dc2b233cc606860
Author: Shaun McCance <shaunm gnome org>
Date:   Fri Mar 25 13:27:17 2011 -0400

    g-h/files-copy: Edits, also removed files-move

 gnome-help/C/files-copy.page |   33 +++++++++++++--------------------
 gnome-help/C/files-move.page |   41 -----------------------------------------
 gnome-help/Makefile.am       |    1 -
 3 files changed, 13 insertions(+), 62 deletions(-)
---
diff --git a/gnome-help/C/files-copy.page b/gnome-help/C/files-copy.page
index b19cfd4..7065941 100644
--- a/gnome-help/C/files-copy.page
+++ b/gnome-help/C/files-copy.page
@@ -3,7 +3,6 @@
 
   <info>
     <link type="guide" xref="files-arrange"/>
-    <link type="seealso" xref="files-move"/>
     <desc>Copy or move items to a new directory.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2011-03-19" status="candidate"/>
@@ -31,36 +30,30 @@ Copying files can be useful when creating a folder containing files to email to
 </p>
 
 <steps>
-<title>Drag files to the new location</title>
+<title>Drag files to copy or move</title>
 <item><p><link xref="open-file-manager">Open the file browser</link> to the folder containing the item you want to copy.</p></item>
-<item><p>Open a second file browser window by clicking <keyseq><key>Ctrl</key><key>N</key></keyseq>. Navigate to the folder where you want to put the copy of the item.</p></item>
-<item><p>To copy the file, hold down the <key>Ctrl</key> key, then click and drag the item from the first window to the new destination.</p>
-<p>To move the file, hold down the <key>Shift</key> key, then click and drag the item from the first window to the new destination.</p></item>
+<item><p>Press <keyseq><key>Ctrl</key><key>N</key></keyseq> to open a second window. Navigate to the folder where you want to move or copy the item.</p></item>
+<item><p>Click and drag the item from one window to another. By default, dragging an item will move it if the destination is on the same device, but copy it if the destination is on a difference device, such as a USB storage device. You can override this.</p>
+<list style="compact">
+<item><p>To force the file to be copied, hold down the <key>Ctrl</key> key while dragging.</p></item>
+<item><p>To force the file to be moved, hold down the <key>Shift</key> key while dragging.</p></item>
+</list></item>
 </steps>
 
 <steps>
-<title>Copy files to the new location</title>
+<title>Copy and paste files</title>
 <item><p>Select the item you want to copy by clicking on it once.</p></item>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Copy</gui></guiseq>.</p></item>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Copy</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>C</key></keyseq>.</p></item>
 <item><p>Navigate to the folder where you want to put the copy of the item.</p></item>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Paste</gui></guiseq> to finish copying the item.</p></item>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Paste</gui></guiseq> to finish copying the item, or press <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p></item>
 </steps> 
 
 <steps>
-<title>Move files to the new location</title>
+<title>Cut and paste files to move</title>
 <item><p>Select the item you want to move by clicking on it once.</p></item>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Cut</gui></guiseq>.</p></item>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Cut</gui></guiseq>, or press <keyseq><key>Ctrl</key><key>X</key></keyseq>.</p></item>
 <item><p>Navigate to the folder where you want to move the item.</p></item>
-<item><p>Click <guiseq><gui>Edit</gui><gui>Paste</gui></guiseq> to finish moving the item.</p></item>
+<item><p>Click <guiseq><gui>Edit</gui><gui>Paste</gui></guiseq> to finish moving the item, or press <keyseq><key>Ctrl</key><key>V</key></keyseq>.</p></item>
 </steps> 
 
-<steps>
-<title>Copy or move files using keyboard shortcuts</title>
-<item><p>Click once on the item you want to copy or move.</p></item>
-<item><p>To copy the item, press <keyseq><key>Ctrl</key><key>C</key></keyseq>.</p>
-<p>To move the item, press <keyseq><key>Ctrl</key><key>X</key></keyseq>.</p></item>
-<item><p>Navigate to the folder where you want to paste the item.</p></item>
-<item><p>Click <keyseq><key>Ctrl</key><key>V</key></keyseq> to finish copying or moving the item.</p></item>
-</steps>
-
 </page>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 542c9da..954f3c7 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -66,7 +66,6 @@ DOC_PAGES = \
 	files-delete.page \
 	files-hidden.page \
 	files-listview-columns.page \
-	files-move.page \
 	files-open.page \
 	files.page \
 	files-preview-music.page \