[tomboy] [help] Fix formatting and broken link in sync.page

[Paul Cutler <pcutler src gnome org>]

commit 9fcdca86fdf5a553b455c2ff2fbc7467af830d78
Author: Paul Cutler <pcutler gnome org>
Date:   Fri Oct 22 08:04:58 2010 -0500

    [help] Fix formatting and broken link in sync.page
    
    Fix formattig in sync-setup.page and fix Managing Note Conflict link
    from sync.page to sync-setup.page

 help/C/sync-setup.page |   41 +++++++++++++++++++++++++++--------------
 help/C/sync.page       |    4 ++--
 2 files changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/help/C/sync-setup.page b/help/C/sync-setup.page
index 892fd54..d92d1b3 100644
--- a/help/C/sync-setup.page
+++ b/help/C/sync-setup.page
@@ -45,7 +45,7 @@
 
  <section id="conflict">
 
-	<title>Managing Note conflict when syncing</title>
+	<title>Managing Note Conflict</title>
 	
 	<p>You can set the default behavior for Tomboy when
 	a note is discovered to be a conflict.  This can occur
@@ -90,12 +90,15 @@
 
 	<title>Configure Sync using WebDav</title>
 	
-	<p>In order to synchronize your notes with a WebDAV server, you will need
-      	the wdfs FUSE file system installed.  Follow the documentation for your 	operating system to set up FUSE for your user.  You will also need the 		GNOME Keyring installed.
+	<p>In order to synchronize your notes with a WebDAV server, you will 
+	need the wdfs FUSE file system installed.  Follow the documentation for
+	 your operating system to set up FUSE for your user.  You will also 
+	 need the GNOME Keyring installed.
 	</p>
 	
 	<p>Choose <gui>WebDAV</gui> from the <gui>Service</gui>
- 	drop-down list. Fill in the connection information for your server, and 	then select the <gui>Save</gui> button.  
+ 	drop-down list. Fill in the connection information for your server, and
+ 	then select the <gui>Save</gui> button.  
  	You are now ready to synchronize your notes.</p>
 
  </section>
@@ -105,25 +108,34 @@
 	<title>Configure Sync using SSH</title>
 	
 	<p>In order to synchronize your notes with an SSH server, you will need
-      	the FUSE file system, also called <app>sshfs</app>installed.  Follow the 		documentation for your operating system to set up FUSE for your user.  
-      	You will also need an SSH key for your SSH server account, whi<app>GNOME 		Seahorse</app> application, which is also known as 
+      	the FUSE file system, also called <app>sshfs</app>installed.  Follow the
+      	documentation for your operating system to set up FUSE for your user.  
+      	You will also need an SSH key for your SSH server account, whi<app>GNOME 
+      	Seahorse</app> application, which is also known as 
       	<app>Passwords and Encryption Keys</app>.
 	</p>
 	
-	<p>It is recommended to use a third computer or server as the remote 		computer to store the syncronized notes that are to be synced between 		multiple computers.</p>
+	<p>It is recommended to use a third computer or server as the remote 
+	computer to store the syncronized notes that are to be synced between 
+	multiple computers.</p>
 
 	<p>Open <app>Passwords and Encryption Keys</app> by choosing 
 	<guiseq><gui>Applications</gui><gui>Accessories</gui>
 	<gui>Passwords and Encryption Keys</gui></guiseq>.  
-	Click on your key, and from the menu choose <guiseq><gui>Remote</gui> 		<gui>Configure Key for Secure Shell</gui></guiseq>  
-	and enter the domain name 
-	or IP address of the computer you want to sync to in Computer Name.  Enter 		the username of the remote computer in Computer Name: and click Set Up.
-	When prompted, enter the password and setting up your key will be 		completed.
+	Click on your key, and from the menu choose <guiseq><gui>Remote</gui>
+	<gui>Configure Key for Secure Shell</gui></guiseq>  
+	and enter the domain name or IP address of the computer you want to 
+	sync to in <gui>Computer Name</gui>.  Enter the username of the 
+	remote computer in <gui>Computer Name:</gui> and press <gui>Set Up</gui>. 
+	When prompted, enter the password and setting up your key will 
+	be completed.
 	</p>
 	
 	<p>In Tomboy, choose <gui>SSH</gui> from the <gui>Service</gui>
-	drop-down list. Fill in the connection information for your server, and select the <gui>Save</gui> button.  The <gui>Folder Path</gui>, 
-	while optional, should point at an empty folder. You are now ready to 		synchronize your notes.</p>
+	drop-down list. Fill in the connection information for your server, 
+	and select the <gui>Save</gui> button.  The <gui>Folder Path</gui>, 
+	while optional, should point at an empty folder. You are now ready to 
+	synchronize your notes.</p>
 
  </section>
 
@@ -132,7 +144,8 @@
 	<title>Configure Sync to a local folder</title>
 	
 	<p>You may want to synchronize your notes to a local folder if that 
-	folder is available to your other systems, or if that folder represents a 		local mount of a remote server.
+	folder is available to your other systems, or if that folder represents 
+	a local mount of a remote server.
 	</p>
 
 	<p>Choose Local Folder from the <gui>Service</gui>
diff --git a/help/C/sync.page b/help/C/sync.page
index b539e15..ebee723 100644
--- a/help/C/sync.page
+++ b/help/C/sync.page
@@ -48,8 +48,8 @@
  	<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#conflict" />
- 	Configure and Setup Sync page.</p>
+ 	note conflicts in the <link xref="sync-setup#conflict" /> 
+ 	page.</p>
  	
  	<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,