# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: arteek@arteek-20090504100415-3aolpsweshb7zgto
# target_branch: bzr+ssh://bazaar.launchpad.net/%7Eubuntu-core-\
#   doc/ubuntu-doc/ubuntu-karmic/
# testament_sha1: 68a03c46cde389bc8f18aceac9bbd2ea892521e1
# timestamp: 2009-05-04 12:08:15 +0200
# base_revision_id: ddrichardson@btinternet.com-20090503105542-\
#   y9gbqb3g99bh7xbf
# 
# Begin patch
=== modified file 'keeping-safe/C/keeping-safe.xml'
--- keeping-safe/C/keeping-safe.xml	2009-02-22 15:42:30 +0000
+++ keeping-safe/C/keeping-safe.xml	2009-05-04 10:04:15 +0000
@@ -63,7 +63,10 @@
 				Ubuntu developers often issue updates to the Ubuntu software.
 				These updates may improve security or fix other problems.
 			</para>
-			<para>
+
+			<!-- There is a new behavior of notify new updates introduced in Jaunty. See 9.04's release notes for more info. If it will back in Karmic to previous manner, below should be replaced to old description before we put the keeping-safe to 9.10 release.
+			=======================			
+			<para>			
 				When updates are available, the update icon (an orange star) appears in the panel,
 				usually near the top right of the screen.
 				To install updates you must be an <ulink type="help" url="ghelp:administrative">administrator</ulink>
@@ -82,6 +85,12 @@
 					</para>
 				</step>
 			</procedure>
+			=======================
+-->
+  
+			<para>
+				When security updates are available, the <application>Update Manager</application> automatically starts up. For other updates you will be prompted once a week.   
+				To install updates, just click <guibutton>Install Updates</guibutton> and enter your password when prompted.</para>		
 			<para>The update process may take a while if many updates need to be installed.</para>
 			<para>
 				If a pair of blue arrows appears in the panel when the updates have
@@ -176,24 +185,42 @@
 				</itemizedlist>
 				
 				<para>A simple way of backing-up your files is to manually copy them to a safe location (see above) by using the <application>File Browser</application>.</para>
-				<para>Alternatively, you can use a dedicated back-up application, such as <application>HUBackup</application>:</para>
-				
+				<para>Alternatively, you can use a dedicated back-up application, such as <application>Simple Backup Suite</application>.</para>
 				<procedure>
 				<step>
-					<para><ulink url="apt:hubackup">Install the <application>hubackup</application> package</ulink> from the <quote>Universe</quote> repository.</para>
-				</step>
-				<step>
-					<para>To make a backup, press &hubackup;.
-					</para>
-				</step>
-				<step>
-					<para>Select the files which you would like to make a backup copy of and choose the location which you would like to save the backup to. If you have a CD or DVD writer, it should be present in this list.</para>
-				</step>
-				<step>
-					<para>Press <guibutton>Backup</guibutton> and follow the instructions given on-screen.</para>
-				</step>
+					<para><ulink url="apt:sbackup">Install the <application>sbackup</application> package</ulink> from the <quote>Universe</quote> repository.</para>
+				</step>
+				<step>
+					<para>To make a backup, press &sbackup; and enter your administrator password when prompted.
+					</para>
+				</step>
+				<step>
+					<para>Under <guilabel>General</guilabel> tab, choose backup mode which you would like to use. If you are not sure what you should backup, select <guilabel>Use recommended backup settings</guilabel>. This will perform daily incremental and weekly full backup of all user and system files to <filename>/var/backup</filename> default directory, excluding multimedia and temporary files as well as files larger than 100 MB.
+</para>
+				</step>
+				<step>
+					<para>Press <guibutton>Save</guibutton> to save your settings.</para>
+				</step>
+				<step>
+					<para>If you want to backup your files immediately, then press <guibutton>Backup Now!</guibutton>; otherwise, click <guibutton>Close</guibutton> button to leave the scheduled backup.
+					</para>
+				</step>
+				<step>
+					<para>Your backup will launch in the background and you will see pop-up window with information about process id. Click <guibutton>Close</guibutton>. The backup process may takes a while, depend on amount of copied files.</para>    
+				</step>
+				<step>
+					<para>Your backup will be placed as directory into <filename>/var/backup</filename>. You must be an <ulink type="help" url="ghelp:administrative">administrator</ulink> to access your backup. 
+					</para>
+				</step>  
 			</procedure>
-			<para>To restore a backup made with <application>HUBackup</application>, press &hurestore; and follow the instructions on-screen.</para>
+
+			<!-- Below note should be changed or removed if sbackup will be armed with CD/DVD burning feature. There is a plan to add CD/DVD buckup fincionality to one of forthcoming verion, but at this time don't know if it will be available in Karmic release.-->
+  
+			<note><para>The Simple Backup Suite does not provide an option to write backup files directly to CDs or DVDs. You have to write backup manualy using for example a Brasero Disc Burning software (&brasero;). Alternatively you can customize <application>Simple Backup Config</application> to backup your files into another place (eg. remote server or external drives). See <ulink url='https://help.ubuntu.com/community/BackupYourSystem/SimpleBackupSuite'>community help wiki</ulink> for details how to use Simple Backup Suite software.
+			</para></note>      
+			<para>To restore a backup made with <application>Simple Backup Config</application>, press &sbackup-restore; and select restore source folder and available backups from drop-down menu. Choose the files and folders you want to restore, click on the <guibutton>Restore</guibutton> button and confirm your choice. If you want to restore in a different location you need to select the <guibutton>Restore As</guibutton> option.</para>
+			<note><para>By default, restored files and directories are owned by root. This is because Simple Backup Suite runs with root priveleges. You need to <ulink type="help" url="ghelp:user-guide#nautilus-permissions">change these file or folder permissions</ulink> using <application>File Browser</application>.
+			</para></note>
 				
 				<para>Some general advice on how to keep good back-ups is given below:</para>
 				<itemizedlist>

=== modified file 'libs/gnome-menus-C.ent'
--- libs/gnome-menus-C.ent	2009-04-30 22:03:34 +0000
+++ libs/gnome-menus-C.ent	2009-05-04 10:04:15 +0000
@@ -64,8 +64,6 @@
 <!ENTITY gxine '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Sound &amp; Video</guimenuitem><guimenuitem>gxine</guimenuitem></menuchoice>'>
 <!ENTITY home-folder '<menuchoice><guimenu>Places</guimenu><guimenuitem>Home Folder</guimenuitem></menuchoice>'>
 <!ENTITY homebank '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Office</guimenuitem><guimenuitem>HomeBank</guimenuitem></menuchoice>'>
-<!ENTITY hubackup '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Home User Backup</guimenuitem></menuchoice>'>
-<!ENTITY hurestore '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Home User Restore</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 kdevelop '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Programming</guisubmenu><guimenuitem>KDevelop</guimenuitem></menuchoice>'>
@@ -116,6 +114,8 @@
 <!ENTITY restricted-manager '<menuchoice><guimenu>System</guimenu><guimenuitem>Administration</guimenuitem><guimenuitem>Hardware Drivers</guimenuitem></menuchoice>'>
 <!ENTITY rhythmbox '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Sound &amp; Video</guimenuitem><guimenuitem>Rhythmbox Music Player</guimenuitem></menuchoice>'>
 <!ENTITY route-planner '<menuchoice><guimenu>Applications</guimenu><guimenuitem>Internet</guimenuitem><guimenuitem>aMule</guimenuitem></menuchoice>'>
+<!ENTITY sbackup '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Simple Backup Config</guimenuitem></menuchoice>'>
+<!ENTITY sbackup-restore '<menuchoice><guimenu>System</guimenu><guisubmenu>Administration</guisubmenu><guimenuitem>Simple Backup Restore</guimenuitem></menuchoice>'>
 <!ENTITY scorched3d '<menuchoice><guimenu>Applications</guimenu><guisubmenu>Games</guisubmenu><guimenuitem>Scorched 3D</guimenuitem></menuchoice>'>
 <!ENTITY screen-resolution '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Screen Resolution</guimenuitem></menuchoice>'>
 <!ENTITY screensaver '<menuchoice><guimenu>System</guimenu><guimenuitem>Preferences</guimenuitem><guimenuitem>Screensaver</guimenuitem></menuchoice>'>

# Begin bundle
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