[gnome-user-docs] Contacts pages edited, added

[Michael Hill <mdhill src gnome org>]

commit 862ea4efb1255daee8e3be117c6a4d334412d83a
Author: Michael Hill <mdhill src gnome org>
Date:   Tue Aug 14 15:56:46 2012 -0400

    Contacts pages edited, added

 gnome-help/C/contacts-add-remove.page              |    2 +-
 gnome-help/C/contacts-connect.page                 |   37 ++++++++++++++++++++
 ...tacts-import.page => contacts-import.page.stub} |   16 --------
 ...-unlink.page.stub => contacts-link-unlink.page} |   27 +++++++-------
 gnome-help/C/contacts-search.page                  |   21 +++++++++--
 gnome-help/C/contacts-setup.page                   |   25 +++++++++----
 gnome-help/Makefile.am                             |    3 +-
 7 files changed, 88 insertions(+), 43 deletions(-)
---
diff --git a/gnome-help/C/contacts-add-remove.page b/gnome-help/C/contacts-add-remove.page
index 735cb2a..3a27215 100644
--- a/gnome-help/C/contacts-add-remove.page
+++ b/gnome-help/C/contacts-add-remove.page
@@ -32,7 +32,7 @@
   <item><p>In the <gui>New contact</gui> window, enter the contact name and the
    desired information. Click on the menu next to each field to choose
    <gui>Work</gui>, <gui>Home</gui>, <gui>Other</gui>, or <gui>Custom...</gui>
-   <gui>Custom</gui> allows you to in your own category.</p></item>
+   (<gui>Custom</gui> allows you to type in your own category name.)</p></item>
   <item><p>Click <gui style="button">Create Contact</gui>.</p></item>
 </steps>
 
diff --git a/gnome-help/C/contacts-connect.page b/gnome-help/C/contacts-connect.page
new file mode 100644
index 0000000..3a869f3
--- /dev/null
+++ b/gnome-help/C/contacts-connect.page
@@ -0,0 +1,37 @@
+<page xmlns="http://projectmallard.org/1.0/";
+      type="topic" style="task"
+      id="contacts-connect">
+  <info>
+    <link type="guide" xref="contacts"/>
+
+    <revision pkgversion="3.5.5" date="2012-08-14" status="draft"/>
+
+    <credit type="author copyright">
+      <name>Michael Hill</name>
+      <email>mdhillca gmail com</email>
+      <years>2012</years>
+    </credit>
+
+    <desc>Email, chat with, or phone a contact</desc>
+  </info>
+
+  <title>Connect with your contact</title>
+
+  <comment>
+    <cite date="2012-08-14" href="mailto:mdhill src gnome org">Michael Hill</cite>
+    <p>This assumes the reader knows how to.... By the end of this page,
+    the reader will be able to....</p>
+  </comment>
+
+  <p>To email, chat with, or phone someone in <app>Contacts</app>:</p>
+
+  <steps>
+    <item><p>
+      Select the contact you wish to contact in the left pane.
+    </p></item>
+    <item><p>Choose email, chat, or phone from the button bar in the right pane.</p></item>
+    <item><p>The corresponding application will be launched using the contact's
+     details.</p></item>
+  </steps>
+
+</page>
diff --git a/gnome-help/C/contacts-import.page b/gnome-help/C/contacts-import.page.stub
similarity index 68%
rename from gnome-help/C/contacts-import.page
rename to gnome-help/C/contacts-import.page.stub
index b212e10..bbc6888 100644
--- a/gnome-help/C/contacts-import.page
+++ b/gnome-help/C/contacts-import.page.stub
@@ -28,13 +28,6 @@
 <title>Import contacts</title>
 
 <steps>
-  <item><p>To open <gui>Contacts</gui>, click on <gui>Activities</gui> in the
-   top left corner of the screen. Click on <gui>Applications</gui> and select
-   <gui>Contacts</gui> from the menu that appears. The <gui>Contacts</gui>
-   window will open up.</p></item>
-  <item><p>To add (or remove) a single contact manually, click on the
-   <gui style="button">+</gui> (or <gui style="button">-</gui>) button and
-   follow the prompts.</p></item>
   <item><p>To import (or remove) contacts from an online account, click on the
    <gui style="button">Online Accounts</gui> button. The <gui>Online Accounts</gui>
    window will open. Click on <gui style="button">+</gui> to add an account, or
@@ -50,15 +43,6 @@
    account will appear in the left hand panel of the <gui>Online Accounts</gui>
    window, and the right hand panel will allow you to control what you want to
    use the account for.</p></item>
-  <item><p>Close the <gui>Online Accounts</gui> window. If your contacts don't
-   appear in the <gui>Contacts</gui> window, close it and reopen it. The
-   contacts from your online account will appear in the left hand panel of the
-   window. Click on a contact to bring up its details in the right hand window,
-   where you will be able to edit, delete, or add a note to the contact. See
-   also <link xref="contacts-edit-details">Editing contacts</link>. To send an
-   email to the contact, click on the envelope that appears by the email
-   address.</p></item>
-
 </steps>
 
 <note>
diff --git a/gnome-help/C/contacts-link-unlink.page.stub b/gnome-help/C/contacts-link-unlink.page
similarity index 69%
rename from gnome-help/C/contacts-link-unlink.page.stub
rename to gnome-help/C/contacts-link-unlink.page
index 5a35586..5434259 100644
--- a/gnome-help/C/contacts-link-unlink.page.stub
+++ b/gnome-help/C/contacts-link-unlink.page
@@ -6,13 +6,18 @@
 
     <link type="guide" xref="contacts"/>
 
-    <desc></desc>
-    <revision pkgversion="3.4.0" date="2012-02-19" status="outdated"/>
+    <desc>Combine information for a contact from multiple sources</desc>
+    <revision pkgversion="3.5.5" date="2012-02-19" status="review"/>
     <credit type="author">
       <name>Tiffany Antopolski</name>
       <email>tiffany antopolski gmail com</email>
     </credit>
 
+    <credit type="editor">
+      <name>Michael Hill</name>
+      <email>mdhillca gmail com</email>
+    </credit>
+
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
@@ -27,14 +32,14 @@
 
   <steps>
    <item><p>
-     Select the contact you wish to link by clicking on one of the entries you
-     have for the person.
+     Select the contact you wish to link in the left pane.
    </p></item>
    <item><p>
-     Click <gui>More</gui>.
+     Right-click on any editable element in the right pane and select
+      <gui>Add/Remove Linked Contacts...</gui>.
    </p></item>
    <item><p>
-     Select the second entry you wish to link with the first contact entry.
+     Select the entry you wish to link with the first contact entry.
    </p></item>
    <item><p>
     Click <gui>Link</gui>
@@ -62,20 +67,16 @@
 
   <steps>
    <item><p>
+     Select the contact you wish to unlink in the left pane.
    </p></item>
    <item><p>
+     Locate the section you wish to unlink in the right pane.
    </p></item>
    <item><p>
-   </p></item>
-   <item><p>
-   </p></item>
-   <item><p>
+    Click <gui>Unlink</gui>.
    </p></item>
   </steps>
 
-<note>
-  <p></p>
-</note>
 </section>
 
 </page>
diff --git a/gnome-help/C/contacts-search.page b/gnome-help/C/contacts-search.page
index 00fcb3e..550a5f3 100644
--- a/gnome-help/C/contacts-search.page
+++ b/gnome-help/C/contacts-search.page
@@ -25,10 +25,9 @@
 
   <p>You can search for an online contact in one of two ways:</p>
 
-
    <steps>
     <item><p>
-      In the <gui>Activities</gui> overview, type the name of the contact.
+      In the <gui>Activities</gui> overview, start typing the name of the contact.
     </p></item>
     <item><p>
       The icon of the contact will appear.
@@ -38,7 +37,21 @@
     </p></item>
    </steps>
 
-  <p>You can also type the name of the contact in the search box of
-   <app>Contacts</app>.</p>
+  <p>To search inside <app>Contacts</app>:</p>
+
+   <steps>
+    <item><p>
+     Press <keyseq><key>Ctrl</key><key>F</key></keyseq> to open the search box.
+    </p></item>
+    <item><p>
+      Start typing the name of the contact.
+    </p></item>
+   </steps>
+
+ <note style="tip">
+  <p>
+   Press <key>Esc</key> to close the search box.
+  </p>
+ </note>
 
 </page>
diff --git a/gnome-help/C/contacts-setup.page b/gnome-help/C/contacts-setup.page
index e3a0a1a..0f6b1ff 100644
--- a/gnome-help/C/contacts-setup.page
+++ b/gnome-help/C/contacts-setup.page
@@ -4,7 +4,7 @@
   <info>
     <link type="guide" xref="contacts"/>
 
-    <revision pkgversion="3.5.5" date="2012-08-13" status="review"/>
+    <revision pkgversion="3.5.5" date="2012-08-13" status="draft"/>
 
     <credit type="author copyright">
       <name>Michael Hill</name>
@@ -12,7 +12,7 @@
       <years>2012</years>
     </credit>
 
-    <desc>Store your contacts in a local address book or in an Online Account.</desc>
+    <desc>Store your contacts in a local address book or in an online account.</desc>
   </info>
 
   <title>Starting Contacts for the first time</title>
@@ -24,12 +24,21 @@
   </comment>
 
   <p>When you run <app>Contacts</app> for the first time, the
-   <gui>Contacts Setup</gui> window opens. If your </p>
+   <gui>Contacts Setup</gui> window opens.</p>
+   
+   <p>If you have <link xref="accounts">online accounts</link> configured, they
+    are listed with <gui>Local Address Book</gui>. Select an item from the list
+    and click <gui style="button">Select</gui>.</p>
+  
+  <note>
+    <p>Click the <gui style="button">Online Account Settings</gui> to edit
+     existing account settings.</p>
+  </note>
+  
+   <p>If you have no online accounts configured, click
+    <gui style="button">Online Accounts</gui> to begin the setup. If you don't
+    wish to set up online accounts at this time, click
+    <gui style="button">Local Address Book</gui>.</p>
 
-  <steps>
-    <item><p>First step...</p></item>
-    <item><p>Second step...</p></item>
-    <item><p>Third step...</p></item>
-  </steps>
 
 </page>
diff --git a/gnome-help/Makefile.am b/gnome-help/Makefile.am
index b988f26..1d7f3f6 100644
--- a/gnome-help/Makefile.am
+++ b/gnome-help/Makefile.am
@@ -155,8 +155,9 @@ HELP_FILES = \
 	color-why-calibrate.page \
 	color-whyimportant.page \
   contacts-add-remove.page \
+  contacts.page \
+  contacts-connect.page \
 	contacts-edit-details.page \
-	contacts-import.page \
 	contacts-link-unlink.page \
 	contacts-search.page \
 	contacts-setup.page \