[gnome-user-docs/wip/system-admin-guide: 2/9] Pages updated and linked

[Jana Svarova <jsvarova src gnome org>]

commit 1d6fc4aecd836f826cf66545f8708f931f0d5652
Author: Jana Svarova <jsvarova redhat com>
Date:   Mon Jun 17 18:11:38 2013 +0200

    Pages updated and linked
    
    The following pages have been updated:
    change-desktop-icon.page, desktop-files.page,
    disable-user-list.page, icons.page, and mime-types.page.

 system-admin-guide/C/change-desktop-icon.page |   22 ++++++++++----
 system-admin-guide/C/desktop-files.page       |   38 +++++++++++++++++-------
 system-admin-guide/C/disable-user-list.page   |   15 +++++++--
 system-admin-guide/C/icons.page               |   10 +++---
 system-admin-guide/C/mime-types.page          |    3 +-
 5 files changed, 60 insertions(+), 28 deletions(-)
---
diff --git a/system-admin-guide/C/change-desktop-icon.page b/system-admin-guide/C/change-desktop-icon.page
index 9ee4e45..a81a72c 100644
--- a/system-admin-guide/C/change-desktop-icon.page
+++ b/system-admin-guide/C/change-desktop-icon.page
@@ -5,6 +5,7 @@
   <info>
     <link type="guide" xref="hardware-auth"/>
     <link type="seealso" xref="icons"/>
+    <link type="seealso" xref="desktop-files"/>
 
     <desc>How do I change an icon in the desktop?</desc>
 
@@ -19,15 +20,22 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
-<title>Change the icon theme in the desktop</title>
+<title>Change an application icon</title>
+
+  <p>To change an application icon, you need to edit the <em>Icon=</em> entry of
+  the appropriate desktop file. To do so, follow the procedure below:</p>
 
-<!-- Jasper> jsvarova_, gnome-tweak-tool has a setting for that-->
-  <p></p>
 <steps>
-  <item><p></p></item>
-  <item><p></p></item>
-  <item><p></p></item>
+  <item><p>Open the desktop file concerning the application, the icon of which
+  you want to change.</p></item>
+  <item><p>Edit the <em>Icon=</em> entry with the new icon specifications.</p></item>
+  <item><p>Save the changes.</p></item>
+  <item><p>In the terminal, open the <file>/usr/share/applications/</file> directory.</p></item>
+  <item><p>Run the <cmd>update-desktop-database</cmd> command to update the
+  content of the desktop file.</p></item>
 </steps>
 
- <p>For more information, see also <link xref="icons">Icons</link>.</p>
+<p>For more information. see
+  <link href = "http://www.freedesktop.org/wiki/";>freedesktop.org</link>.</p>
+
 </page>
diff --git a/system-admin-guide/C/desktop-files.page b/system-admin-guide/C/desktop-files.page
index 4670e87..1ef6390 100644
--- a/system-admin-guide/C/desktop-files.page
+++ b/system-admin-guide/C/desktop-files.page
@@ -5,6 +5,7 @@
   <info>
     <link type="guide" xref="hardware-auth"/>
 
+    
     <desc>This page introduces the concept of desktop files.</desc>
 
     <revision pkgversion="3.8" date="2013-06-11" status="draft"/>
@@ -27,21 +28,36 @@
 <title>Desktop files</title>
 
   <p>A desktop file is a text file with the .desktop extension which contains a
-  list of the configurations for an application. In othrer words, it is a configuration file
-  describing how a particular program is to be launched. The structure of a
-  desktop file takes the form of key/value pairs.</p>
+  list of configuration entries of an application. In other words, it is a
+  configuration file describing how a particular program is to be launched. The
+  structure of a desktop file takes the form of key/value pairs.</p>
+
+  <p>The desktop files are located in the <file>/usr/share/applications/</file>
+  directory.</p>
 
-<p>Here is an example of a desktop file content:</p>
+  <p>There are three types of desktop entries: Application, Link, and Directory.</p>
+  
+<example>
+<p>Desktop file content sample:</p>
 <code>
 [Desktop Entry]
-Type=Application
-Name=Files
-Exec=nautilus -n
-OnlyShowIn=GNOME;Unity;
-AutostartCondition=GSettings org.gnome.desktop.background show-desktop-icons
+Type=<input>Application</input>
+Name= <input>Files</input>
+Exec=<input>nautilus -n</input>
+Categories= <input>GNOME;GTK;Utility;Core;</input>
+Keywords=<input>Files;Folders;Directories;Media;Storage;</input>
 </code>
 
-  <!--p>The desktop files are located in the <file>/usr/share/applications/</file>
-  directory.</p-->
+  <p>The <code>Exec</code> key stands for executable command. The value to match
+  it is the actual command by which you can start the application. You can also
+  supply one or more arguments of the command, such as <code>-n</code> in the
+  above example.</p>
+  <p>The <code>Categories</code> key specifies the category of a menu in which
+  the entry should be shown.</p>
+  <p>The <code>Keywords</code> key is a list of words which describe an
+  application. This list can be useful, for example, for easier searching for an
+  application in
+  <link xref="help:gnome-help/shell-terminology">Activities overview</link>.</p>
+</example>
 
 </page>
diff --git a/system-admin-guide/C/disable-user-list.page b/system-admin-guide/C/disable-user-list.page
index 36e3028..a79607c 100644
--- a/system-admin-guide/C/disable-user-list.page
+++ b/system-admin-guide/C/disable-user-list.page
@@ -22,15 +22,22 @@
 
   <p>The login screen normally shows a list of available users to log in as
   because the default setting for the <em>disable-user-list</em> key is the
-  <var>false</var> option. This setting can be disabled by manually modifying the
-  systemwide configuration.</p>
+  <var>false</var> option. This setting can be disabled by manually editing the
+  system-wide configuration.</p>
 
 <!--steps>
   <title>Edit the gconf file:</title>
-  <item><p>Open the <file>/etc/gconf/gconf.xml.defaults/%gconf-tree.xml</file> file.</p></item>
+  <item><p>Open the <file>/etc/gconf/gconf.xml.defaults/%gconf-tree.xml</file> file
+  in the text editor.</p></item>
   <item><p>Change the boolean for disable_user_list from <var>false</var> to
   <var>true</var>.</p></item>
   <item><p>Save the changes.</p></item>
-</steps-->
+</steps
+
+I'm not sure the disable-user-list boolean even exists. Is it really possible to disable user list?
+
+-->
+
+
 
 </page>
diff --git a/system-admin-guide/C/icons.page b/system-admin-guide/C/icons.page
index 54f89c2..d45765d 100644
--- a/system-admin-guide/C/icons.page
+++ b/system-admin-guide/C/icons.page
@@ -5,8 +5,9 @@
   <info>
     <link type="guide" xref="hardware-auth"/>
     <link type="seealso" xref="change-desktop-icon"/>
+    <link type="seealso" xref="desktop-files"/>
 
-    <desc>This page introduces the concept of icons.</desc>
+    <desc>This page introduces the concept of application icons.</desc>
 
     <revision pkgversion="3.8" date="2013-06-11" status="draft"/>
 
@@ -20,10 +21,9 @@
   </info>
 
 <title>Icons</title>
-<p> For system-wide themes the icons are stored in either
-<file>/usr/share/icons</file> or <file>/usr/local/share/icons</file> files.</p>
-  <!--p>Icons are located in the <file>/usr/share/mime/icons/</file> directory</p-->
-
 
+<p> For system-wide themes, the icons are stored in either
+<file>/usr/share/icons</file> file.</p>
+<!-- NEEDS TO BE CHECKED-->
 
 </page>
diff --git a/system-admin-guide/C/mime-types.page b/system-admin-guide/C/mime-types.page
index 9fd3826..d34246d 100644
--- a/system-admin-guide/C/mime-types.page
+++ b/system-admin-guide/C/mime-types.page
@@ -27,6 +27,7 @@
   <p>There is a number of MIME media types, such as application, audio, image,
   message, model, multipart, text, and video.</p>
 
-  <!--p>Different MIME types are located in the <file>/usr/share/mime/</file> directory</p-->
+  <p>Different MIME types are located in the <file>/usr/share/mime/</file> directory</p>
+  <!-- NEEDS TO BE CHECKED-->
 
   </page>