# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: heymrdjd@gmail.com-20100922183241-yswvej55wkne9sg2
# target_branch: bzr+ssh://bazaar.launchpad.net/~heymrdjd/xubuntu-\
#   docs/maverick/
# testament_sha1: 0e86ebf00e252adb9915f51a8eee9c0e909d7edb
# timestamp: 2010-09-22 13:35:30 -0500
# base_revision_id: heymrdjd@gmail.com-20100922125104-rlcw78ze93ioovry
# 
# Begin patch
=== modified file 'desktop-guide/internet/C/connecttoserver.xml'
--- desktop-guide/internet/C/connecttoserver.xml	2009-09-13 23:29:38 +0000
+++ desktop-guide/internet/C/connecttoserver.xml	2010-09-22 18:32:41 +0000
@@ -12,32 +12,39 @@
 	  ]>
 <section id="connecttoserver" status="review">
 	<title>Connect to a server</title>
-	<para>Xubuntu can connect to a variety of servers using &connecttoserver;</para>
+	<para>Xubuntu can connect to a variety of servers using <application>Gigolo</application></para>
 	
 	<section id="connecttoserver-ftp" status="review">
 		<title>FTP</title>
 		<orderedlist>
-			<listitem><para>Click &connecttoserver;.</para></listitem>
+			<listitem><para>Click &gigolo;.</para></listitem>
 			<listitem><para>Click <guilabel>Actions</guilabel>, then click <guilabel>Connect</guilabel>.</para></listitem>
-			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>Public FTP</guilabel> for an 
-			anonymous connection or <guilabel>FTP (With Login)</guilabel> if you have a username.</para></listitem>
+			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>FTP</guilabel> for both
+			anonymous connections and connections that require a username and password.</para></listitem>
 			<listitem><para>Enter the server address in <guilabel>Server</guilabel>, for example ftp.ubuntu.com.</para></listitem>
-			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Folder</guilabel> if you need to, this is optional.</para></listitem>
-			<listitem><para>If you chose <guilabel>FTP (With Login)</guilabel> you will also need to enter a username.</para></listitem>
-			<listitem><para>If you want a bookmark, click the checkbox and enter a bookmark name.</para></listitem>
+			<listitem><para>Enter <guilabel>Port</guilabel> if you need to, this is optional.</para></listitem>
+			<listitem><para>If you are attempting to connect to a server that requires you to login, you will enter a 				username in <guilabel>Username</guilabel>.</para></listitem>
 			<listitem><para>Click <guibutton>Connect</guibutton>.</para></listitem>
-			<listitem><para>If you chose <guilabel>FTP (With Login)</guilabel> you will be prompted for a password.</para></listitem>
-			</orderedlist>
+			<listitem><para>If you are attempting to connect to a server that requires you to login, 
+			you will be prompted to enter a password.</para></listitem>
+			<listitem><para>Upon successfully connecting to the server, an icon labelled with connection details will appear 
+			(i.e. ftp on ftp.ubuntu.com) in the <application>Gigolo</application> window.</para></listitem>
+			<listitem><para>If you want to bookmark this connection, right-click the icon representing the connection and
+ 			click <guilabel>Create Bookmark</guilabel>, then you can change the name of the connection icon, and the
+ 			connection options including the <guilabel>Autoconnect</guilabel> option. When enabled, <guilabel>Autoconnect</guilabel> 
+			will automatically initialize the connection to the server. Click <guilabel>OK</guilabel> to accept any changes and create
+			the bookmark.</para></listitem>
+		</orderedlist>
 	</section>
 	
 	<section id="connecttoserver-ssh" status="review">
 		<title>SSH</title>
 		<orderedlist>
-			<listitem><para>Click &connecttoserver;.</para></listitem>
+			<listitem><para>Click &gigolo;.</para></listitem>
 			<listitem><para>Click <guilabel>Actions</guilabel>, then click <guilabel>Connect</guilabel>.</para></listitem>
 			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>SSH</guilabel>.</para></listitem>
 			<listitem><para>Enter the server address in <guilabel>Server</guilabel>.</para></listitem>
-			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Folder</guilabel> if you need to, this is optional.</para></listitem>
+			<listitem><para>Enter <guilabel>Port</guilabel> if you need to, this is optional.</para></listitem>
 			<listitem><para>Enter <guilabel>Username</guilabel>.</para></listitem>
 			<listitem><para>Click <guibutton>Connect</guibutton>.</para></listitem>
 			<listitem><para>You will be prompted for a password.</para></listitem>
@@ -47,34 +54,34 @@
 	<section id="connecttoserver-windowsshare" status="review">
 		<title>Windows Share</title>
 		<orderedlist>
-			<listitem><para>Click &connecttoserver;.</para></listitem>
+			<listitem><para>Click &gigolo;.</para></listitem>
 			<listitem><para>Click <guilabel>Actions</guilabel>, then click <guilabel>Connect</guilabel>.</para></listitem>
 			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>Windows Share</guilabel>.</para></listitem>
 			<listitem><para>Enter the server address in <guilabel>Server</guilabel>.</para></listitem>
-			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Folder</guilabel> and <guilabel>Domain</guilabel> if you need to, this is optional.</para></listitem>
+			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Domain</guilabel> if you need to, this is optional.</para></listitem>
 			<listitem><para>Enter <guilabel>Username</guilabel>. You can enter a domain and username in the format DOMAIN\username.</para></listitem>
 			<listitem><para>Click <guibutton>Connect</guibutton>.</para></listitem>
-			<listitem><para>You will be prompted for a password if necessary.</para></listitem>
+			<listitem><para>You will be prompted for a password, if necessary.</para></listitem>
 			</orderedlist>
 	</section>
 
 	<section id="connecttoserver-webdav" status="review">
 		<title>WebDAV (HTTP)</title>
 		<orderedlist>
-			<listitem><para>Click &connecttoserver;.</para></listitem>
+			<listitem><para>Click &gigolo;.</para></listitem>
 			<listitem><para>Click <guilabel>Actions</guilabel>, then click <guilabel>Connect</guilabel>.</para></listitem>
 			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>WebDAV (HTTP)</guilabel>.</para></listitem>
 			<listitem><para>Enter the server address in <guilabel>Server</guilabel>.</para></listitem>
-			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Folder</guilabel> and <guilabel>Username</guilabel> if you need to, this is optional.</para></listitem>
+			<listitem><para>Enter <guilabel>Port</guilabel> and <guilabel>Username</guilabel> if you need to, this is optional.</para></listitem>
 			<listitem><para>Click <guibutton>Connect</guibutton>.</para></listitem>
-			<listitem><para>You will be prompted for a password if necessary.</para></listitem>
+			<listitem><para>You will be prompted for a password, if necessary.</para></listitem>
 			</orderedlist>
 	</section>
 
 	<section id="connecttoserver-custom" status="review">
 		<title>Custom</title>
 		<orderedlist>
-			<listitem><para>Click &connecttoserver;.</para></listitem>
+			<listitem><para>Click &gigolo;.</para></listitem>
 			<listitem><para>Click <guilabel>Actions</guilabel>, then click <guilabel>Connect</guilabel>.</para></listitem>
 			<listitem><para>From <guilabel>Service Type</guilabel> choose <guilabel>Custom Location</guilabel>.</para></listitem>
 			<listitem><para>Enter the server address in <guilabel>Location (URI)</guilabel>.</para></listitem>

=== modified file 'desktop-guide/libs/xubuntu.ent'
--- desktop-guide/libs/xubuntu.ent	2010-09-19 20:51:21 +0000
+++ desktop-guide/libs/xubuntu.ent	2010-09-22 18:32:41 +0000
@@ -65,6 +65,7 @@
 <!ENTITY games '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Games</guimenuitem></menuchoice>'>
 <!ENTITY gdesklets '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Accessories</guisubmenu><guimenuitem>gDesklets</guimenuitem></menuchoice>'>
 <!ENTITY gftp '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Network</guisubmenu><guimenuitem>gFTP</guimenuitem></menuchoice>'>
+<!ENTITY gigolo '<menuchoice><guimenu>Applications</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Gigolo</guimenuitem></menuchoice>'>
 <!ENTITY gimp '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Graphics</guisubmenu><guimenuitem>GIMP Image Editor</guimenuitem></menuchoice>'>
 <!ENTITY gnome-app-install '<menuchoice><guimenu>Applications</guimenu><guisubmenu>System</guisubmenu><guimenuitem>Add/Remove...</guimenuitem></menuchoice>'>
 <!ENTITY gnome-config-editor '<screen><command>gconf-editor</command></screen>'>

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWdjgvvgAABJfgAAQQGFxUBIA
AACv794QIABkRTaajamQyGjTaRiFGgBMBBkwQhDmaVnH5r9hMFQyJ7EUzThiw4Ixc/mQVpexbPS2
9yLLTxaFbWvXcN2zcydOQxpD652acQC4g4Z96jI5BipgKAAiM5Zz45Kd/4u5IpwoSGxwX3wA