Merge lp:~unit193/xubuntu-docs/fixes into lp:xubuntu-docs/vivid

[Unit 193]

I did diz for you.

[lp:~unit193/xubuntu-docs/fixes]

293. By Pasi Lallinaho on 2015-02-18

Merging more of Unit193's fixes.

=== modified file 'desktop-guide/C/internet-networks.xml'
--- desktop-guide/C/internet-networks.xml	2015-02-14 23:24:52 +0000
+++ desktop-guide/C/internet-networks.xml	2015-02-18 00:01:42 +0000
@@ -27,7 +27,7 @@
 
 			<note><para>If you are connecting to a wireless network for the first time, security details may be needed. If so, a dialog box will open. In most cases, the security type will be detected automatically. If not, select the security type from the <guilabel>Wi-Fi Security</guilabel> drop-down box, enter the authentication details and press <guibutton>Connect</guibutton>.</para></note>
 
-			<para>To disconnect from a network, click the <application>NetworkManager</application> icon, and select Disconnect under the appropriate connection type. To disable (and re-enable) wired and/or wireless connections all together, click the <application>NetworkManager</application> icon and select <menuchoice><guimenuitem>Enable Networking</guimenuitem></menuchoice> and <menuchoice><guimenuitem>Enable Wi-Fi</guimenuitem></menuchoice>. These choices are toggles. Their enabled/disabled status is indicated by the presence/absence of a check mark.</para>
+			<para>To disconnect from a network, click the <application>NetworkManager</application> icon, and select Disconnect under the appropriate connection type. To disable (and re-enable) wired and/or wireless connections all together, click the <application>NetworkManager</application> icon, select <menuchoice><guimenuitem>Enable Networking</guimenuitem></menuchoice> and <menuchoice><guimenuitem>Enable Wi-Fi</guimenuitem></menuchoice>. These choices are toggles. Their enabled/disabled status is indicated by the presence/absence of a check mark.</para>
 		</section>
 
 		<section id="network-configure">
@@ -89,7 +89,7 @@
 					<listitem>
 						<para>Using <application>NetworkManager</application></para>
 						<itemizedlist>
-							<listitem><para>Click on the <application>NetworkManager</application> icon</para></listitem>	
+							<listitem><para>Click on the <application>NetworkManager</application> icon</para></listitem>
 							<listitem><para>Select <menuchoice><guimenuitem>Information</guimenuitem></menuchoice>. If <guilabel>Information</guilabel> is disabled, it is likely there is no active connection. Try using <application>ifconfig</application> to find out more.</para></listitem>
 							<listitem><para>Each active connection will have its own tab where you can find relevant connection information</para></listitem>
 						</itemizedlist>
@@ -97,7 +97,7 @@
 					<listitem>	
 						<para>Using <application>ifconfig</application></para>
 						<itemizedlist>
-							<listitem><para>Open a terminal (&terminal;) and type the command <userinput>ifconfig</userinput> and press <keycap>&key;Enter</keycap></para></listitem>
+							<listitem><para>Open a terminal (&terminal;), type the command <userinput>ifconfig</userinput> then press the <keycap>&key;Enter</keycap> key.</para></listitem>
 							<listitem><para><application>ifconfig</application> will show you extensive information about your connection, including logical or connection name(s) (e.g. eth1) in the left column, IP address in the <guilabel>inet addr</guilabel> column and the MAC address for your device in the <guilabel>HWaddr</guilabel> column</para></listitem>
 						</itemizedlist>
 					</listitem>
@@ -109,7 +109,7 @@
 
 				<para>A reliable method to check if a connection is working properly is to ping another computer on the network or the Internet.</para>
 
-				<para>To check if your computer is connected to the Internet, open a terminal (&terminal;) and type the command <userinput>ping -c 3 www.xubuntu.org</userinput> and press <keycap>&key;Enter</keycap></para>
+				<para>To check if your computer is connected to the Internet, open a terminal (&terminal;), type the command <userinput>ping -c 3 www.xubuntu.org</userinput> then press the <keycap>&key;Enter</keycap> key.</para>
 
 				<para>The computer will then attempt to contact www.xubuntu.org three times and display the results. The ping statistics display the number of packets transmitted, how many packets were received, the percentage of packet loss, and the total time spent.</para>
 
@@ -128,7 +128,7 @@
 
 			<para>This section covers some common problems faced with wireless support. There is much more information available in the <ulink url="&communitywiki-wifi;">Community Help Wiki</ulink>.</para>
 
-			<note><para>Please note that the steps in this troubleshooting guide are designed to be carried out in the order shown, unless you are pointed to a different subsection</para></note>
+			<note><para>Please note that the steps in this troubleshooting guide are designed to be carried out in the order shown, unless you are pointed to a different subsection.</para></note>
 
 			<section id="network-troubleshoothing-wifi-on">
 				<title>Check that the device is turned on</title>
@@ -141,7 +141,7 @@
 			<section id="network-troubleshooting-device-recognized">
 				<title>Check if the device is recognized</title>
 
-				<para>Open a terminal (&terminal;) and type the command <userinput>sudo lshw -C network</userinput> and press <keycap>&key;Enter</keycap>. You will see some output, along with the words <guilabel>CLAIMED</guilabel>, <guilabel>UNCLAIMED</guilabel>, <guilabel>ENABLED</guilabel> or <guilabel>DISABLED</guilabel>.</para>
+				<para>Open a terminal (&terminal;), type the command <userinput>sudo lshw -C network</userinput>, then press the <keycap>&key;Enter</keycap> key. You will see some output, along with the words <guilabel>CLAIMED</guilabel>, <guilabel>UNCLAIMED</guilabel>, <guilabel>ENABLED</guilabel> or <guilabel>DISABLED</guilabel>.</para>
 
 				<itemizedlist>
 					<listitem><para><guilabel>CLAIMED</guilabel> indicates that a driver is loaded but not functioning. Continue to <xref linkend="network-troubleshooting-ndiswrapper" />.</para></listitem>
@@ -157,7 +157,7 @@
 				<para>Xubuntu supports a system known as <application>NDISWrapper</application>. This allows you to use a Windows wireless device driver under Xubuntu. To start using <application>NDISWrapper</application>:</para>
 
 				<itemizedlist>
-					<listitem><para>Obtain the Windows driver for your network device and locate the file that ends with .inf</para></listitem>
+					<listitem><para>Obtain the Windows driver for your network device and locate the file that ends with <literal>.inf</literal></para></listitem>
 					<listitem><para>Install the <literal>&package;ndisgtk</literal> package</para></listitem>
 					<listitem><para>Go to &wm-settings-ndisgtk;</para></listitem>
 					<listitem><para>Select <guibutton>Install new driver</guibutton></para></listitem>
@@ -169,7 +169,7 @@
 			<section id="network-troubleshooting-router">
 				<title>Checking for a connection to the router</title>
 
-				<para>Open a terminal (&terminal;) and type the command <userinput>iwconfig</userinput> and press <keycap>&key;Enter</keycap>.</para>
+				<para>Open a terminal (&terminal;), type the command <userinput>iwconfig</userinput> then press the <keycap>&key;Enter</keycap> key.</para>
 
 				<para>If the <guilabel>ESSID</guilabel> for your router is displayed, there may be a problem with ACPI support. Boot Xubuntu with the <literal>pci=noacpi</literal> option.</para>
 			</section>
@@ -183,7 +183,7 @@
 			<section id="network-troubleshooting-ip-assignment">
 				<title>Checking IP assignment</title>
 
-				<para>Open a terminal (&terminal;) and type the command <userinput>ifconfig</userinput> and press <keycap>&key;Enter</keycap>. If there is an IP address displayed, continue to <xref linkend="network-troubleshooting-dns" />.</para>
+				<para>Open a terminal (&terminal;), type the command <userinput>ifconfig</userinput> then press the <keycap>&key;Enter</keycap> key. If there is an IP address displayed, continue to <xref linkend="network-troubleshooting-dns" />.</para>
 
 				<para>From the terminal enter the following command, replacing <literal>eth1</literal> with the name of the connection shown in the output from the <application>ifconfig</application> command: <userinput>sudo dhclient eth1</userinput></para>
 
@@ -196,9 +196,9 @@
 			<section id="network-troubleshooting-dns">
 				<title>Check Domain Name Servers (DNS)</title>
 
-				<para>Open a terminal (&terminal;) and type the command <userinput>nmcli device show</userinput> and press <keycap>&key;Enter</keycap>, then look for the entry under <literal>IP4.DNS</literal></para>
+				<para>Open a terminal (&terminal;), type the command <userinput>nmcli device show</userinput> then press the <keycap>&key;Enter</keycap> key.  Look for the entries under <literal>IP4.DNS</literal></para>
 
-				<para>To check if the listed DNS works, open a terminal (&terminal;) and type the command <userinput>dig xubuntu.org</userinput> and press <keycap>&key;Enter</keycap>.  If you see the word <literal>NOERROR</literal>in the header section of the output, your DNS is working.</para>
+				<para>To check if the listed DNS works, open a terminal (&terminal;), type the command <userinput>dig xubuntu.org</userinput> then press the <keycap>&key;Enter</keycap> key.  If you see the word <literal>NOERROR</literal>in the header section of the output, your DNS is working.</para>
 
 				<para>If there are no DNS settings listed, contact your Internet Service Provider (ISP), and find out your primary and secondary domain name servers. Once you have this information, continue to <xref linkend="network-connect-disconnect" /> and <xref linkend="network-configure" /> if needed.</para>
 			</section>
@@ -218,8 +218,8 @@
 
 		<para>Upon successfully connecting to the server, an icon labeled with connection details will appear in the <application>Gigolo</application> window. To bookmark connections, right-click on a connection and select <menuchoice><guimenuitem>Create Bookmark</guimenuitem></menuchoice>. In the <guilabel>Edit Bookmarks</guilabel> dialog, you can name the bookmark and set other options, including the option to auto-connect. Once you are done, click <guibutton>OK</guibutton> to create the bookmark.</para>
 
-		<tip><para>The Windows Share username should be in the format DOMAIN\username</para></tip>
+		<tip><para>The Windows Share username should be in the format <literal>DOMAIN\username</literal></para></tip>
 
-		<note><para>For SAMBA Networks (Windows shares), the package <literal>&package;gvfs-backends</literal> needs to be installed in order to connect using the <application>Thunar File Manager</application>.</para></note>
+		<note><para>For Samba Networks (Windows shares), the package <literal>&package;gvfs-backends</literal> needs to be installed in order to connect using the <application>Thunar File Manager</application>.</para></note>
 	</section>
 </chapter>
 
=== modified file 'desktop-guide/C/migrating-upgrading.xml'
--- desktop-guide/C/migrating-upgrading.xml	2014-10-28 22:59:53 +0000
+++ desktop-guide/C/migrating-upgrading.xml	2015-02-18 00:01:42 +0000
@@ -87,7 +87,7 @@
 		<section id="upgrading-to-devel">
 			<title>Upgrading to the development version</title>
 
-			<warning><para>Development releases often suffer from package breakages and other problems. Only install a development release if you are prepared to attempt to fix these problems for yourself  or if you want to help the Xubuntu team by testing and giving feedback.</para></warning>
+			<warning><para>Development releases often suffer from package breakages and other problems. Only install a development release if you are prepared to attempt to fix these problems for yourself or if you want to help the Xubuntu team by testing and giving feedback.</para></warning>
 			<note><para>You will need to be running the latest regular version to be able to upgrade to the version currently under development.</para></note>
 			<para>If you would like to install and test the latest development version of Xubuntu before it is released, run <userinput>pkexec update-manager -c -d</userinput> at the command line. This will allow you to upgrade to the current development release. Please consider <ulink url="http://xubuntu.org/contribute/qa">getting involved</ulink> with reporting usage of development versions and associated packages.</para>
 		</section>
 
=== modified file 'desktop-guide/libs/xubuntu.ent'
--- desktop-guide/libs/xubuntu.ent	2015-01-19 14:36:56 +0000
+++ desktop-guide/libs/xubuntu.ent	2015-02-18 00:01:42 +0000
@@ -34,7 +34,7 @@
 <!ENTITY gnu-web 'http://www.gnu.org/' >
 <!ENTITY gimp-web 'http://www.gimp.org/' >
 <!ENTITY gthumb-web 'https://live.gnome.org/gthumb' >
-<!ENTITY haveibeenpwned 'https://haveibeenpwnedcom/' >
+<!ENTITY haveibeenpwned 'https://haveibeenpwned.com/' >
 <!ENTITY kernel-web 'http://www.kernel.org/' >
 <!ENTITY laptop-qa 'http://laptop.qa.ubuntu.com/' >
 <!ENTITY launchpad-web 'http://launchpad.net/' >