[gnome-user-docs] g-h/nautilus: Reorg on nautilus prefs, wrote nautilus-display

[Shaun McCance <shaunm src gnome org>]

commit 44d876c05a909f35af41119e4c5de1cb08bec0af
Author: Shaun McCance <shaunm gnome org>
Date:   Sat Apr 2 15:21:16 2011 -0400

    g-h/nautilus: Reorg on nautilus prefs, wrote nautilus-display

 gnome-help/C/figures/nautilus-icons.png |  Bin 0 -> 13577 bytes
 gnome-help/C/files-open.page            |    2 +-
 gnome-help/C/nautilus-behavior.page     |    4 +-
 gnome-help/C/nautilus-display.page      |   55 ++++++++++++++++++++++++++----
 gnome-help/C/nautilus-list.page         |    5 ++-
 gnome-help/C/nautilus-prefs.page        |   24 +++++++++++++
 gnome-help/C/nautilus-preview.page      |    4 +-
 gnome-help/C/nautilus-views.page        |    4 +-
 gnome-help/Makefile.am                  |    2 +
 9 files changed, 83 insertions(+), 17 deletions(-)
---
diff --git a/gnome-help/C/figures/nautilus-icons.png b/gnome-help/C/figures/nautilus-icons.png
new file mode 100755
index 0000000..6d7afb1
Binary files /dev/null and b/gnome-help/C/figures/nautilus-icons.png differ
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index 92c0c29..cec1fc3 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -5,7 +5,7 @@
   <info>
     <link type="guide" xref="files" group="more"/>
     <link type="guide" xref="shell-overview#files"/>
-    <link type="guide" xref="files#manage-prefs"/>    
+    <link type="guide" xref="nautilus-prefs"/>
     <desc>Open files using an application that isn't the default one for that type of file. You can change the default too.</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2011-03-29" status="final"/>
diff --git a/gnome-help/C/nautilus-behavior.page b/gnome-help/C/nautilus-behavior.page
index 1fde34b..1ac1987 100644
--- a/gnome-help/C/nautilus-behavior.page
+++ b/gnome-help/C/nautilus-behavior.page
@@ -3,9 +3,9 @@
       id="nautilus-behavior">
 
   <info>
-    <link type="guide" xref="files#manage-prefs"/>
+    <link type="guide" xref="nautilus-prefs"/>
 
-    <desc>Click <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Behavior</gui></guiseq></desc>
+    <desc>XXXXX</desc>
 
     <revision pkgversion="3.0" version="0.1" date="2011-03-25" status="review"/>
     <credit type="author">
diff --git a/gnome-help/C/nautilus-display.page b/gnome-help/C/nautilus-display.page
index edfefde..4d96664 100644
--- a/gnome-help/C/nautilus-display.page
+++ b/gnome-help/C/nautilus-display.page
@@ -3,14 +3,15 @@
       id="nautilus-display">
 
   <info>
-    <link type="guide" xref="files#manage-prefs"/>
+    <link type="guide" xref="nautilus-prefs"/>
 
-      <desc>Click <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Display</gui></guiseq></desc>
+    <desc>Control icon captions and the date format used in
+    the file manager.</desc>
 
-    <revision pkgversion="3.0" version="0.1" date="2011-03-25" status="stub"/>
+    <revision pkgversion="3.0" date="2011-04-02" status="candidate"/>
     <credit type="author">
-      <name>Tiffany Antopolski</name>
-      <email>tiffany antopolski com</email>
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
     </credit>
     <license>
       <p>Creative Commons Share Alike 3.0</p>
@@ -18,7 +19,45 @@
 
   </info>
 
-<title>File manager display</title>
-<p>
-</p>
+<title>File manager display preferences</title>
+
+<p>You can control various aspects of how the file manager displays files, including
+captions under icons and how dates are formatted. In any file manager window, click
+<guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and select the
+<gui>Display</gui> tab.</p>
+
+<section id="icon-captions">
+  <title>Icon captions</title>
+  <media type="image" src="figures/nautilus-icons.png"
+         width="250" height="110" style="floatright">
+    <p>File manager icons with captions</p>
+  </media>
+  <p>When you use icon view, you can choose to have extra information about
+  files and folders displayed in a caption under each icon. This is useful,
+  for example, if you often need to see who owns a file or when it was last
+  modified.</p>
+  <p>As you zoom in on a folder (under the <gui>View</gui> menu, the file
+  manager will display more and more information in captions. You can choose
+  up to three things to show in captions. The first will be displayed at
+  most zoom levels. The last will only be shown at very large sizes.</p>
+  <p>The information you can show in icon captions is the same as the
+  columns you can use in list view. See <link xref="nautilus-list"/>
+  for more information.</p>
+  <note><p>If you have a file manager window open, you may have to reload for icon
+  caption changes to take effect. Click <guiseq><gui>View</gui><gui>Reload</gui></guiseq>
+  or press <keyseq><key>Ctrl</key><key>R</key></keyseq>.</p></note>
+</section>
+
+<section id="date">
+  <title>Date format</title>
+  <p>Access and modification times for files can be displayed in icon captions
+  or in list view columns. You can choose the date format that is easiest for
+  you from the <gui>Format</gui> drop-down list. Available formats include
+  a verbose format like you might write by hand, an international standard
+  format, and a format that uses relative phrases like <em>today</em> and
+  <em>yesterday</em>. The drop-down lists shows the formats by example, by
+  showing the current date and time in that format.</p>
+</section>
+
+
 </page>
diff --git a/gnome-help/C/nautilus-list.page b/gnome-help/C/nautilus-list.page
index 3091851..600a041 100644
--- a/gnome-help/C/nautilus-list.page
+++ b/gnome-help/C/nautilus-list.page
@@ -2,8 +2,9 @@
       type="topic" style="ui" id="nautilus-list">
 
   <info>
-    <link type="guide" xref="files#manage-prefs"/>
-    <desc>Column descriptions. Click <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and select the <gui>List Columns</gui> tab </desc>.
+    <link type="guide" xref="nautilus-prefs"/>
+
+    <desc>XXXXX</desc>
 
     <revision pkgversion="3.0" version="1.0" date="2011-03-29" status="review"/>
     <credit type="author">
diff --git a/gnome-help/C/nautilus-prefs.page b/gnome-help/C/nautilus-prefs.page
new file mode 100644
index 0000000..e58ecfa
--- /dev/null
+++ b/gnome-help/C/nautilus-prefs.page
@@ -0,0 +1,24 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="guide" style="ui"
+      id="nautilus-prefs">
+
+  <info>
+    <link type="guide" xref="files" group="#last"/>
+
+    <desc>XXXXXX</desc>
+
+    <revision pkgversion="3.0" date="2011-04-02" status="stub"/>
+    <credit type="author">
+      <name>Shaun McCance</name>
+      <email>shaunm gnome org</email>
+    </credit>
+    <license>
+      <p>Creative Commons Share Alike 3.0</p>
+    </license>
+
+  </info>
+
+<title>File manager preferences</title>
+
+
+</page>
diff --git a/gnome-help/C/nautilus-preview.page b/gnome-help/C/nautilus-preview.page
index 4bce5e1..6a80e69 100644
--- a/gnome-help/C/nautilus-preview.page
+++ b/gnome-help/C/nautilus-preview.page
@@ -3,9 +3,9 @@
       id="nautilus-preview">
 
   <info>
-    <link type="guide" xref="files#manage-prefs"/>
+    <link type="guide" xref="nautilus-prefs"/>
 
-      <desc>Click <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Preview</gui></guiseq></desc>
+    <desc>XXXXX</desc>
 
     <revision pkgversion="3.0" version="0.1" date="2011-03-25" status="stub"/>
     <credit type="author">
diff --git a/gnome-help/C/nautilus-views.page b/gnome-help/C/nautilus-views.page
index 956358f..4fb8393 100644
--- a/gnome-help/C/nautilus-views.page
+++ b/gnome-help/C/nautilus-views.page
@@ -3,9 +3,9 @@
       id="nautilus-views">
 
   <info>
-    <link type="guide" xref="files#manage-prefs"/>
+    <link type="guide" xref="nautilus-prefs"/>
 
-      <desc>Click <guiseq><gui>Edit</gui><gui>Preferences</gui><gui>Views</gui></guiseq></desc>
+    <desc>XXXXX</desc>
 
     <revision pkgversion="3.0" version="0.1" date="2011-03-25" status="review"/>
     <credit type="author">
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index 80cb0fd..3fe17d2 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -9,6 +9,7 @@ DOC_FIGURES = \
 	figures/gnome.png \
 	figures/gnome-searchtool.png \
 	figures/nautilus.png \
+	figures/nautilus-icons.png \
 	figures/printing-select.png \
 	figures/Screenshot-SearchForFiles-options.png \
 	figures/Screenshot-SearchForFiles.png \
@@ -120,6 +121,7 @@ DOC_PAGES = \
 	nautilus-file-properties-basic.page \
 	nautilus-file-properties-permissions.page \
 	nautilus-list.page \
+	nautilus-prefs.page \
 	nautilus-preview.page \
 	nautilus-views.page \
 	net-adhoc.page \