[g-h] Files and Folders section reworked

16 files changed, 88 insertions, 94 deletions

diff --git a/gnome-help/C/files-arrange.page b/gnome-help/C/files-arrange.page
index a15a7c9..f75cb0b 100644
--- a/gnome-help/C/files-arrange.page
+++ b/gnome-help/C/files-arrange.page
@@ -1,8 +1,8 @@
 <page xmlns="http://projectmallard.org/1.0/"
-      type="topic" id="files-arrange">
+      type="guide" id="files-arrange">
 
   <info>
-    <link type="guide" xref="files#management"/>
+    <link type="guide" xref="index#files-folders"/>
     <desc>Learn how to sort and arrange files in a folder.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2011-02-26" status="review"/>
@@ -18,54 +18,6 @@
 
 <title>Arrange Files</title>
 
-<p>You can arrange files in <link xref="#ways">lots of different ways</link> in a folder, for example by sorting them in order of date or file size.</p>
 
-<p>The way that you can arrange files depends on the <em>folder view</em> that you are using (Icon, List, or Compact). The current view is displayed in a drop-down list at the top of the window. You can change it using the drop-down list, or by clicking one of the three options in the <gui>View</gui> menu.</p>
-
-<section>
- <title>Icon View</title>
- <p>To sort files in a different order, right-click a blank space in the folder and choose an option from the <gui>Arrange Items</gui> menu. Alternatively, use the <guiseq><gui>View</gui><gui>Arrange Items</gui></guiseq> menu.</p>
- <p>As an example, if you select <gui>Sort by Name</gui> from the <gui>Arrange Items</gui> menu, the files will be arranged by their names, in alphabetical order. See <link xref="#ways"/> for other options.</p>
- <p>You can sort in the reverse order by selecting <gui>Reversed Order</gui>  from the <gui>Arrange Items</gui> menu.</p>
- <p>For complete control over the order and position of files in the folder, right-click a blank space in the folder and select <guiseq><gui>Arrange Items</gui><gui>Manually</gui></guiseq>. You can then rearrange the files by dragging them around in the folder.</p>
- <p>The <gui>Compact Layout</gui> option in the <gui>Arrange Items</gui> menu arranges the files so they take up as little space as possible. This is useful if you want to have lots of files visible at once in a folder.</p>
-</section>
-
-<section>
- <title>List View</title>
- <p>To sort files in a different order, click one of the column headings in the file browser (for example, click <gui>Type</gui> to sort by file type). Click the column heading again to sort in the reverse order.</p>
- <p>You can add other columns to sort by. Click <guiseq><gui>View</gui><gui>Visible Columns</gui></guiseq>, check the columns that you want to be visible, then click <gui>Close</gui>. You will then be able to sort by those columns. (See <link xref="files-listview-columns"/> for descriptions of available columns.)</p>
-</section>
-
-<section>
- <title>Compact View</title>
- <p>You can arrange files in Compact view in the same way that you can arrange them in the Icon view. The only difference is that you can't manually position the files anywhere you want; they are always organized as a list in this view.</p>
-</section>
-
-<section id="ways">
- <title>Ways of sorting files</title>
- <terms>
-  <item>
-   <title>By Name</title>
-   <p>Sorts by filename.</p>
-  </item>
-  <item>
-   <title>By Size</title>
-   <p>Sorts by the size of the file (how much disk space it takes up).</p>
-  </item>
-  <item>
-   <title>By Type</title>
-   <p>Sorts by the file type. Files of the same type are grouped together, then sorted by name.</p>
-  </item>
-  <item>
-   <title>By Modification Date</title>
-   <p>Sorts by the date that a file was last changed.</p>
-  </item>
-  <item>
-   <title>By Emblems</title>
-   <p>Sorts by the <link xref="files-special">emblems</link> that a file has. Files with the same emblems are grouped together, then sorted by name.</p>
-  </item>
- </terms>
-</section>
 
 </page>
diff --git a/gnome-help/C/files-copy.page b/gnome-help/C/files-copy.page
index 1d7c244..7be6ba8 100644
--- a/gnome-help/C/files-copy.page
+++ b/gnome-help/C/files-copy.page
@@ -2,7 +2,7 @@
       type="topic" id="files-copy">
 
   <info>
-    <link type="guide" xref="files#management"/>
+    <link type="guide" xref="files-arrange"/>
     <link type="seealso" xref="files-move"/>
     <desc>Make a copy of a file or folder in a new location.</desc>
 
diff --git a/gnome-help/C/files-delete.page b/gnome-help/C/files-delete.page
index 59d4d35..0b08c6c 100644
--- a/gnome-help/C/files-delete.page
+++ b/gnome-help/C/files-delete.page
@@ -2,7 +2,7 @@
       type="topic" id="files-delete">
 
   <info>
-    <link type="guide" xref="files#management"/>
+    <link type="guide" xref="files-arrange"/>
     <desc>Remove files or folders you no longer need.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-06-16" status="candidate"/>
diff --git a/gnome-help/C/files-hidden.page b/gnome-help/C/files-hidden.page
index 18b0c18..007ba44 100644
--- a/gnome-help/C/files-hidden.page
+++ b/gnome-help/C/files-hidden.page
@@ -2,7 +2,7 @@
       type="topic" id="files-hidden">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="files-arrange"/>
     <desc>Make a file invisible, so you can't see it in the file browser.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-25" status="draft"/>
diff --git a/gnome-help/C/files-listview-columns.page b/gnome-help/C/files-listview-columns.page
index 98b206d..1b9eebd 100644
--- a/gnome-help/C/files-listview-columns.page
+++ b/gnome-help/C/files-listview-columns.page
@@ -2,8 +2,8 @@
       type="topic" id="files-listview-columns">
 
   <info>
-    <link type="guide" xref="files#file"/>
-    <desc>Descriptions of the columns of information that can be viewed in the file browser's list view.</desc>
+    <link type="guide" xref="open-file-manager"/>
+    <desc>List view column descriptions.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-26" status="review"/>
     <credit type="author">
@@ -16,7 +16,7 @@
 
   </info>
 
-<title>Listview column descriptions</title>
+<title>File Manager's List View</title>
 
 <p>There are 12 columns of information that you can display in the file browser's list view. Click <guiseq><gui>View</gui><gui>Visible Columns</gui></guiseq> to select which columns will be visible.</p>
 
diff --git a/gnome-help/C/files-move.page b/gnome-help/C/files-move.page
index 1ff160d..4982aac 100644
--- a/gnome-help/C/files-move.page
+++ b/gnome-help/C/files-move.page
@@ -2,7 +2,7 @@
       type="topic" id="files-move">
 
   <info>
-    <link type="guide" xref="files#management"/>
+    <link type="guide" xref="files-arrange"/>
     <link type="seealso" xref="files-copy"/>
     <desc>Relocate a file or folder to a new location.</desc>
 
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index cf6eb01..7a1e8ba 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -2,7 +2,7 @@
       type="topic" id="files-open">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="index#files-folders"/>
     <desc>Open files using non-default applications or change the default for a file type.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-06-16" status="candidate"/>
diff --git a/gnome-help/C/files-preview-music.page b/gnome-help/C/files-preview-music.page
index 975662f..47b8746 100644
--- a/gnome-help/C/files-preview-music.page
+++ b/gnome-help/C/files-preview-music.page
@@ -2,7 +2,7 @@
       type="topic" id="files-preview-music">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="shell-files#music"/>
     <desc>Move the mouse pointer over a music file and it will start playing.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-26" status="draft"/>
diff --git a/gnome-help/C/files-recover.page b/gnome-help/C/files-recover.page
index be65b35..dd1c793 100644
--- a/gnome-help/C/files-recover.page
+++ b/gnome-help/C/files-recover.page
@@ -2,7 +2,7 @@
       type="topic" id="files-recover">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="index#files-folders"/>
     <desc>How to recover a deleted file.</desc>
     <revision pkgversion="0.1" version="0.1" date="2011-1-9" status="review"/>
     <credit type="author">
diff --git a/gnome-help/C/files-renaming.page b/gnome-help/C/files-renaming.page
index b282469..47215a0 100644
--- a/gnome-help/C/files-renaming.page
+++ b/gnome-help/C/files-renaming.page
@@ -2,7 +2,7 @@
       type="topic" id="files-renaming">
 
   <info>
-    <link type="guide" xref="files#management"/>
+    <link type="guide" xref="files-arrange"/>
     <desc>Change file or folder name.</desc>
     <revision pkgversion="0.1" version="0.1" date="2011-01-08" status="review"/>
     <credit type="author">
diff --git a/gnome-help/C/files-search.page b/gnome-help/C/files-search.page
index 6464c00..53a096a 100644
--- a/gnome-help/C/files-search.page
+++ b/gnome-help/C/files-search.page
@@ -2,7 +2,7 @@
       type="guide" id="files-search">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="index#files-folders"/>
     <title type='link'>Search for Files</title>
     <title type='text'>Search for Files</title>
     <desc>How to find a file.</desc>
diff --git a/gnome-help/C/files-sharing.page b/gnome-help/C/files-sharing.page
index ace943e..37125e1 100644
--- a/gnome-help/C/files-sharing.page
+++ b/gnome-help/C/files-sharing.page
@@ -2,7 +2,7 @@
       type="topic" id="files-sharing">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="index#files-folders"/>
     <desc>How to share and transfer files.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-25" status="draft"/>
diff --git a/gnome-help/C/files-sort.page b/gnome-help/C/files-sort.page
new file mode 100644
index 0000000..8aec3d0
--- /dev/null
+++ b/gnome-help/C/files-sort.page
@@ -0,0 +1,71 @@
+<page xmlns="http://projectmallard.org/1.0/"
+      type="topic" id="files-sort">
+
+  <info>
+    <link type="guide" xref="files-arrange"/>
+    <desc></desc>
+
+    <revision pkgversion="3.0" version="1.0" date="2011-02-26" status="review"/>
+    <credit type="author">
+      <name>Phil Bull</name>
+      <email>philbull@gmail.com</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>Sort Files and Folders</title>
+
+<p>You can sort files in <link xref="#ways">lots of different ways</link> in a folder, for example by sorting them in order of date or file size.</p>
+
+<p>The way that you can sort files depends on the <em>folder view</em> that you are using (Icon, List, or Compact). The current view is displayed in a drop-down list at the top of the window. You can change it using the drop-down list, or by clicking one of the three options in the <gui>View</gui> menu.</p>
+
+<section>
+ <title>Icon View</title>
+ <p>To sort files in a different order, right-click a blank space in the folder and choose an option from the <gui>Arrange Items</gui> menu. Alternatively, use the <guiseq><gui>View</gui><gui>Arrange Items</gui></guiseq> menu.</p>
+ <p>As an example, if you select <gui>Sort by Name</gui> from the <gui>Arrange Items</gui> menu, the files will be sorted by their names, in alphabetical order. See <link xref="#ways"/> for other options.</p>
+ <p>You can sort in the reverse order by selecting <gui>Reversed Order</gui>  from the <gui>Arrange Items</gui> menu.</p>
+ <p>For complete control over the order and position of files in the folder, right-click a blank space in the folder and select <guiseq><gui>Arrange Items</gui><gui>Manually</gui></guiseq>. You can then rearrange the files by dragging them around in the folder.</p>
+ <p>The <gui>Compact Layout</gui> option in the <gui>Arrange Items</gui> menu arranges the files so they take up as little space as possible. This is useful if you want to have lots of files visible at once in a folder.</p>
+</section>
+
+<section>
+ <title>List View</title>
+ <p>To sort files in a different order, click one of the column headings in the file browser (for example, click <gui>Type</gui> to sort by file type). Click the column heading again to sort in the reverse order.</p>
+ <p>You can add other columns to sort by. Click <guiseq><gui>View</gui><gui>Visible Columns</gui></guiseq>, check the columns that you want to be visible, then click <gui>Close</gui>. You will then be able to sort by those columns. (See <link xref="files-listview-columns"/> for descriptions of available columns.)</p>
+</section>
+
+<section>
+ <title>Compact View</title>
+ <p>You can sort files in Compact view in the same way that you can sort them in the Icon view. The only difference is that you can't manually position the files anywhere you want; they are always organized as a list in this view.</p>
+</section>
+
+<section id="ways">
+ <title>Ways of sorting files</title>
+ <terms>
+  <item>
+   <title>By Name</title>
+   <p>Sorts by filename.</p>
+  </item>
+  <item>
+   <title>By Size</title>
+   <p>Sorts by the size of the file (how much disk space it takes up).</p>
+  </item>
+  <item>
+   <title>By Type</title>
+   <p>Sorts by the file type. Files of the same type are grouped together, then sorted by name.</p>
+  </item>
+  <item>
+   <title>By Modification Date</title>
+   <p>Sorts by the date that a file was last changed.</p>
+  </item>
+  <item>
+   <title>By Emblems</title>
+   <p>Sorts by the <link xref="files-special">emblems</link> that a file has. Files with the same emblems are grouped together, then sorted by name.</p>
+  </item>
+ </terms>
+</section>
+
+</page>
diff --git a/gnome-help/C/files-special.page b/gnome-help/C/files-special.page
index 7baec06..585a2f9 100644
--- a/gnome-help/C/files-special.page
+++ b/gnome-help/C/files-special.page
@@ -2,7 +2,7 @@
       type="topic" id="files-special">
 
   <info>
-    <link type="guide" xref="files#file"/>
+    <link type="guide" xref="files-arrange"/>
     <desc>Use emblems to label a file.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2010-07-25" status="draft"/>
diff --git a/gnome-help/C/files-tilde.page b/gnome-help/C/files-tilde.page
index 9b5f4e9..cb2cad8 100644
--- a/gnome-help/C/files-tilde.page
+++ b/gnome-help/C/files-tilde.page
@@ -2,7 +2,7 @@
       type="topic" id="files-tilde">
 
   <info>
-    <link type="guide" xref="files#problems"/>
+    <link type="guide" xref="index#faq"/>
     <link type="seealso" xref="files-hidden"/>
     <desc>Files with a "~" at the end of their name (e.g. <file>example.txt~</file>) are hidden files.</desc>
 
diff --git a/gnome-help/C/files.page b/gnome-help/C/files.page
deleted file mode 100644
index dead76d..0000000
--- a/gnome-help/C/files.page
+++ /dev/null
@@ -1,29 +0,0 @@
-<page xmlns="http://projectmallard.org/1.0/"
-      type="guide" id="files">
-
-  <info>
-    <link type="guide" xref="index#files-folders"/>
-    <desc>Learn how to work with files and folders.</desc>
-
-    <revision pkgversion="3.0" version="1.0" date="2011-01-26" status="draft"/>
-    <credit type="author">
-      <name>Phil Bull</name>
-      <email>philbull@gmail.com</email>
-    </credit>
-    <license>
-      <p>Creative Commons Share Alike 3.0</p>
-    </license>
-
-  </info>
-
-<title>Files and folders</title>
-<section id="management" style="2column">
-    <title>Files and folders management</title>
-</section>
-<section id="file" style="2column">
-    <title>More about files</title>
-</section>
-<section id="problems" style="2column">
-    <title>Common problems</title>
-</section>
-</page>