[gnome-user-docs] Unstub disk-benchmark and do a quick update for 3.6



commit 553cdcc75feb63f04b66acb1ab5c8b7e363bd388
Author: Jeremy Bicha <jbicha ubuntu com>
Date:   Sun Sep 16 02:03:59 2012 -0400

    Unstub disk-benchmark and do a quick update for 3.6
    
    Also add a few extra lines to make the merge nicer for Ubuntu

 ...isk-benchmark.page.stub => disk-benchmark.page} |   17 ++++++++++-------
 gnome-help/C/disk.page                             |    3 ---
 gnome-help/C/display-lock.page                     |    1 +
 gnome-help/C/files-browse.page                     |    1 +
 gnome-help/C/files-delete.page                     |    1 +
 gnome-help/C/files-lost.page                       |    1 +
 gnome-help/C/files-open.page                       |    1 +
 gnome-help/C/files-recover.page                    |    1 +
 gnome-help/C/files-rename.page                     |    1 +
 gnome-help/C/files-search.page                     |    1 +
 gnome-help/C/hardware-problems-graphics.page       |    1 +
 gnome-help/C/power-batterywindows.page             |    1 +
 gnome-help/C/shell-overview.page                   |    1 +
 gnome-help/C/shell-windows-switching.page          |    1 +
 gnome-help/C/sound-nosound.page                    |    2 +-
 gnome-help/C/user-changepicture.page               |    1 +
 gnome-help/C/user-delete.page                      |    1 +
 gnome-help/C/user-goodpassword.page                |    1 +
 gnome-help/C/video-sending.page                    |    1 +
 gnome-help/C/wacom-stylus.page                     |    2 --
 gnome-help/Makefile.am                             |    1 +
 21 files changed, 28 insertions(+), 13 deletions(-)
---
diff --git a/gnome-help/C/disk-benchmark.page.stub b/gnome-help/C/disk-benchmark.page
similarity index 76%
rename from gnome-help/C/disk-benchmark.page.stub
rename to gnome-help/C/disk-benchmark.page
index 5e2b348..c44c2a1 100644
--- a/gnome-help/C/disk-benchmark.page.stub
+++ b/gnome-help/C/disk-benchmark.page
@@ -34,19 +34,22 @@
 <steps>
 
  <item>
-  <p>Open the <app>Disk Utility</app> application from the activities
+  <p>Open the <app>Disks</app> application from the activities
   overview.</p>
  </item>
  <item>
-  <p>Choose the hard disk from the <gui>Storage Devices</gui> list. Information
-  about the disk and its status will appear under  <gui>Drive</gui>.</p></item>
+  <p>Choose the hard disk from the <gui>Disk Drives</gui> list.</p>
+ </item>
+ <item>
+  <p>Click the more actions button next to the <gui>-</gui> button and choose <gui>Benchmark Volume</gui>.</p>
+ </item>
  <item>
-  <p>Choose <gui>Benchmark</gui>.</p>
+  <p>Click <gui>Start Benchmark</gui>.</p>
  </item>
  <item>
-  <p>Click <gui>Start Read-Only Benchmark</gui> to test how fast data can be
-  read from the disk or <gui>Start Read/Write Benchmark</gui> to test how fast
-  data can be read from and written to the disk.  The latter option will take
+  <p>Click <gui>Start Benchmarking</gui> to test how fast data can be
+  read from the disk. If the <gui>Also perform write-benchmark</gui> option is checked, the benchmark will test how fast
+  data can be read from and written to the disk.  This will take
   longer to complete.</p>
  </item>
 
diff --git a/gnome-help/C/disk.page b/gnome-help/C/disk.page
index 2a5d36e..bf30236 100644
--- a/gnome-help/C/disk.page
+++ b/gnome-help/C/disk.page
@@ -14,10 +14,7 @@
 
   <desc>
     <link xref="disk-capacity">Disk space</link>,
-<!--
-Page was stubbed out because feature disappeared
     <link xref="disk-benchmark">performance</link>,
--->
     <link xref="disk-check">problems</link>,
     <link xref="disk-partitions">volumes and partitions</link>â
   </desc>
diff --git a/gnome-help/C/display-lock.page b/gnome-help/C/display-lock.page
index 0b66639..ae6517c 100644
--- a/gnome-help/C/display-lock.page
+++ b/gnome-help/C/display-lock.page
@@ -8,6 +8,7 @@
     <link type="seealso" xref="session-screenlocks"/>
     <link type="seealso" xref="shell-exit#lock-screen"/>
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+
     <desc>Prevent other people from using your desktop when you
     go away from your computer.</desc>
     <credit type="author">
diff --git a/gnome-help/C/files-browse.page b/gnome-help/C/files-browse.page
index 7a0604e..51772a6 100644
--- a/gnome-help/C/files-browse.page
+++ b/gnome-help/C/files-browse.page
@@ -9,6 +9,7 @@
     <desc>Manage and organize files with the file manager.</desc>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+
     <credit type="author">
       <name>Tiffany Antopolski</name>
       <email>tiffany antopolski gmail com</email>
diff --git a/gnome-help/C/files-delete.page b/gnome-help/C/files-delete.page
index 9147188..d7cbeb9 100644
--- a/gnome-help/C/files-delete.page
+++ b/gnome-help/C/files-delete.page
@@ -8,6 +8,7 @@
     <desc>Remove files or folders you no longer need.</desc>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>Cristopher Thomas</name>
       <email>crisnoh gmail com</email>
diff --git a/gnome-help/C/files-lost.page b/gnome-help/C/files-lost.page
index f302eae..eaef97e 100644
--- a/gnome-help/C/files-lost.page
+++ b/gnome-help/C/files-lost.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="files" group="more"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+
     <desc>Follow these tips if you can't find a file you
     created or downloaded.</desc>
 
diff --git a/gnome-help/C/files-open.page b/gnome-help/C/files-open.page
index 5a18b63..640f03b 100644
--- a/gnome-help/C/files-open.page
+++ b/gnome-help/C/files-open.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="files" group="more"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+
     <desc>Open files using an application that isn't the default one for that type of file. You can change the default too.</desc>
 
     <credit type="author">
diff --git a/gnome-help/C/files-recover.page b/gnome-help/C/files-recover.page
index a9a2037..eef95f4 100644
--- a/gnome-help/C/files-recover.page
+++ b/gnome-help/C/files-recover.page
@@ -9,6 +9,7 @@
     </desc>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/files-rename.page b/gnome-help/C/files-rename.page
index 364de47..e8556d6 100644
--- a/gnome-help/C/files-rename.page
+++ b/gnome-help/C/files-rename.page
@@ -7,6 +7,7 @@
     <desc>Change file or folder name.</desc>
 
     <revision pkgversion="3.4.0" date="2012-02-20" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/files-search.page b/gnome-help/C/files-search.page
index 766c6f7..0fb3746 100644
--- a/gnome-help/C/files-search.page
+++ b/gnome-help/C/files-search.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="files"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <desc>Locate files based on file name and type. Save your searches for
     later use.</desc>
     <credit type="author">
diff --git a/gnome-help/C/hardware-problems-graphics.page b/gnome-help/C/hardware-problems-graphics.page
index ee156f7..78f8586 100644
--- a/gnome-help/C/hardware-problems-graphics.page
+++ b/gnome-help/C/hardware-problems-graphics.page
@@ -2,6 +2,7 @@
       type="guide"  style="problem"
       id="hardware-problems-graphics">
   <info>
+
     <link type="guide" xref="hardware#problems"/>
 
     <credit type="author">
diff --git a/gnome-help/C/power-batterywindows.page b/gnome-help/C/power-batterywindows.page
index 5f067e6..e4cc04e 100644
--- a/gnome-help/C/power-batterywindows.page
+++ b/gnome-help/C/power-batterywindows.page
@@ -7,6 +7,7 @@
     <link type="seealso" xref="power-batteryestimate"/>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <desc>Tweaks from the manufacturer and differing battery life estimates may be the cause of this problem.</desc>
     <credit type="author">
       <name>GNOME Documentation Project</name>
diff --git a/gnome-help/C/shell-overview.page b/gnome-help/C/shell-overview.page
index c561cfd..81fbed2 100644
--- a/gnome-help/C/shell-overview.page
+++ b/gnome-help/C/shell-overview.page
@@ -16,6 +16,7 @@
     </desc>
 
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/shell-windows-switching.page b/gnome-help/C/shell-windows-switching.page
index cc9897a..05e10be 100644
--- a/gnome-help/C/shell-windows-switching.page
+++ b/gnome-help/C/shell-windows-switching.page
@@ -10,6 +10,7 @@
 
     <desc>Press <keyseq><key>Alt</key><key>Tab</key></keyseq>.</desc>
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/sound-nosound.page b/gnome-help/C/sound-nosound.page
index e6edb9e..6eace3f 100644
--- a/gnome-help/C/sound-nosound.page
+++ b/gnome-help/C/sound-nosound.page
@@ -123,4 +123,4 @@
  and external USB sound cards.</p>
 </section>
 
-</page>
+</page>
\ No newline at end of file
diff --git a/gnome-help/C/user-changepicture.page b/gnome-help/C/user-changepicture.page
index 8e63af8..fbff9a7 100644
--- a/gnome-help/C/user-changepicture.page
+++ b/gnome-help/C/user-changepicture.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="user-accounts#manage"/>
     <desc>Add your photo to the login and user screens.</desc>
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/user-delete.page b/gnome-help/C/user-delete.page
index 356ba66..ffa4f39 100644
--- a/gnome-help/C/user-delete.page
+++ b/gnome-help/C/user-delete.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="user-accounts#manage"/>
     <desc>Remove users that no longer use your computer.</desc>
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>Tiffany Antopolski</name>
       <email>tiffany antopolski com</email>
diff --git a/gnome-help/C/user-goodpassword.page b/gnome-help/C/user-goodpassword.page
index 3c24c67..fca7870 100644
--- a/gnome-help/C/user-goodpassword.page
+++ b/gnome-help/C/user-goodpassword.page
@@ -7,6 +7,7 @@
 
     <desc>Use longer, more complicated passwords.</desc>
     <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/video-sending.page b/gnome-help/C/video-sending.page
index 3690647..d8a367e 100644
--- a/gnome-help/C/video-sending.page
+++ b/gnome-help/C/video-sending.page
@@ -6,6 +6,7 @@
     <link type="guide" xref="media#videos"/>
     <desc>Check that they have the right video codecs installed.</desc>
     <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+
     <credit type="author">
       <name>GNOME Documentation Project</name>
       <email>gnome-doc-list gnome org</email>
diff --git a/gnome-help/C/wacom-stylus.page b/gnome-help/C/wacom-stylus.page
index 8d29ea7..9cbeedb 100644
--- a/gnome-help/C/wacom-stylus.page
+++ b/gnome-help/C/wacom-stylus.page
@@ -23,8 +23,6 @@
      one stylus.</p>
   </comment>
 
-  <p>Short introductory text...</p>
-
 <steps>
   <item><p>Click your name on the top bar and select
    <gui>System Settings</gui>.</p></item>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index fb50800..06f3cc4 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -161,6 +161,7 @@ HELP_FILES = \
 	contacts-link-unlink.page \
 	contacts-search.page \
 	contacts-setup.page \
+	disk-benchmark.page \
 	disk-capacity.page \
 	disk-check.page \
 	disk-format.page \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]