Merge lp:~unit193/xubuntu-docs/xubuntu-docs into lp:xubuntu-docs/raring

[Unit 193]

[Pasi Lallinaho (knome)]

review: Approve

=== modified file 'desktop-guide/C/command-line.xml'
--- desktop-guide/C/command-line.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/command-line.xml	2013-03-19 19:47:25 +0000
@@ -27,7 +27,7 @@
 
 		<para>When working on the command line, any command can be run as an administrator by prefixing the command with <userinput>sudo</userinput>. <application>Sudo</application> will remember your password for 15 minutes to allow you to perform multiple administrative tasks without being prompted for a password each time.</para>
 
-		<note><para>If the program you wish to run as an administrator is graphical, such as the <application>Leafpad</application> text editor, you should use the command <userinput>gksudo</userinput> instead of <application>sudo</application>, even if you are running the application from the command line.</para></note>
+		<note><para>If the program you wish to run as an administrator is graphical, such as the <application>Mousepad</application> text editor, you should use the command <userinput>gksudo</userinput> instead of <application>sudo</application>, even if you are running the application from the command line.</para></note>
 
 		<warning><para>Be careful when using <application>sudo</application>; you might damage your system if you type the wrong command! As a general rule, only use sudo when absolutely necessary. When you use <application>sudo</application> from a terminal, be sure to close it when you have finished!</para></warning>
 
 
=== modified file 'desktop-guide/C/guide-default-apps.xml'
--- desktop-guide/C/guide-default-apps.xml	2012-10-11 12:23:38 +0000
+++ desktop-guide/C/guide-default-apps.xml	2013-03-19 19:47:25 +0000
@@ -40,7 +40,7 @@
 
 		<para><application>PulseAudio Volume Control</application> is the way to control the different sound sources to their destination. Read more at the <ulink url="&pulseaudio-web;">PulseAudio website</ulink>.</para>
 
-		<para><application>Xfburn</application> is the chosen program for creating your CD and DVD's.</para>
+		<para><application>Xfburn</application> is the chosen program for creating your CDs and DVDs.</para>
 
 		<para>To read more about media in Xubuntu, refer to <xref linkend="media-apps" />.</para>
 	</section>
@@ -54,7 +54,7 @@
 
 		<tip><para>If you prefer the LibreOffice suite over these default applications, you can install it from the repositories as well as remove <application>AbiWord</application> if desired.</para></tip>
 
-		<para><application>Dictionary</application> provides an easy way to access a number of different dictionaries accross the internet. Read more at the <ulink url="&xfce4-dict-web;">Xfce4 Dictionary website</ulink>.</para>
+		<para><application>Dictionary</application> provides an easy way to access a number of different dictionaries across the internet. Read more at the <ulink url="&xfce4-dict-web;">Xfce4 Dictionary website</ulink>.</para>
 
 		<para><application>Evince</application> is a PDF reader.</para>
 
 
=== modified file 'desktop-guide/C/guide-desktop.xml'
--- desktop-guide/C/guide-desktop.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/guide-desktop.xml	2013-03-19 19:47:25 +0000
@@ -148,7 +148,7 @@
 				any other removable media.</para>
 
 			<note><para>Please note that pressing the eject button on your CD drive may not work. This
-				may be surprising to some users, but it is in fact the expected behaviour. Before the CD
+				may be surprising to some users, but it is in fact the expected behavior. Before the CD
 				can be ejected, it needs to be properly "released" (unmounted) by the system. To remove
 				a CD, always right-click on its shortcut and choose
 				<menuchoice><guimenuitem>Eject Volume</guimenuitem></menuchoice>.</para></note>
@@ -174,7 +174,7 @@
 	<section id="customizing-appearance">
 		<title>Customizing the appearance</title>
 
-		<para>If you want to customise the appearance of your Xubuntu system, the options are
+		<para>If you want to customize the appearance of your Xubuntu system, the options are
 			unlimited. Here's a few good starting points.</para>
 
 		<section id="customizing-wallpaper">
@@ -216,7 +216,7 @@
 			<title>Customizing your panel configuration</title>
 
 			<para>If you don't like the default panel configuration, including the positioning or the
-				applets installed by default, follow the steps below to customise the panel
+				applets installed by default, follow the steps below to customize the panel
 				configuration:</para>
 
 			<itemizedlist>
 
=== modified file 'desktop-guide/C/guide-keeping-safe.xml'
--- desktop-guide/C/guide-keeping-safe.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/guide-keeping-safe.xml	2013-03-19 19:47:25 +0000
@@ -26,7 +26,7 @@
 	<section id="change-password">
 		<title>Change your password regularly</title>
 
-		<para>In addition to having strong passwords, it is wise to hange your
+		<para>In addition to having strong passwords, it is wise to change your
 			password regularly. To change your password, follow the steps below:</para>
 		<itemizedlist>
 			<listitem><para>Open &users-groups;</para></listitem>
 
=== modified file 'desktop-guide/C/hardware-devices.xml'
--- desktop-guide/C/hardware-devices.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/hardware-devices.xml	2013-03-19 19:47:25 +0000
@@ -100,7 +100,7 @@
 
 			<warning><para>Be careful when altering disk partitions, as it is possible to lose your data if you delete or change the wrong partition.</para></warning>
 
-			<note><para>If it is necessary to unmount the installed system to proceed with changes you wish to make you will have to work from a live CD/UDB to do so</para></note>
+			<note><para>If it is necessary to unmount the installed system to proceed with changes you wish to make you will have to work from a live CD/USB to do so</para></note>
 
 			<section id="partitioning-freeing-space">
 				<title>Freeing space for a new partition</title>
@@ -109,7 +109,7 @@
 
 				<itemizedlist>
 					<listitem><para>Select the device to partition from the drop-down list at the top-right of the main window</para></listitem>
-					<listitem><para>A list of partions will appear in the main window. Select the partition you want to resize and from the menu, choose <menuchoice><guimenu>Partition</guimenu><guimenuitem>Unmount</guimenuitem></menuchoice></para></listitem>
+					<listitem><para>A list of partitions will appear in the main window. Select the partition you want to resize and from the menu, choose <menuchoice><guimenu>Partition</guimenu><guimenuitem>Unmount</guimenuitem></menuchoice></para></listitem>
 					<listitem><para>To resize the partition choose <menuchoice><guimenu>Partition</guimenu><guimenuitem>Resize/Move</guimenuitem></menuchoice>. The <guilabel>Resize/Move</guilabel> dialog will be shown. You can use the <guilabel>Free Space Following (MiB)</guilabel> box to choose how much space to free after this partition, or <guilabel>Free Space Preceding (MiB)</guilabel> to free space before this partition. Alternatively you can use the slider to adjust the partition size.</para></listitem>
 					<listitem><para>To apply the changes, click <guibutton>Resize/Move</guibutton></para></listitem>
 				</itemizedlist>
@@ -265,6 +265,6 @@
 			<listitem><para><guilabel>Keyboard layout and language </guilabel></para></listitem>
 		</itemizedlist>
 
-		<tip><para>If you are using a mouse on a laptop that also has a touchpad, you can change the behaviour of each of them individually by selecting the appropriate device from the <guilabel>Device:</guilabel> pick list on the <guilabel>Devices</guilabel> tab page.</para></tip>
+		<tip><para>If you are using a mouse on a laptop that also has a touchpad, you can change the behavior of each of them individually by selecting the appropriate device from the <guilabel>Device:</guilabel> pick list on the <guilabel>Devices</guilabel> tab page.</para></tip>
 	</section>
 </chapter>
 
=== modified file 'desktop-guide/C/internet-networks.xml'
--- desktop-guide/C/internet-networks.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/internet-networks.xml	2013-03-19 19:47:25 +0000
@@ -11,9 +11,9 @@
 <chapter id="internet-networks">
 	<title>Connecting to Internet and Networks</title>
 
-	<para>Xubuntu uses <application>NetworkManager</application> to manage wired, wireless, mobile broadband, VPN and DSL connections. <application>NetworkManager</application> also keeps passwords secure by utilising the user's keyring to store passphrases.</para>
+	<para>Xubuntu uses <application>NetworkManager</application> to manage wired, wireless, mobile broadband, VPN and DSL connections. <application>NetworkManager</application> also keeps passwords secure by utilizing the user's keyring to store passphrases.</para>
 
-	<para><application>NetworkManager</application> is the little icon in the upper panel in the top right of your screen. When not connected, the icon shows two greyed out arrows pointing up and down. When you are connected, the icon is different depending on the network type in use.</para>
+	<para><application>NetworkManager</application> is the little icon in the upper panel in the top right of your screen. When not connected, the icon shows two grayed out arrows pointing up and down. When you are connected, the icon is different depending on the network type in use.</para>
 
 	<section id="network-connections">
 		<title>Network connections</title>
@@ -47,13 +47,13 @@
 		<section id="network-sharing">
 			<title>Sharing your connection to another computer</title>
 
-			<para>You can share your connection to another computer using an ethernet cable. This can be carried out by clicking the NetworkManager icon, selecting <menuchoice><guimenuitem>Edit Connections</guimenuitem></menuchoice>, and then adding a new wireless connection (or editing the existing one). In the connection properties window, select <guilabel>IPv4 Settings</guilabel>, and change <guilabel>Method</guilabel> to <guilabel>Shared to other computers</guilabel> from the drop-down list.</para>
+			<para>You can share your connection to another computer using an Ethernet cable. This can be carried out by clicking the NetworkManager icon, selecting <menuchoice><guimenuitem>Edit Connections</guimenuitem></menuchoice>, and then adding a new wireless connection (or editing the existing one). In the connection properties window, select <guilabel>IPv4 Settings</guilabel>, and change <guilabel>Method</guilabel> to <guilabel>Shared to other computers</guilabel> from the drop-down list.</para>
 		</section>
 
 		<section id="network-modems">
 			<title>Dialup modems</title>
 
-			<para>Unfortunately, dialup modems are not supported by <application>NetworkManager</application>. To read about connecting with a dialup modem, please refer to the <ulink url="&communitywiki-dialup;">Dialup modem Howto</ulink> on the Ubuntu community wiki.</para>		</section>
+			<para>Unfortunately, dialup modems are not supported by <application>NetworkManager</application>. To read about connecting with a dialup modem, please refer to the <ulink url="&communitywiki-dialup;">Dialup modem How-to</ulink> on the Ubuntu community wiki.</para>		</section>
 	</section>
 
 	<section id="network-troubleshooting">
@@ -70,7 +70,7 @@
 		<para>If your network connection still doesn't work:</para>
 
 		<itemizedlist>
-			<listitem><para>For wired (ethernet) connections, please see <xref linkend="network-troubleshooting-general" /></para></listitem>
+			<listitem><para>For wired (Ethernet) connections, please see <xref linkend="network-troubleshooting-general" /></para></listitem>
 			<listitem><para>For wireless connections, please see both <xref linkend="network-troubleshooting-general" /> and <xref linkend="network-troubleshooting-wireless" /></para></listitem>
 			<listitem><para>If your network connection problems are still not resolved, see <xref linkend="network-troubleshooting-advanced" /></para></listitem>
 		</itemizedlist>
 
=== modified file 'desktop-guide/C/managing-applications.xml'
--- desktop-guide/C/managing-applications.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/managing-applications.xml	2013-03-19 19:47:25 +0000
@@ -113,16 +113,16 @@
 		<section id="applications-offline-installation">
 			<title>Helpful applications</title>
 
-			<para><application>APTonCD</application> can be used to create a CD that contains all the packages you have on your system, or it can create CDs with packages or entire repositories of your choice. In a package manager, such as <application>Ubuntu Software Centre</application>, find the <application>APTonCD</application> package and install it. Further documentation on <application>APTonCD</application> can be found on the <ulink url="&aptoncd-web;">APTonCD website</ulink>.</para>
+			<para><application>APTonCD</application> can be used to create a CD that contains all the packages you have on your system, or it can create CDs with packages or entire repositories of your choice. In a package manager, such as <application>Ubuntu Software Center</application>, find the <application>APTonCD</application> package and install it. Further documentation on <application>APTonCD</application> can be found on the <ulink url="&aptoncd-web;">APTonCD website</ulink>.</para>
 
 			<para>If you have access to a second computer which does have internet access, you can use it along with <application>apt-offline</application> to download the necessary package information from the internet and then transfer that data to the disconnected computer. This is a multi-step process. More information on the procedure can be found on the <ulink url="&communitywiki-installing;">Ubuntu Community Help wiki</ulink>.</para>
 
-			<para><application>Keryx</application> is a portable, cross-platform package manager for APT-based (Ubuntu, Debian) systems. It provides a graphical interface for gathering updates, packages, and dependencies for offline computers. <application>Keryx</application> is free and open source. Read more about and dowload <application>Keryx</application> from the <ulink url="&keryx-web;">Keryx website</ulink>.</para>
+			<para><application>Keryx</application> is a portable, cross-platform package manager for APT-based (Ubuntu, Debian) systems. It provides a graphical interface for gathering updates, packages, and dependencies for offline computers. <application>Keryx</application> is free and open source. Read more about and download <application>Keryx</application> from the <ulink url="&keryx-web;">Keryx website</ulink>.</para>
 		</section>
 	</section>
 
 	<section id="update-configuration">
-		<title>Changing update frequency and behaviour</title>
+		<title>Changing update frequency and behavior</title>
 
 		<para>You can change the frequency of the check and the way in which updates are handled. When <application>Software Updater</application> runs and presents you with its dialog, there is a <guilabel>Settings</guilabel> button at the bottom. Pressing this will open the <guilabel>Software Sources</guilabel> dialog at the <guilabel>Updates</guilabel> tab. Alternatively, you can access the settings dialog by going to &software-properties; and opening the <guilabel>Updates</guilabel> tab.</para>
 		<para>The following settings can be changed from this dialog:</para>
 
=== modified file 'desktop-guide/C/media-apps.xml'
--- desktop-guide/C/media-apps.xml	2012-10-11 12:23:38 +0000
+++ desktop-guide/C/media-apps.xml	2013-03-19 19:47:25 +0000
@@ -25,12 +25,12 @@
 				<listitem><para>In the <guilabel>Settings</guilabel> dialog, go to the <guilabel>Library</guilabel> tab</para></listitem>
 				<listitem><para>Click <guibutton>Add Folder</guibutton> and choose the directory that contains your music files and press <guibutton>OK</guibutton>; your selection will now appear in the <guilabel>Settings</guilabel> dialog</para></listitem>
 				<listitem><para>If you wish to add other locations of music files repeat the previous step, or otherwise, press <guibutton>Close</guibutton></para></listitem>
-				<listitem><para><application>gmusicbrowser</application> will begin to scan your library. After the <guilabel>Scanning</guilabel> progressbar disappears, you may have to change views (to the left of the search) or restart <application>gmusicbrowser</application> to see your library.</para></listitem>
+				<listitem><para><application>gmusicbrowser</application> will begin to scan your library. After the <guilabel>Scanning</guilabel> progress bar disappears, you may have to change views (to the left of the search) or restart <application>gmusicbrowser</application> to see your library.</para></listitem>
 			</itemizedlist>
 		</section>
 
 		<section id="media-music-wrong-data">
-			<title>I see wrong metadata (songnames, covers) for my tracks in gmusicbrowser</title>
+			<title>I see wrong metadata (song names, covers) for my tracks in gmusicbrowser</title>
 
 			<para>Some music player applications fetch cover art and other information about songs from the internet. However, <application>gmusicbrowser</application> only searches for cover art when you request. Simply right-click the album artwork, and select <menuchoice><guimenuitem>Search Picture</guimenuitem></menuchoice>. You can change the search query or service, but the defaults often work well. Select an image and save it to the album directory.</para>
 
@@ -56,7 +56,7 @@
 		<para>You can watch movies and video clips with the <application>Parole Media Player</application>.</para>
 
 		<section id="media-play-dvd">
-			<title>Playind DVDs</title>
+			<title>Playing DVDs</title>
 
 			<para>In order to play DVDs you must install some additional software. Unfortunately, DVD support cannot be provided by default in Xubuntu due to legal restrictions in some countries.</para>
 
@@ -172,7 +172,7 @@
 
 		<para>You can make your own CDs and DVDs by burning files onto a blank disc using the CD or DVD writer drive of your computer.</para>
 
-		<para><application>Xfburn</application> is the default application in Xubuntu to complete these tasks. <application>Xfburn</application> allows you to to easily create audio CDs, burn CDs and DVDs with either plain data or disk images and prepare blank rewritable disks for a new burn.</para>
+		<para><application>Xfburn</application> is the default application in Xubuntu to complete these tasks. <application>Xfburn</application> allows you to to easily create audio CDs, burn CDs and DVDs with either plain data or disk images and prepare blank re-writable disks for a new burn.</para>
 
 		<para>In order to launch <application>Xfburn</application>, go to &xfburn;.</para>
 
 
=== modified file 'desktop-guide/C/migrating-upgrading.xml'
--- desktop-guide/C/migrating-upgrading.xml	2012-10-11 12:23:38 +0000
+++ desktop-guide/C/migrating-upgrading.xml	2013-03-19 19:47:25 +0000
@@ -42,7 +42,7 @@
 
 			<para>Accessing Windows network shares under Xubuntu can be easily done using:</para>
 			<itemizedlist>	
-				<listitem><para>&file-manager;, with which you can browse publically visible shares by clicking on the <guilabel>Network</guilabel> item in the sidebar. Alternatively, you can browse a remote file system by going to <menuchoice><guimenu>Go</guimenu><guimenuitem>Open Location...</guimenuitem></menuchoice> and entering <userinput>smb://computername/sharename</userinput>.</para></listitem>
+				<listitem><para>&file-manager;, with which you can browse publicly visible shares by clicking on the <guilabel>Network</guilabel> item in the sidebar. Alternatively, you can browse a remote file system by going to <menuchoice><guimenu>Go</guimenu><guimenuitem>Open Location...</guimenuitem></menuchoice> and entering <userinput>smb://computername/sharename</userinput>.</para></listitem>
 				<listitem><para>&gigolo;, which allows you to save bookmarks and manage remote file systems. To connect, click the first toolbar button. Select <guilabel>Windows Share</guilabel> from <guilabel>Service Type</guilabel>, then enter the remote share's details.</para></listitem>
 			</itemizedlist>
 
 
=== modified file 'desktop-guide/C/printing-scanning.xml'
--- desktop-guide/C/printing-scanning.xml	2012-09-19 19:36:13 +0000
+++ desktop-guide/C/printing-scanning.xml	2013-03-19 19:47:25 +0000
@@ -116,7 +116,7 @@
 
 			<itemizedlist>
 				<listitem><para>Install the <literal>&package;libsane-extras</literal> package</para></listitem>
-				<listitem><para>Press <keycap>&key;Alt+F2</keycap>, type <userinput>gksudo leafpad /etc/sane.d/dll.conf</userinput> into the box and click <guibutton>Launch</guibutton> to open the SANE driver file for editing</para></listitem>
+				<listitem><para>Press <keycap>&key;Alt+F2</keycap>, type <userinput>gksudo mousepad /etc/sane.d/dll.conf</userinput> into the box and click <guibutton>Launch</guibutton> to open the SANE driver file for editing</para></listitem>
 				<listitem><para>Enable the correct driver for your scanner by removing the <literal>#</literal> from in front of the name of the driver. You may need to search the web to find out which driver is the right one.</para></listitem>
 				<listitem><para>Save the file and open <application>Simple Scan</application>. If all goes well, your scanner will now work. </para></listitem>
 			</itemizedlist>