[tomboy/docs] Update link for conflicts in sync

[Paul Cutler <pcutler src gnome org>]

commit 7683857ca9c4c05c90e967be042b37e8280224ba
Author: Paul Cutler <pcutler gnome org>
Date:   Sat May 8 16:13:02 2010 -0500

    Update link for conflicts in sync

 help/C/TODO      |    1 -
 help/C/sync.page |   36 +++++++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)
---
diff --git a/help/C/TODO b/help/C/TODO
index 4fa5b41..aa32c40 100644
--- a/help/C/TODO
+++ b/help/C/TODO
@@ -20,6 +20,5 @@ Tomboy Addins Subpages:
 
 * Evolution Mail Integration: Do we need to call out the GTK# requirement?
 * SSH Sync Service: Check with Shaun - PackageKit link? (same with WebDav)
-* Tomboy Tools: Keysequences
 * Tomboy Tools Addins: Dropbox require (r)?
 
diff --git a/help/C/sync.page b/help/C/sync.page
index 28a331b..42bf53b 100644
--- a/help/C/sync.page
+++ b/help/C/sync.page
@@ -20,14 +20,44 @@
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
   </info>
 
- <title>Sync your Tomboy notes</title>
+ <title>Manually sync your Tomboy notes</title>
 
  <section id="sync">
 
-	<title>Syncing Notes</title>
+	<title>Manually Syncing Notes</title>
 	
-	<p>test</p>
+	<p>You can sync your notes one of three ways:</p>
+	
+	<list type="numbered">
+	  <item><p>From any note click the <gui>Tools</gui> icon
+	  and choose <gui>Synchronize Notes</gui>.</p></item>
+	  <item><p>In the <gui>Search All Notes</gui> dialog choose
+	  <guiseq><gui>Tools</gui><gui>Synchronize Notes</gui>
+	  </guiseq>.</p></item>
+	  <item><p>Using your mouse, right click on the Tomboy icon
+	  in your panel, taskbar or dock and choose <gui>Synchronize All Notes
+	  </gui>.</p></item>
+	</list>
 
  </section>
+ 
+ <section id="autosync">
+ 
+ 	<title>Sync Your Notes Automatically</title>
+ 	
+ 	<p>Tomboy can automatically sync your notes for you in the background.
+ 	It is recommended that you configure how you handle note conflicts
+ 	before enabling syncing automatically.  You can learn about handling
+ 	note conflicts in the <link xref="sync-setup#conflicts" />
+ 	Configure and Setup Sync page.
+ 	
+ 	<p>You can enable sync by opening <gui>Tomboy Preferences</gui> by 
+	using your mouse to right click on the Tomboy icon in your panel,
+	taskbar or dock and choose <gui>Preferences</gui> and then select
+	the <gui>Synchronization</gui> tab.  You can also open <gui> Tomboy
+	Preferences</gui> from the <gui>Search All Notes</gui> dialog. From
+	the menu choose <guiseq><gui>Edit</gui><gui>Preferences</gui>
+	</guiseq>.
+	</p>
 
  </page>