GNOME.org
 

[gnome-user-docs] Lock screen page added, some validation issues fixed

commit 3518478845101236f745737cc80acbe074635743
Author: Michael Hill <mdhillca gmail com>
Date:   Sun Nov 11 18:06:40 2012 -0500

    Lock screen page added, some validation issues fixed

 gnome-help/C/accounts-which-application.page |    4 +-
 gnome-help/C/disk-benchmark.page             |    3 +-
 gnome-help/C/figures/shell-lock.png          |  Bin 0 -> 35848 bytes
 gnome-help/C/look-background.page            |   10 +++---
 gnome-help/C/mouse-touchpad-click.page       |    2 +-
 gnome-help/C/nautilus-connect.page           |   49 +++++++++++++------------
 gnome-help/C/shell-exit.page                 |    7 ++--
 gnome-help/C/shell-introduction.page         |   20 ++++++++++
 gnome-help/C/shell-lockscreen.page           |   36 +++++++++++++++++++
 gnome-help/Makefile.am                       |    2 +
 10 files changed, 97 insertions(+), 36 deletions(-)
---
diff --git a/gnome-help/C/accounts-which-application.page b/gnome-help/C/accounts-which-application.page
index 2f2fa23..78b3ce6 100644
--- a/gnome-help/C/accounts-which-application.page
+++ b/gnome-help/C/accounts-which-application.page
@@ -59,7 +59,7 @@
   <section id="accounts-windows-skydrive">
    <title>With SkyDrive accounts</title>
 
-   <item><p><app>Documents</app> can access your online documents in Microsoft
-   SkyDrive and display them.</p></item>
+   <p><app>Documents</app> can access your online documents in Microsoft
+   SkyDrive and display them.</p>
   </section>
 </page>
diff --git a/gnome-help/C/disk-benchmark.page b/gnome-help/C/disk-benchmark.page
index c44c2a1..32b1163 100644
--- a/gnome-help/C/disk-benchmark.page
+++ b/gnome-help/C/disk-benchmark.page
@@ -1,6 +1,7 @@
 <page xmlns="http://projectmallard.org/1.0/";
       type="topic" style="task"
       id="disk-benchmark">
+
   <info>
     <link type="guide" xref="disk"/>
 
@@ -67,4 +68,4 @@
    read and write rates, average access time and time elapsed since the last
    benchmark test.</p>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/figures/shell-lock.png b/gnome-help/C/figures/shell-lock.png
new file mode 100644
index 0000000..e76b7df
Binary files /dev/null and b/gnome-help/C/figures/shell-lock.png differ
diff --git a/gnome-help/C/look-background.page b/gnome-help/C/look-background.page
index 3bcfa46..30bf302 100644
--- a/gnome-help/C/look-background.page
+++ b/gnome-help/C/look-background.page
@@ -51,12 +51,12 @@ it to a simple color or gradient.</p>
   corner.</p></item>
   <item><p>Select <gui>Pictures</gui> to use one of your own photos
   from your Pictures folder. Most photo management applications
-  store photos there.</p></item>
+  store photos there.
   If you would like to use an image that is not in your Pictures folder,
-  either use <app>Files</app> by right-clicking on the image file and 
+  either use <app>Files</app> by right-clicking on the image file and
   selecting <gui>Set as Wallpaper</gui>, or <app>Image Viewer</app> by
-  opening the image file and selecting 
-  <guiseq><gui>Image</gui><gui>Set as Desktop Background</gui></guiseq>.
+  opening the image file and selecting
+  <guiseq><gui>Image</gui><gui>Set as Desktop Background</gui></guiseq>.</p></item>
   <item><p>Select <gui>Colors</gui> to just
   use a flat color or a linear gradient.</p></item>
 </list>
@@ -66,4 +66,4 @@ it to a simple color or gradient.</p>
   to view your entire desktop.</p></item>
 </steps>
 
-</page>
\ No newline at end of file
+</page>
diff --git a/gnome-help/C/mouse-touchpad-click.page b/gnome-help/C/mouse-touchpad-click.page
index 8ebd130..884cf59 100644
--- a/gnome-help/C/mouse-touchpad-click.page
+++ b/gnome-help/C/mouse-touchpad-click.page
@@ -54,7 +54,7 @@ at once.</p></item>
 are spread far enough apart. If your fingers are too close, your computer may
 think they're a single finger.</p></note>
 
-<section id="two-finger scroll">
+<section id="twofingerscroll">
 
 <title>Two finger scroll</title>
 
diff --git a/gnome-help/C/nautilus-connect.page b/gnome-help/C/nautilus-connect.page
index 16f81a9..26c9f4d 100644
--- a/gnome-help/C/nautilus-connect.page
+++ b/gnome-help/C/nautilus-connect.page
@@ -62,21 +62,22 @@ internet/network address.</p>
 
 <section id="urls">
  <title>Writing URLs</title>
+
 <p>A <em>URL</em>, or <em>uniform resource locator</em>, is a form of address
  that refers to a location or file on a network. The address is formatted like this:</p>
-<terms>
-  <item><p><sys>scheme://servername.example.com/folder</sys></p></item>
-</terms>
+  <example>
+    <p><sys>scheme://servername.example.com/folder</sys></p>
+  </example>
 <p>The <em>scheme</em> specifies the protocol or type of server. The
   <em>example.com</em> portion of the address is called the <em>domain name</em>.
   If a user name is required, it is inserted before the server name:</p>
-<terms>
-  <item><p><sys>scheme://username servername example com/folder</sys></p></item>
-</terms>
+  <example>
+    <p><sys>scheme://username servername example com/folder</sys></p>
+  </example>
 <p>Some schemes require the port number to be specified. Insert it after the domain name:</p>
-<terms>
-  <item><p><sys>scheme://servername.example.com:port/folder</sys></p></item>
-</terms>
+  <example>
+    <p><sys>scheme://servername.example.com:port/folder</sys></p>
+  </example>
 <p>Below are specific examples for the various server types that are supported.</p>
 </section>
 
@@ -99,9 +100,9 @@ internet/network address.</p>
   to members so they can securely upload files. SSH servers always
   require you to log in.</p>
   <p>A typical SSH URL looks like this:</p>
-  <terms>
-    <item><p><sys>ssh://username servername example com/folder</sys></p></item>
-  </terms>
+  <example>
+    <p><sys>ssh://username servername example com/folder</sys></p>
+  </example>
 
   <comment><cite>shaunm</cite><p>We should have a topics on encryption
   keys, possibly rolling the seahorse help into gnome-help. Then link
@@ -118,9 +119,9 @@ internet/network address.</p>
   you to use FTP to upload or download files. FTP sites with logins
   will usually allow you to delete and upload files.</p>
   <p>A typical FTP URL looks like this:</p>
-  <terms>
-    <item><p><sys>ftp://username ftp example com/path/</sys></p></item>
-  </terms>
+  <example>
+    <p><sys>ftp://username ftp example com/path/</sys></p>
+  </example>
 </item>
 <item>
   <title>Public FTP</title>
@@ -129,9 +130,9 @@ internet/network address.</p>
   user name and password, and will usually not allow you to delete
   or upload files.</p>
   <p>A typical anonymous FTP URL looks like this:</p>
-  <terms>
-    <item><p><sys>ftp://ftp.example.com/path/</sys></p></item>
-  </terms>
+  <example>
+    <p><sys>ftp://ftp.example.com/path/</sys></p>
+  </example>
   <p>Some anonymous FTP sites require you to log in with a
   public user name and password, or with a public user name using
   your email address as the password. For these servers, use the
@@ -146,9 +147,9 @@ internet/network address.</p>
   the right permissions on the remote computer, you can connect to a Windows
   share from the file manager.</p>
   <p>A typical Windows share URL looks like this:</p>
-  <terms>
-    <item><p><sys>smb://servername/Share</sys></p></item>
-  </terms>
+  <example>
+    <p><sys>smb://servername/Share</sys></p>
+  </example>
 </item>
 <item>
   <title>WebDAV and Secure WebDAV</title>
@@ -158,9 +159,9 @@ internet/network address.</p>
   this option. Secure WebDAV uses strong SSL encryption, so that other users
   can't see your password.</p>
   <p>A typical WebDAV URL looks like this:</p>
-  <terms>
-    <item><p><sys>http://example.hostname.com/path</sys></p></item>
-  </terms>
+  <example>
+    <p><sys>http://example.hostname.com/path</sys></p>
+  </example>
   <comment>
     <cite date="2012-02-19">shaunm</cite>
     <p>Also used by gnome-user-share, but we're not talking about that
diff --git a/gnome-help/C/shell-exit.page b/gnome-help/C/shell-exit.page
index b9e5232..cda56d5 100644
--- a/gnome-help/C/shell-exit.page
+++ b/gnome-help/C/shell-exit.page
@@ -64,9 +64,10 @@
 <title>Lock the screen</title>
   <p>If you're leaving your computer for a short time, you should lock your
  screen to prevent other people from accessing your files or running
- applications. When you return, simply enter your password to log back in.
- If you don't lock your screen, it will lock automatically after a certain
- amount of time.</p>
+ applications. When you return, raise the
+ <link xref="shell-lockscreen">lock screen</link> curtain and enter your
+ password to log back in. If you don't lock your screen, it will lock
+ automatically after a certain amount of time.</p>
 
   <p>To lock your screen, click your name on the top bar and select
   <gui>Lock</gui>.</p>
diff --git a/gnome-help/C/shell-introduction.page b/gnome-help/C/shell-introduction.page
index 9bce664..08920b0 100644
--- a/gnome-help/C/shell-introduction.page
+++ b/gnome-help/C/shell-introduction.page
@@ -166,6 +166,26 @@ suspend or power off the computer from the menu.</p>
 </list>
 </section>
 
+<section id="lockscreen">
+<title>Lock Screen</title>
+
+<media type="image" src="figures/shell-lock.png"
+       width="250" height="156" style="floatend floatright"
+       if:test="!target:mobile">
+  <p>Lock Screen</p>
+</media>
+
+<p>When you lock your screen, or it locks automatically, the lock screen is
+displayed. In addition to protecting your desktop while you're away from your
+computer, the lock screen displays the date, time, and your name as the
+logged-in user. It also shows information about your battery and network status,
+and allows you to control media playback.</p>
+
+<list style="compact">
+  <item><p><link xref="shell-lockscreen">Learn more about the lock screen.</link></p></item>
+</list>
+</section>
+
 <section id="message-tray">
 <title>Message Tray</title>
   <p>The message tray can be brought into view by moving your mouse into the
diff --git a/gnome-help/C/shell-lockscreen.page b/gnome-help/C/shell-lockscreen.page
new file mode 100644
index 0000000..3661234
--- /dev/null
+++ b/gnome-help/C/shell-lockscreen.page
@@ -0,0 +1,36 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic" style="task"
+      id="shell-lockscreen">
+  <info>
+
+    <link type="guide" xref="shell-overview#desktop" />
+
+    <revision pkgversion="3.6.1" version="0.1" date="2012-11-11" status="review"/>
+
+    <credit type="author copyright">
+      <name>Michael Hill</name>
+      <email>mdhillca gmail com</email>
+      <years>2012</years>
+    </credit>
+
+    <desc>The decorative and functional lock screen conveys useful information.</desc>
+  </info>
+
+  <title>The Lock Screen</title>
+  <p>The lock screen means that you can see what is happening while your computer
+ is locked, and it allows you to get a summary of what has been happening while
+ you have been away. The lock screen curtain shows an attractive image on the
+ screen while your computer is locked, and provides useful information:</p>
+  <list>
+    <item><p>the name of the logged-in user</p></item>
+    <item><p>date and time, and certain notifications</p></item>
+    <item><p>battery and network status</p></item>
+    <item><p>the ability to control media playback - change the volume, skip a track or pause your music without having to enter a password</p></item>
+  </list>
+
+<p>To unlock your computer, raise the lock screen curtain by dragging it upward
+with the cursor, or by pressing <key>Esc</key> or <key>Enter</key>. This will
+reveal the login screen, where you can enter your password to unlock. You can
+also switch users if your computer is configured for more than one.</p>
+
+</page>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index f56790d..b4e5167 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -71,6 +71,7 @@ HELP_MEDIA = \
 	figures/shell-exit.png \
 	figures/shell-files.png \
 	figures/shell-introduction.png \
+	figures/shell-lock.png \
 	figures/shell-keyboard-shortcuts.png \
 	figures/shell-notification.png \
 	figures/shell-top-bar.png \
@@ -337,6 +338,7 @@ HELP_FILES = \
 	shell-exit.page \
 	shell-introduction.page \
 	shell-keyboard-shortcuts.page \
+	shell-lockscreen.page \
 	shell-notifications.page \
 	shell-overview.page \
 	shell-terminology.page \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]