diff -Nru ubuntu-docs-10.10.3/debian/changelog ubuntu-docs-10.10.4/debian/changelog
--- ubuntu-docs-10.10.3/debian/changelog	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/debian/changelog	2010-12-10 16:55:21.000000000 +0000
@@ -1,3 +1,10 @@
+ubuntu-docs (10.10.4) maverick-proposed; urgency=low
+
+  * ldif at openldap installation is broken (LP: #677998)
+    + serverguide/C/network-auth.xml 
+
+ -- Mahyuddin Susanto <udienz@gmail.com>  Mon, 06 Dec 2010 22:59:57 +0700
+
 ubuntu-docs (10.10.3) maverick; urgency=low
 
   * Amend font-family for browser startpage (LP: #195590)
diff -Nru ubuntu-docs-10.10.3/internet/C/adsl.xml ubuntu-docs-10.10.4/internet/C/adsl.xml
--- ubuntu-docs-10.10.3/internet/C/adsl.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/internet/C/adsl.xml	2010-12-10 16:52:33.000000000 +0000
@@ -15,11 +15,11 @@
 	<title>ADSL Modems</title>
 	<sect1 id="modems-adsl-usb" status="review">
 		<title>USB ADSL Modems</title>				
-		<para>Often parts of ADSL USB modem drivers are proprietary, closed source software and so cannot be supplied with Ubuntu. To get a modem to work with these drivers, you will need to download files from Internet with a computer having a working connection, then transfer the downloaded files to your Ubuntu installation.</para>
-		<para>If you have a modem that can connect both via USB and ethernet, or an ethernet router, you should use the ethernet connection.</para>
-		<para>USB modem installation will require Internet access to download the necessary proprietary drivers. Configuration is beyond the scope of this guide; please see the links to the relevant installation instructions on the Ubuntu community help site, below.</para>
+		<para>Sometimes drivers for USB ADSL modems are proprietary, closed source software, and due to legal restrictions they cannot be supplied with Ubuntu by default. To get a modem to work with these drivers, you will need to download files from the Internet with a computer that has Internet access, then transfer the downloaded files to your Ubuntu installation.</para>
+		<para>If you have a modem that can connect to a computer via USB and ethernet, or have an ethernet router, you should use the ethernet connection as that is the preferred method to gain access to the Internet.</para>
+		<para>Configuration of the drivers for USB ADSL modems is beyond the scope of this guide; please see the links to the relevant installation instructions on the Ubuntu community help site below.</para>
 		<para>To identify the model of your modem, note the name and number on the front. You may have to look for a label to discover the exact model. Consult the list below to see which driver your modem requires, and note the link.</para>
-		<para>When you go online to download the necessary drivers, you can download the relevant drivers using the links provided.</para>
+		<para>You can download the relevant drivers using the following links.</para>
 
 		<orderedlist numeration='arabic'>
 			<listitem><para>Speedtouch modems:</para>
diff -Nru ubuntu-docs-10.10.3/internet/C/connecting.xml ubuntu-docs-10.10.4/internet/C/connecting.xml
--- ubuntu-docs-10.10.3/internet/C/connecting.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/internet/C/connecting.xml	2010-12-10 16:52:33.000000000 +0000
@@ -43,7 +43,7 @@
     		<listitem>
     		    <para>
     		    Right click the Network Manager icon in the system notification 
-    		    area and click <guilabel>Edit Connections</guilabel>.
+    		    area and click <guilabel>Edit Connections...</guilabel>
     		    </para>
     		</listitem>
     		<listitem>
@@ -185,8 +185,8 @@
     <procedure>
     	<step>
     	  <para>
-    	  Right-click the Network Manager icon in the system notification area 
-    	  and click <guilabel>Edit Connections</guilabel>
+    	  Right click the Network Manager icon in the system notification area 
+    	  and click <guilabel>Edit Connections...</guilabel>
     	  </para>
     	</step>
     	<step>
@@ -215,7 +215,7 @@
 	<title>Cisco VPN</title>
 	<caution><para>You will need to have <ulink url="apt:network-manager-vpnc">network-manager-vpnc</ulink> and <ulink url="apt:network-manager-vpnc-gnome">network-manager-vpnc-gnome</ulink> installed to be able to connect to a Cisco VPN.</para></caution>
 	<procedure>
-		<step><para>Right click the Network Manager icon in the system notification area and click <guilabel>Edit Connections</guilabel>.</para></step>
+		<step><para>Right click the Network Manager icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
 		<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
 		<step><para>Click <guibutton>Add</guibutton>.</para></step>
 		<step><para>Select <guilabel>Cisco Compatible VPN (vpnc)</guilabel> from the drop down box.</para></step>
@@ -266,7 +266,7 @@
 		<title>Importing Configuration</title>
 		<para>You can use a previously saved configuration file to import VPN connection settings.</para>
 		<procedure>
-			<step><para>Right click the Network Manager icon in the system notification area and click <guilabel>Edit Connections</guilabel>.</para></step>
+			<step><para>Right click the Network Manager icon in the system notification area and click <guilabel>Edit Connections...</guilabel></para></step>
 			<step><para>Select the <guilabel>VPN</guilabel> tab.</para></step>
 			<step><para>Click <guibutton>Import</guibutton>.</para></step>
 			<step><para>Select your config file and click <guibutton>Open</guibutton>.</para></step>
diff -Nru ubuntu-docs-10.10.3/internet/C/networking.xml ubuntu-docs-10.10.4/internet/C/networking.xml
--- ubuntu-docs-10.10.3/internet/C/networking.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/internet/C/networking.xml	2010-12-10 16:52:33.000000000 +0000
@@ -63,7 +63,7 @@
 				<para><application>Ubuntu One Preferences</application> shows how much of your storage capacity you are currently using as well as provides account management tools. You can always access it from &ubuntu-one;.</para>
 				<para>The <guilabel>Account</guilabel> tab displays your account information like name and email address and provides links to more account management and technical support resources.</para>
 				<para>The <guilabel>Devices</guilabel> tab lists all of the devices that are currently added to synchronize with your account. Devices are either computers or mobile phones. For the computer that you are currently using, you can adjust how much of your bandwidth is used by synchronization and connect or reconnect to <application>Ubuntu One</application>. You can also remove computers and mobile phones from your <application>Ubuntu One</application> account.</para>
-				<para>The <guilabel>Services</guilabel> tab is where you manage what <application>Ubuntu One</application> features synchronize with your cloud storage and other computers. You can enable or disble the synchronization of files, purchased music, contacts, and bookmarks.</para>
+				<para>The <guilabel>Services</guilabel> tab is where you manage what <application>Ubuntu One</application> features synchronize with your cloud storage and other computers. You can enable or disable the synchronization of files, purchased music, contacts, and bookmarks.</para>
 			</sect3>
 			<sect3 id="ubuntuone-moreinfo">
 			<title>More information</title>
diff -Nru ubuntu-docs-10.10.3/internet/C/web-apps.xml ubuntu-docs-10.10.4/internet/C/web-apps.xml
--- ubuntu-docs-10.10.3/internet/C/web-apps.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/internet/C/web-apps.xml	2010-12-10 16:52:33.000000000 +0000
@@ -29,7 +29,7 @@
 			<sect3 id="web-browsing-addons-commonrestricted" status="review">
 				<title>Quickly install common plugins</title>
 				<para>It is possible to install a whole set of commonly-used restricted plugins at once, by installing the <application>Ubuntu restricted extras</application> package.</para>
-				<warning><para><emphasis>Restricted plugins</emphasis> are those which cannot be distributed with Ubuntu because of legal issues surrounding their use in some countries. Check that you are allowed to use this software before installing it. See the <ulink url='http://www.ubuntu.com/ubuntu/licensing'>Ubuntu website</ulink> for more information on restricted software.</para></warning>
+				<warning><para><emphasis>Restricted plugins</emphasis> are those which cannot be distributed with Ubuntu because of legal issues surrounding their use in some countries. Check that you are allowed to use this software before installing it. See the <ulink url='http://www.ubuntu.com/project/about-ubuntu/licensing'>Ubuntu website</ulink> for more information on restricted software.</para></warning>
 				<para><ulink url="apt:ubuntu-restricted-extras">Click here</ulink> to install the <application>ubuntu-restricted-extras</application> package.</para>
 				<para>As well as plugins and multimedia codecs, a set of Windows fonts will also be installed.</para>
 				<para>The following plugins and codecs are installed by the <application>Ubuntu restricted extras</application> package:</para>
diff -Nru ubuntu-docs-10.10.3/libs/global.ent ubuntu-docs-10.10.4/libs/global.ent
--- ubuntu-docs-10.10.3/libs/global.ent	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/libs/global.ent	2010-12-10 16:52:33.000000000 +0000
@@ -6,14 +6,14 @@
 <!ENTITY sg-title 'Server Guide'>
 
 <!-- VERSIONS -->
-<!ENTITY distro-version 'Maverick Meerkat'>
-<!ENTITY distro-rev '10.10'>
-<!ENTITY distro-rev-short '10.10'>
+<!ENTITY distro-version 'Natty Narwhal'>
+<!ENTITY distro-rev '11.04'>
+<!ENTITY distro-rev-short '11.04'>
 <!-- the distro-rev-short entity should not include the "LTS" in a long term release and can be used for url links --> 
-<!ENTITY distro-release-date "October 2010">
-<!ENTITY distro-support-date "April 2012">
-<!ENTITY distro-short-codename "maverick">
-<!ENTITY distro-apt-cd-name "Ubuntu 10.10_Maverick_Meerkat">
+<!ENTITY distro-release-date "April 2011">
+<!ENTITY distro-support-date "October 2012">
+<!ENTITY distro-short-codename "natty">
+<!ENTITY distro-apt-cd-name "Ubuntu 11.04_Natty_Narwhal">
 <!ENTITY linux-kernel-version "2.6.35">
 
 
@@ -46,28 +46,28 @@
 <!ENTITY ubuntu-packages 'http://packages.ubuntu.com' >
 <!ENTITY ubuntu-web 'http://www.ubuntu.com' >
 <!ENTITY ubuntu-main 'http://www.ubuntu.com' >
-<!ENTITY ubuntu-download 'http://www.ubuntu.com/download' >
-<!ENTITY ubuntu-forums 'http://www.ubuntu.com/community/forums' >
+<!ENTITY ubuntu-download 'http://www.ubuntu.com/desktop/get-ubuntu/download' >
+<!ENTITY ubuntu-forums 'http://www.ubuntu.com/support/community/webforums' >
 <!ENTITY ubuntu-components 'http://www.ubuntu.com/ubuntu/components' >
-<!ENTITY ubuntu-lists 'http://lists.ubuntu.com' >
-<!ENTITY ubuntu-wiki 'http://wiki.ubuntu.com' >
+<!ENTITY ubuntu-lists 'https://lists.ubuntu.com' >
+<!ENTITY ubuntu-wiki 'https://wiki.ubuntu.com' >
 <!ENTITY ubuntu-bugzilla 'https://launchpad.net/distros/ubuntu/+bugs' >
-<!ENTITY ubuntu-doc-bugs 'https://launchpad.net/products/ubuntu-doc/+bugs' >
+<!ENTITY ubuntu-doc-bugs 'http://bugs.launchpad.net/ubuntu/+source/ubuntu-docs' >
 <!ENTITY ubuntu-support 'http://www.ubuntu.com/support' >
-<!ENTITY ubuntu-paidsupport 'http://www.ubuntu.com/support/paid' >
+<!ENTITY ubuntu-paidsupport 'http://www.ubuntu.com/support/services' >
 <!ENTITY ubuntu-freesupport 'http://www.ubuntu.com/support/free' >
 <!ENTITY ubuntu-comments 'http://www.ubuntuforums.org/showthread.php?p=21787' >
-<!ENTITY ubuntu-documentation 'http://help.ubuntu.com' >
+<!ENTITY ubuntu-documentation 'https://help.ubuntu.com' >
 <!ENTITY ubuntu-documentation-repos 'https://docteam.ubuntu.com/repos/trunk' >
 <!ENTITY ubuntu-doc-team 'https://wiki.ubuntu.com/DocumentationTeam' >
-<!ENTITY ubuntu-doc-list 'http://lists.ubuntu.com/mailman/listinfo/ubuntu-doc' >
-<!ENTITY ubuntu-shipit 'http://shipit.ubuntu.com' >
-<!ENTITY ubuntu-launchpad 'https://launchpad.ubuntu.com' >
-<!ENTITY ubuntu-rosetta 'https://launchpad.ubuntu.com/rosetta' >
+<!ENTITY ubuntu-doc-list 'https://lists.ubuntu.com/mailman/listinfo/ubuntu-doc' >
+<!ENTITY ubuntu-shipit 'https://shipit.ubuntu.com' >
+<!ENTITY ubuntu-launchpad 'https://launchpad.net/ubuntu' >
+<!ENTITY ubuntu-rosetta 'https://launchpad.net/rosetta' >
 <!ENTITY ubuntu-planet 'http://planet.ubuntu.com' >
-<!ENTITY ubuntu-philosophy 'http://www.ubuntu.com/ubuntu/philosophy' >
-<!ENTITY ubuntu-participate 'http://www.ubuntu.com/community/participate/' >
-<!ENTITY ubuntu-marketplace 'http://www.ubuntu.com/support/marketplace' >
+<!ENTITY ubuntu-philosophy 'http://www.ubuntu.com/project/about-ubuntu/our-philosophy' >
+<!ENTITY ubuntu-participate 'http://www.ubuntu.com/community/get-involved' >
+<!ENTITY ubuntu-marketplace 'http://webapps.ubuntu.com/marketplace/' >
 <!ENTITY ubuntu-hwdb 'http://hwdb.ubuntu.com' >
 
 <!-- UBUNTU WIKI RESOURCES -->
@@ -92,8 +92,8 @@
 <!ENTITY kubuntu-packages 'http://packages.ubuntu.com/edgy/' >
 <!ENTITY kubuntu-cdpackages-nodefault 'http://people.ubuntu.com/~cjwatson/seeds/kubuntu-edgy/ship' >
 <!ENTITY kubuntu-lists 'http://lists.ubuntu.com/archives/kubuntu-users/' >
-<!ENTITY kubuntu-lists-users 'http://lists.ubuntu.com/mailman/listinfo/kubuntu-users/' >
-<!ENTITY kubuntu-lists-devel 'http://lists.ubuntu.com/mailman/listinfo/kubuntu-devel/' >
+<!ENTITY kubuntu-lists-users 'https://lists.ubuntu.com/mailman/listinfo/kubuntu-users/' >
+<!ENTITY kubuntu-lists-devel 'https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel/' >
 <!ENTITY kubuntu-mirrors 'http://distrowatch.com/kubuntu' >
 <!ENTITY kubuntu-forums 'http://kubuntuforums.net' >
 <!ENTITY kubuntu-wiki 'https://wiki.kubuntu.org' >
@@ -117,8 +117,8 @@
 <!ENTITY kde 'http://www.kde.org/' >
 <!ENTITY lugww 'http://lugww.counter.li.org/' >
 <!ENTITY ubuntu-watch 'http://distrowatch.com/ubuntu/' >
-<!ENTITY realplayer-download 'http://www.real.com/linux/' >
-<!ENTITY nvu-download 'http://www.nvu.com/download.html' >
+<!ENTITY realplayer-download 'http://www.real.com/realplayer/linux' >
+<!ENTITY nvu-download 'http://net2.com/nvu/download.html' >
 <!ENTITY sunjava-download 'http://java.sun.com/j2se/1.5.0/download.jsp'>
 <!ENTITY xorg 'http://www.x.org'>
 <!ENTITY dyndns 'http://www.dyndns.org' >
@@ -141,8 +141,8 @@
 
 <!-- this entity controls the url for addons-->
 <!ENTITY java-download 'http://java.sun.com/j2se/1.5.0/download.jsp' >
-<!ENTITY skype-deb 'skype_1.2.0.17-1_i386.deb' >
-<!ENTITY skype-download 'http://www.skype.com/go/getskype-linux-deb' >
+<!ENTITY skype-deb 'skype_2.1.0.81-1_i386.deb' >
+<!ENTITY skype-download 'http://www.skype.com/go/getskype-linux-beta-ubuntu-32' >
 <!ENTITY scanmodem-gz 'scanModem.gz' >
 <!ENTITY scanmodem-url 'http://linmodems.technion.ac.il/packages/scanModem.gz' >
 <!ENTITY ext2fs-url 'http://www.fs-driver.org/index.html' >
diff -Nru ubuntu-docs-10.10.3/libs/gnome-menus-C.ent ubuntu-docs-10.10.4/libs/gnome-menus-C.ent
--- ubuntu-docs-10.10.3/libs/gnome-menus-C.ent	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/libs/gnome-menus-C.ent	2010-12-10 16:52:33.000000000 +0000
@@ -39,7 +39,7 @@
 <!ENTITY eclipse-ide '<menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>Programming</guimenuitem><guimenuitem>Eclipse IDE</guimenuitem></menuchoice>'>
 <!ENTITY efax-gtk '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Office</guisubmenu><guimenuitem>Efax-gtk</guimenuitem></menuchoice>'>
 <!ENTITY ekiga '<menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>Internet</guimenuitem><guimenuitem>Ekiga Softphone</guimenuitem></menuchoice>'>
-<!ENTITY empathy '<menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>Internet</guimenuitem><guimenuitem>Empathy IM Client</guimenuitem></menuchoice>'>
+<!ENTITY empathy '<menuchoice><guimenuitem>Applications</guimenuitem><guimenuitem>Internet</guimenuitem><guimenuitem>Empathy Internet Messaging</guimenuitem></menuchoice>'>
 <!ENTITY etherape '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem><guimenuitem>Etherape</guimenuitem></menuchoice>'>
 <!ENTITY evolution-mail '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Office</guimenuitem><guimenuitem>Evolution Mail</guimenuitem></menuchoice>'>
 <!ENTITY file-management '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>File Management</guimenuitem></menuchoice>'>
@@ -68,7 +68,7 @@
 <!ENTITY homebank '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Office</guimenuitem><guimenuitem>HomeBank</guimenuitem></menuchoice>'>
 <!ENTITY inkscape '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Graphics</guimenuitem><guimenuitem>Inkscape SVG Vector Illustrator</guimenuitem></menuchoice>'>
 <!ENTITY internet '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem></menuchoice>'>
-<!ENTITY jockey '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Hardware Drivers</guimenuitem></menuchoice>'>
+<!ENTITY jockey '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Additional Drivers</guimenuitem></menuchoice>'>
 <!ENTITY kdevelop '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Programming</guisubmenu><guimenuitem>KDevelop</guimenuitem></menuchoice>'>
 <!ENTITY keyboard '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Keyboard</guimenuitem></menuchoice>'>
 <!ENTITY keyboard-shortcuts '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Keyboard Shortcuts</guimenuitem></menuchoice>'>
@@ -143,7 +143,7 @@
 <!ENTITY system-monitor '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>System Monitor</guimenuitem></menuchoice>'>
 <!ENTITY systemtools '<menuchoice><guimenu>Applications</guimenu><guimenuitem>System Tools</guimenuitem></menuchoice>'>
 <!ENTITY terminal '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>Terminal</guimenuitem></menuchoice>'>
-<!ENTITY text-editor '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>gedit Text Editor</guimenuitem></menuchoice>'>
+<!ENTITY text-editor '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Accessories</guimenuitem><guimenuitem>Text Editor</guimenuitem></menuchoice>'>
 <!ENTITY theme '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Theme</guimenuitem></menuchoice>'>
 <!ENTITY thunderbird '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem><guimenuitem>Mozilla Thunderbird Mail/News</guimenuitem></menuchoice>'>
 <!ENTITY time-date '<menuchoice><guimenu>System</guimenu><guimenuitem>Administration</guimenuitem><guimenuitem>Time and Date</guimenuitem></menuchoice>'>
diff -Nru ubuntu-docs-10.10.3/Makefile ubuntu-docs-10.10.4/Makefile
--- ubuntu-docs-10.10.3/Makefile	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/Makefile	2010-12-10 16:52:33.000000000 +0000
@@ -95,21 +95,6 @@
 
 ## Targets for building standalone documents
 
-switching:
-
-	xsltproc --stringparam html.stylesheet "libs/ubuntu-book.css" --stringparam navig.graphics.path "images/navig/" --stringparam callout.graphics.path "images/callouts/" --stringparam admon.graphics.path "images/admin/" --xinclude -o $(BASE)switching/index.html $(UBUNTUCHUNKXSL) switching/C/switching.xml
-
-	# copy style sheet and common images to build directory
-	mkdir -p $(BASE)switching/libs/img
-	cp libs/*css $(BASE)switching/libs/
-	cp libs/img/*png $(BASE)switching/libs/img/
-	mkdir -p $(BASE)switching/images/admon
-	cp -r libs/admon/*.* $(BASE)switching/images/admon	
-	mkdir -p $(BASE)switching/images/callouts
-	cp -r libs/callouts/*.* $(BASE)switching/images/callouts	
-	mkdir -p $(BASE)switching/images/navig
-	cp -r libs/navig/*.* $(BASE)switching/images/navig	
-
 serverguide: style
 
 	if [ $(LN) != "C" ]; then \
diff -Nru ubuntu-docs-10.10.3/musicvideophotos/C/photos.xml ubuntu-docs-10.10.4/musicvideophotos/C/photos.xml
--- ubuntu-docs-10.10.3/musicvideophotos/C/photos.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/musicvideophotos/C/photos.xml	2010-12-10 16:52:33.000000000 +0000
@@ -56,7 +56,7 @@
         <procedure>
             <step>
             <para>
-            Open &f-spot;. If you are using <application>F-Spot</application> 
+            Open &shotwell;. If you are using <application>Shotwell Photo Manager</application> 
 	    for the first time, the Import window will open automatically.
 	    Otherwise, choose 
             <menuchoice>
@@ -88,19 +88,19 @@
     
     <sect1 id="photos-organize" status="review">
         <title>Organize your photo collection</title>
-        <para><application>F-Spot</application> provides a complete solution for 
-        managing your photo collection. To start it, choose &f-spot;.
+        <para><application>Shotwell Photo Manager</application> provides a complete solution for 
+        managing your photo collection. To start it, choose &shotwell;.
         </para>
         <para>
-        With <application>F-Spot</application>, you can import photos from your 
+        With <application>Shotwell Photo Manager</application>, you can import photos from your 
         digital camera or USB stick, tag them with familiar terms, do touch 
         ups, and edit them in different ways. In addition to this, you can 
         upload photos easily to your Flickr, PicasaWeb album and other online 
         photo galleries.
         </para>
         <para>
-        For help with <application>F-Spot Photo Manager</application>, see the 
-        <ulink type="help" url="ghelp:f-spot">F-Spot User Guide</ulink>.
+        For help with <application>Shotwell Photo Manager</application>, see the 
+        <ulink url='http://trac.yorba.org/wiki/UsingShotwell0.7'>Shotwell User Guide</ulink>.
         </para>
     </sect1>
     
@@ -120,9 +120,9 @@
             </listitem>
             <listitem>
             <para>
-            Watch a slideshow using the <ulink type='help' 
-            url='ghelp:f-spot#enjoying-fullscreen-mode-and-slideshows'>
-            F-Spot Photo Manager</ulink>
+            Watch a slideshow using the <ulink
+            url='http://trac.yorba.org/wiki/UsingShotwell0.7#ViewingYourPhotos'>
+            Shotwell Photo Manager</ulink>
             </para>
             </listitem>
         </itemizedlist>
@@ -140,14 +140,14 @@
                 </listitem>
                 <listitem>
                 <para>
-                Select the <guilabel>F-Spot photos</guilabel> screensaver 
+                Select the <guilabel>Shotwell photos</guilabel> screensaver 
                 theme
                 </para>
                 </listitem>
                 <listitem>
                 <para>
                 Photos which are tagged as <guilabel>Favorites</guilabel> in 
-                <application>F-Spot Photo Manager</application> will be 
+                <application>Shotwell Photo Manager</application> will be 
                 displayed as your screensaver
                 </para>
                 </listitem>
@@ -159,7 +159,7 @@
             <orderedlist>
                 <listitem>
                 <para>
-                Open F-Spot
+                Open Shotwell Photo Manager
                 </para>
                 </listitem>
                 <listitem>
@@ -400,10 +400,9 @@
             </listitem>
             <listitem>
             <para>
-            Share your photos over the Internet using a <ulink type='help' 
-            url='ghelp:f-spot#sharing-flickr-or-php-gallery'>
-            photo sharing service</ulink> or a <ulink type='help' 
-            url='ghelp:f-spot#website-gallery-folder'>web gallery</ulink>.
+            Share your photos over the Internet using a <ulink 
+            url='http://trac.yorba.org/wiki/UsingShotwell0.7#SharingYourPhotos'>
+            photo sharing service or a web gallery</ulink>.
             </para>
             </listitem>
             <listitem>
@@ -413,15 +412,13 @@
             </para>
             </listitem>
             <listitem>
-            <para>
-            Present a 
+            <para> 
             <xref linkend="photos-slideshow"/>
             </para>
             </listitem>
             <listitem>
             <para>
-            <ulink type='help' url='ghelp:f-spot#sharing-e-mail'>
-            E-mail copies</ulink> of your photos directly.
+            E-mail copies of your photos directly.
             </para>
             </listitem>
         </itemizedlist>
@@ -431,7 +428,7 @@
         <title>Edit and improve photos</title>
         <para>
         Sometimes, you may need to adjust or touch-up a photo to make it look 
-        better or to remove some flaw. <application>F-Spot</application> 
+        better or to remove some flaw. <application>Shotwell Photo Manager</application> 
         includes a few basic tools for doing this. To access these tools, press 
         the <guibutton>Edit Photo</guibutton> button and then click on one of 
         the tools at the bottom of the screen.
@@ -454,7 +451,7 @@
             </para>
             <para>
             The <ulink type='help' url='ghelp:eog#eog-manipulate'>
-            Image Viewer</ulink>, F-Spot Photo Manager and the GIMP Image 
+            Image Viewer</ulink>, Shotwell Photo Manager and the GIMP Image 
             Editor are all capable of rotating photos.
             </para>
         </sect2>
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/branch.conf ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/branch.conf
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/branch.conf	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/branch.conf	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1,2 @@
+bound_location = bzr+ssh://bazaar.launchpad.net/~udienz/ubuntu-docs/natty-ubuntu-docs.fix677998/
+bound = True
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/format ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/format
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/format	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/format	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1 @@
+Bazaar Branch Format 7 (needs bzr 1.6)
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/last-revision ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/last-revision
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch/last-revision	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch/last-revision	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1 @@
+0 null:
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch-format ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch-format
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/branch-format	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/branch-format	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1 @@
+Bazaar-NG meta directory, format 1
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/README ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/README
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/README	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/README	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1,3 @@
+This is a Bazaar control directory.
+Do not change any files in this directory.
+See http://bazaar-vcs.org/ for more information about Bazaar.
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/repository/format ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/repository/format
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/repository/format	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/repository/format	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1 @@
+Bazaar repository format 2a (needs bzr 1.16 or later)
diff -Nru ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/repository/pack-names ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/repository/pack-names
--- ubuntu-docs-10.10.3/natty-ubuntu-docs.fix677998/.bzr/repository/pack-names	1970-01-01 00:00:00.000000000 +0000
+++ ubuntu-docs-10.10.4/natty-ubuntu-docs.fix677998/.bzr/repository/pack-names	2010-12-10 16:54:23.000000000 +0000
@@ -0,0 +1,5 @@
+B+Tree Graph Index 2
+node_ref_lists=0
+key_elements=1
+len=0
+row_lengths=
diff -Nru ubuntu-docs-10.10.3/printing/C/printing.xml ubuntu-docs-10.10.4/printing/C/printing.xml
--- ubuntu-docs-10.10.3/printing/C/printing.xml	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/printing/C/printing.xml	2010-12-10 16:52:33.000000000 +0000
@@ -381,7 +381,7 @@
 	</step>
 	<step>
 	<para>
-	Save the file and open Xsane (&xsane;). Your scanner will hopefully work.
+	Save the file and open Simple Scan (&simple-scan;). Your scanner will hopefully work.
 	</para>
 	</step>
     </procedure>
diff -Nru ubuntu-docs-10.10.3/scripts/fix-urls.sh ubuntu-docs-10.10.4/scripts/fix-urls.sh
--- ubuntu-docs-10.10.3/scripts/fix-urls.sh	2010-09-19 11:54:50.000000000 +0000
+++ ubuntu-docs-10.10.4/scripts/fix-urls.sh	2010-12-10 16:52:33.000000000 +0000
@@ -29,27 +29,33 @@
 	
 ## Ubuntu links
 
+	sed -i build/$y/$lang/*.html -e "s#ghelp:about-ubuntu#\.\./\.\./about-ubuntu/$lang/#g" 
  	sed -i build/$y/$lang/*.html -e "s#ghelp:add-applications\#extra-repositories#\.\./\.\./add-applications/$lang/extra-repositories-adding.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:add-applications\#synaptic#\.\./\.\./add-applications/$lang/advanced.html#g"
+	sed -i build/$y/$lang/*.html -e "s#ghelp:add-applications\#restricted-software#\.\./\.\./add-applications/$lang/restricted-software.html#g"	
  	sed -i build/$y/$lang/*.html -e "s#ghelp:add-applications#\.\./\.\./add-applications/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:administrative#\.\./\.\./administrative/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:basic-commands#\.\./\.\./basic-commands/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:desktop-effects#\.\./\.\./desktop-effects/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:keeping-safe\#users#\.\./\.\./keeping-safe/$lang/users.html#g"
+	sed -i build/$y/$lang/*.html -e "s#ghelp:keeping-safe#\.\./\.\./keeping-safe/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:office#\.\./\.\./office/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:hardware\#disks#\.\./\.\./hardware/$lang/disks.html#g"
- 	sed -i build/$y/$lang/*.html -e "s#ghelp:hardware\#laptops-touchpads#\.\./\.\./office/$lang/laptops.html#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:hardware\#laptops-touchpads#\.\./\.\./hardware/$lang/laptops.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:hardware\#jockey#\.\./\.\./hardware/$lang/jockey.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#codecs#\.\./\.\./musicvideophotos/$lang/codecs.html#g"
 	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#onlinemedia-plugins#\.\./\.\./musicvideophotos/$lang/onlinemedia.html#g"
 	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#onlinemedia-audiostreams#\.\./\.\./musicvideophotos/$lang/onlinemedia.html\#onlinemedia-audiostreams#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#video-playback-flash#\.\./\.\./musicvideophotos/$lang/video-playback.html\#video-playback-flash#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#video#\.\./\.\./musicvideophotos/$lang/video.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#video-online#\.\./\.\./musicvideophotos/$lang/video.html\#video-online#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#music-audiostreams#\.\./\.\./musicvideophotos/$lang/music.html\#music-audiostreams#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#cdburning#\.\./\.\./musicvideophotos/$lang/cdburning.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#photos-slideshow#\.\./\.\./musicvideophotos/$lang/photos.html\#photos-slideshow#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos\#photos-printing#\.\./\.\./musicvideophotos/$lang/photos.html\#photos-printing#g"
+	sed -i build/$y/$lang/*.html -e "s#ghelp:musicvideophotos#\.\./\.\./musicvideophotos/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:internet\#web-plugins-flash#\.\./\.\./internet/$lang/web-plugins.html\#web-plugins-flash#g"
+	sed -i build/$y/$lang/*.html -e "s#ghelp:internet#\.\./\.\./internet/$lang/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:serverguide#\.\./\.\./serverguide/$lang/index.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:windows#\.\./\.\./windows/$lang/#g"
         sed -i build/$y/$lang/*.html -e "s#\"legal\.html\"#\"/legal\.html\"#g"
@@ -65,17 +71,20 @@
 
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#panels#http://library\.gnome\.org/users/user-guide/stable/panels\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#menubar#http://library\.gnome\.org/users/user-guide/stable/menubar\.html#g"
-	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#prefs#http://library\.gnome\.org/users/user-guide/stable/prefs\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#basic-skills#http://library\.gnome\.org/users/user-guide/stable/basic-skills\.html#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#overview-workspaces#http://library\.gnome\.org/users/user-guide/stable/overview-workspaces\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#overview#http://library\.gnome\.org/users/user-guide/stable/overview\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#prefs-mouse#http://library\.gnome\.org/users/user-guide/stable/prefs-mouse\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#mouse-skills#http://library\.gnome\.org/users/user-guide/stable/mouse-skills\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#gosnautilus-460#http://library\.gnome\.org/users/user-guide/stable/gosnautilus-460\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus-accessnetwork#http://library\.gnome\.org/users/user-guide/stable/nautilus-accessnetwork\.html#g"
- 	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#prefs-keyboard#http://library\.gnome\.org/users/user-guide/stable/prefs-mouse\.html#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#prefs-keyboard#http://library\.gnome\.org/users/user-guide/stable/prefs-keyboard\.html#g"
+	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#prefs#http://library\.gnome\.org/users/user-guide/stable/prefs\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#keyboard-skills#http://library\.gnome\.org/users/user-guide/stable/prefs-mouse\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus-cdwriter-copy#http://library\.gnome\.org/users/user-guide/stable/nautilus-cdwriter-copy\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus-cdwriter-writeimage#http://library\.gnome\.org/users/user-guide/stable/nautilus-cdwriter-writeimage\.html#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus-preferences#http://library\.gnome\.org/users/user-guide/stable/nautilus-preferences\.html#g"
+ 	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus-permissions#http://library\.gnome\.org/users/user-guide/stable/nautilus-permissions\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:user-guide\#nautilus#http://library\.gnome\.org/users/user-guide/stable/nautilus\.html#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:gnome-access-guide#http://library\.gnome\.org/users/gnome-access-guide/stable/#g"
  	sed -i build/$y/$lang/*.html -e "s#ghelp:gnome-access-guide\#dtconfig-1#http://library\.gnome\.org/users/gnome-access-guide/stable/dtconfig-1\.html#g"