Ubuntu Documentation

Merge lp:~dsmythies/ubuntu-docs/usc into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. usc
  2. Merge into trunk2017-07-10
Proposed by Doug Smythies
Status: Merged
Merged at revision: 486
Proposed branch: lp:~dsmythies/ubuntu-docs/usc
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 589 lines (+121/-98)
13 files modified
ubuntu-help/C/addremove-install-synaptic.page (+6/-6)
ubuntu-help/C/addremove-install.page (+5/-14)
ubuntu-help/C/addremove-ppa.page (+5/-6)
ubuntu-help/C/addremove-remove.page (+5/-5)
ubuntu-help/C/addremove-sources.page (+12/-13)
ubuntu-help/C/app-cheese.page (+9/-17)
ubuntu-help/C/check_releases.sh (+8/-0)
ubuntu-help/C/net-antivirus.page (+12/-5)
ubuntu-help/C/net-install-flash.page (+17/-15)
ubuntu-help/C/net-vpn-connect.page (+17/-7)
ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page (+19/-5)
ubuntu-help/C/unity-dash-apps.page (+2/-2)
ubuntu-help/C/video-sending.page (+4/-3)
To merge this branch: bzr merge lp:~dsmythies/ubuntu-docs/usc
Reviewer Review Type Date Requested Status
Gunnar Hjalmarsson Approve
Review via email: mp+288994@code.launchpad.net

Description of the change

Mainly updates for the change from "Ubuntu Software Center" to "Software" (Center).
A couple of changes because "Software Sources" is now called "Software & Updates".
A script update, although its usefulness is questionable.

To post a comment you must log in.
lp:~dsmythies/ubuntu-docs/usc updated
487. By Doug Smythies

V2: udpates for change from Ubuntu Software Center to Software (Center)

Revision history for this message
Doug Smythies (dsmythies) wrote :

O.K. I have submitted version 2 of this merge proposal.

I have not been able to figure out how to get rid of the "No newline at end of file" message on line 586.

I still do not know the actual name of whatever app comes up now for installing from a link.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

I merged it. Thanks!

Didn't get any error message when running scripts/validate.sh.

Do we need to include the name of "apturl" in the docs?

review: Approve
Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

Aha, now I see what you mean by "No newline...". Nothing to worry about. It's just that you added a trailing newline, while the previous version didn't have it.

Revision history for this message
Doug Smythies (dsmythies) wrote :

apturl: Perhaps I'll edit that name back into the two spots where it used to say "Ubuntu Software Center" for the where the link would end up.

No Newline: No that wasn't it. I tried a bunch of variations, always running "bzr diff" in between. Anyway, it doesn't seem to cause harm.

Revision history for this message
Gunnar Hjalmarsson (gunnarhj) wrote :

A thought: Do the users really need to know the name of that thing (apturl)?

P.S. Thanks for your reply to my private mail, and for commenting on Mark's MP. I'll get into that tomorrow.

Revision history for this message
Doug Smythies (dsmythies) wrote :

> A thought: Do the users really need to know the name of that thing (apturl)?

I don't think so. Privately, I'll send you links to the two effected pages as they appear on my test website. Myself, I think what I have done is O.K.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/addremove-install-synaptic.page'
2--- ubuntu-help/C/addremove-install-synaptic.page 2014-03-11 15:49:06 +0000
3+++ ubuntu-help/C/addremove-install-synaptic.page 2016-03-15 22:26:07 +0000
4@@ -14,7 +14,7 @@
5
6 <link type="guide" xref="addremove"/>
7 <revision pkgversion="0.80.4" version="0" date="2014-01-11" status="review"/>
8- <revision version="14.04" date="2014-01-08" status="review"/>
9+ <revision version="16.04" date="2016-03-13" status="review"/>
10
11 <license>
12 <p>
13@@ -25,7 +25,7 @@
14
15 <desc>
16 Synaptic is a powerful but complicated software management alternative to
17- Ubuntu Software Center.
18+ <app>Software</app>.
19 </desc>
20 </info>
21
22@@ -35,15 +35,15 @@
23
24 <p>
25 <app>Synaptic Package Manager</app> is more powerful and can do some
26- software management tasks which <app>Ubuntu Software Center</app> can't.
27- Synaptic's interface is more complicated and doesn't support newer Software
28- Center features like ratings and reviews and therefore isn't recommended for
29+ software management tasks which <app>Software</app> can't.
30+ Synaptic's interface is more complicated and doesn't support newer <app>Software</app>
31+ features like ratings and reviews and therefore isn't recommended for
32 use by those new to Ubuntu.
33 </p>
34
35 <p>
36 Synaptic isn't installed by default, but you can <link
37- href="apt:synaptic">install</link> it with Software Center.
38+ href="apt:synaptic">install</link> it with <app>Software</app>.
39 </p>
40
41 <section id="install-software-with-synaptic">
42
43=== modified file 'ubuntu-help/C/addremove-install.page'
44--- ubuntu-help/C/addremove-install.page 2014-01-12 23:36:56 +0000
45+++ ubuntu-help/C/addremove-install.page 2016-03-15 22:26:07 +0000
46@@ -7,7 +7,7 @@
47 <name>Ubuntu Documentation Team</name>
48 </credit>
49 <desc>
50- Use the Ubuntu Software Center to add programs and make Ubuntu more
51+ Use <app>Software</app> to add programs and make Ubuntu more
52 useful.
53 </desc>
54 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
55@@ -15,7 +15,7 @@
56 <link type="seealso" xref="addremove-remove"/>
57 <link type="seealso" xref="addremove-install-synaptic"/>
58 <link type="seealso" xref="prefs-language-install"/>
59- <revision version="13.10" date="2013-10-25" status="review"/>
60+ <revision version="16.04" date="2016-03-13" status="review"/>
61 </info>
62
63 <title>
64@@ -42,14 +42,14 @@
65 </item>
66 <item>
67 <p>
68- Click the <app>Ubuntu Software Center</app> icon in the
69- <gui>Launcher</gui>, or search for <input>Software Center</input> in the
70+ Click the <app>Software</app> icon in the
71+ <gui>Launcher</gui>, or search for <input>Software</input> in the
72 <gui>Dash</gui>.
73 </p>
74 </item>
75 <item>
76 <p>
77- When the Software Center launches, search for an application, or select
78+ When <app>Software</app> launches, search for an application, or select
79 a category and find an application from the list.
80 </p>
81 </item>
82@@ -80,13 +80,4 @@
83 </item>
84 </steps>
85
86- <!-- The Software Center help hasn't even been updated for Unity yet, so no
87- need to link there
88- <p>
89- For more information about using the <app>Ubuntu Software Center</app>,
90- consult the <link href="help:software-center">Ubuntu Software Center
91- Manual</link>.
92- </p>
93- -->
94-
95 </page>
96
97=== modified file 'ubuntu-help/C/addremove-ppa.page'
98--- ubuntu-help/C/addremove-ppa.page 2014-01-06 21:56:33 +0000
99+++ ubuntu-help/C/addremove-ppa.page 2016-03-15 22:26:07 +0000
100@@ -12,7 +12,7 @@
101 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
102 <link type="guide" xref="addremove"/>
103 <link type="seealso" xref="addremove-sources"/>
104- <revision version="13.10" date="2013-10-25" status="review"/>
105+ <revision version="16.04" date="2016-03-13" status="review"/>
106 </info>
107
108 <title>
109@@ -49,15 +49,14 @@
110 </item>
111 <item>
112 <p>
113- Click the <app>Ubuntu Software Center</app> icon in the
114- <gui>Launcher</gui>, or search for <input>Software Center</input> in the
115+ Click the <app>Software</app> icon in the
116+ <gui>Launcher</gui>, or search for <input>Software</input> in the
117 <gui>Dash</gui>.
118 </p>
119 </item>
120 <item>
121 <p>
122- When the Software Center launches, click <guiseq><gui>Edit</gui>
123- <gui>Software Sources</gui></guiseq>
124+ When <app>Software</app> launches, click <gui>Software &amp; Updates</gui>
125 </p>
126 </item>
127 <item>
128@@ -78,7 +77,7 @@
129 </item>
130 <item>
131 <p>
132- Close the Software Sources window. Ubuntu Software Center will then
133+ Close the <app>Software &amp; Updates</app> window. <app>Software</app> will then
134 check your software sources for new software.
135 </p>
136 </item>
137
138=== modified file 'ubuntu-help/C/addremove-remove.page'
139--- ubuntu-help/C/addremove-remove.page 2014-01-06 21:56:33 +0000
140+++ ubuntu-help/C/addremove-remove.page 2016-03-15 22:26:07 +0000
141@@ -11,7 +11,7 @@
142 </desc>
143 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
144 <link type="guide" xref="addremove" group="#first"/>
145- <revision version="13.10" date="2013-10-25" status="review"/>
146+ <revision version="16.04" date="2016-03-13" status="review"/>
147 </info>
148
149 <title>
150@@ -19,21 +19,21 @@
151 </title>
152
153 <p>
154- The <app>Ubuntu Software Center</app> helps you to remove software that you
155+ <app>Software</app> helps you to remove software that you
156 no longer use.
157 </p>
158
159 <steps>
160 <item>
161 <p>
162- Click the <app>Ubuntu Software Center</app> icon in the
163- <gui>Launcher</gui> or search for <input>Software Center</input> in the
164+ Click the <app>Software</app> icon in the
165+ <gui>Launcher</gui> or search for <input>Software</input> in the
166 <gui>Dash</gui>.
167 </p>
168 </item>
169 <item>
170 <p>
171- When the Software Center opens, click the <gui>Installed</gui> button at
172+ When <app>Software</app> opens, click the <gui>Installed</gui> button at
173 the top.
174 </p>
175 </item>
176
177=== modified file 'ubuntu-help/C/addremove-sources.page'
178--- ubuntu-help/C/addremove-sources.page 2015-10-29 14:04:12 +0000
179+++ ubuntu-help/C/addremove-sources.page 2016-03-15 22:26:07 +0000
180@@ -13,7 +13,7 @@
181 </desc>
182 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
183 <link type="guide" xref="addremove"/>
184- <revision version="13.10" date="2013-10-25" status="review"/>
185+ <revision version="16.04" date="2016-03-13" status="review"/>
186 </info>
187
188 <title>
189@@ -44,15 +44,14 @@
190 </title>
191 <item>
192 <p>
193- Click on the <app>Ubuntu Software Center</app> icon in the Launcher, or
194- search for Ubuntu Software Center in the search bar of the
195+ Click on the <app>Software</app> icon in the Launcher, or
196+ search for <input>Software</input> in the search bar of the
197 <app>Dash</app>.
198 </p>
199 </item>
200 <item>
201 <p>
202- When the Software Center launches, click <guiseq><gui>Edit</gui>
203- <gui>Software Sources</gui></guiseq>
204+ When <app>Software</app> launches, click <gui>Software &amp; Updates</gui>
205 </p>
206 </item>
207 <item>
208@@ -73,8 +72,8 @@
209 </item>
210 <item>
211 <p>
212- Click <gui>Add Source</gui> then close the Software Sources window.
213- Ubuntu Software Center will then check your software sources for new
214+ Click <gui>Add Source</gui> then close the <app>Software &amp; Updates</app> window.
215+ <app>Software</app> will then check your software sources for new
216 updates.
217 </p>
218 </item>
219@@ -88,23 +87,23 @@
220 The Canonical Partner repository offers some proprietary applications
221 that don't cost any money to use but are closed source. They include
222 software like <app>Skype</app>, <app>Adobe Reader</app> and <app>Adobe
223- Flash Plugin</app>. Software in this repository will appear in Ubuntu
224- Software Center search results but won't be installable until this
225+ Flash Plugin</app>. Software in this repository will appear in
226+ <app>Software</app> search results but won't be installable until this
227 repository is enabled.
228 </p>
229 <p>
230 To enable the repository, follow the steps above to open the <gui>Other
231- Software</gui> tab in <app>Software Sources</app>. If you see the
232+ Software</gui> tab in <app>Software &amp; Updates</app>. If you see the
233 <gui>Canonical Partners</gui> repository in the list, make sure it is
234- checked then close the Software Sources window. If you don't see it, click
235+ checked then close the <app>Software &amp; Updates</app> window. If you don't see it, click
236 <gui>Add</gui> and enter:
237 </p>
238 <p>
239 <code its:translate="no">deb http://archive.canonical.com/ubuntu xenial partner</code>
240 </p>
241 <p>
242- Click <gui>Add Source</gui> then close the Software Sources window. Wait a
243- moment for Ubuntu Software Center to download the repository information.
244+ Click <gui>Add Source</gui> then close the <app>Software &amp; Updates</app> window. Wait a
245+ moment for <app>Software</app> to download the repository information.
246 </p>
247 </section>
248
249
250=== modified file 'ubuntu-help/C/app-cheese.page'
251--- ubuntu-help/C/app-cheese.page 2013-10-25 18:47:16 +0000
252+++ ubuntu-help/C/app-cheese.page 2016-03-15 22:26:07 +0000
253@@ -12,7 +12,7 @@
254 </desc>
255 <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
256 <link type="guide" xref="media#videos" />
257- <revision version="13.10" date="2013-10-25" status="review"/>
258+ <revision version="16.04" date="2016-03-14" status="review"/>
259 </info>
260
261 <title>
262@@ -25,26 +25,18 @@
263 </p>
264
265 <p>
266- Cheese is not installed by default in Ubuntu. To install Cheese:
267+ Cheese is installed by default in Ubuntu. However, one can both check that it is installed and if not install it via:
268 </p>
269
270 <list type="numbered">
271 <item>
272 <p>
273- Click <link href="apt:cheese">this link</link> to launch the
274- <app>Software Center</app>.
275- </p>
276- </item>
277- <item>
278- <p>
279- Read the information and reviews about Cheese to make sure you want to
280- install it.
281- </p>
282- </item>
283- <item>
284- <p>
285- If you choose to install it, click <gui>Install</gui> from the Software
286- Center window.
287+ Click <link href="apt:cheese">this link</link>
288+ </p>
289+ </item>
290+ <item>
291+ <p>
292+ If not already installed and you choose to install it, click <gui>Install</gui> from the window.
293 </p>
294 </item>
295 </list>
296@@ -61,7 +53,7 @@
297
298 <note style="important">
299 <p>
300- You need to install Cheese before you can read the Cheese user guide.
301+ The Cheese user guide is only available if Cheese in installed.
302 </p>
303 </note>
304
305
306=== modified file 'ubuntu-help/C/check_releases.sh' (properties changed: -x to +x)
307--- ubuntu-help/C/check_releases.sh 2013-09-16 19:42:26 +0000
308+++ ubuntu-help/C/check_releases.sh 2016-03-15 22:26:07 +0000
309@@ -49,6 +49,14 @@
310 raring
311 Saucy
312 saucy
313+Trusty
314+trusty
315+Utopic
316+utopic
317+Vivid
318+vivid
319+Wily
320+wily
321 );
322
323 for i in "${ReleaseNames[@]}"; # for each name in the ReleaseNames array above
324
325=== modified file 'ubuntu-help/C/net-antivirus.page'
326--- ubuntu-help/C/net-antivirus.page 2013-09-15 18:32:55 +0000
327+++ ubuntu-help/C/net-antivirus.page 2016-03-15 22:26:07 +0000
328@@ -6,7 +6,7 @@
329 <link type="guide" xref="net-security"/>
330
331 <revision pkgversion="3.4.0" date="2012-02-20" status="final"/>
332- <revision version="13.10" date="2013-09-15" status="review"/>
333+ <revision version="16.04" date="2016-03-14" status="review"/>
334
335 <desc>There are few Linux viruses, so you probably don't need anti-virus software.</desc>
336
337@@ -24,12 +24,19 @@
338
339 <title>Do I need anti-virus software?</title>
340
341-<p>If you are used to Windows or Mac OS, you are probably also used to having anti-virus software running all of the time. Anti-virus software runs in the background, constantly checking for computer viruses that might find their way onto your computer and cause problems.</p>
342+<p>If you are used to Windows or Mac OS, you are probably also used to having anti-virus software
343+running all of the time. Anti-virus software runs in the background, constantly checking for
344+computer viruses that might find their way onto your computer and cause problems.</p>
345
346-<p>Anti-virus software does exist for Linux, but you probably don't need to use it. Viruses that affect Linux are still very rare. Some argue that this is because Linux is not as widely used as other operating systems, so no-one writes viruses for it. Others argue that Linux is intrinsically more secure, and security problems that viruses could make use of are fixed very quickly.</p>
347+<p>Anti-virus software does exist for Linux, but you probably don't need to use it. Viruses that
348+affect Linux are still very rare. Some argue that this is because Linux is not as widely used as
349+other operating systems, so no-one writes viruses for it. Others argue that Linux is intrinsically
350+more secure, and security problems that viruses could make use of are fixed very quickly.</p>
351
352 <p>Whatever the reason, Linux viruses are so rare that you don't really need to worry about them at the moment.</p>
353
354-<p>If you want to be extra-safe, or if you want to check for viruses in files that you are passing between yourself and people using Windows and Mac OS, you can still install anti-virus software. Check in the <app>Ubuntu Software Center</app> where a number of applications are available.</p>
355+<p>If you want to be extra-safe, or if you want to check for viruses in files that you are passing between yourself
356+and people using Windows and Mac OS, you can still install anti-virus software. Check in <app>Software</app>
357+where a number of applications are available.</p>
358
359-</page>
360\ No newline at end of file
361+</page>
362
363=== modified file 'ubuntu-help/C/net-install-flash.page'
364--- ubuntu-help/C/net-install-flash.page 2013-09-15 18:32:55 +0000
365+++ ubuntu-help/C/net-install-flash.page 2016-03-15 22:26:07 +0000
366@@ -5,7 +5,7 @@
367 <link type="guide" xref="net-browser"/>
368
369 <revision pkgversion="3.4.0" date="2012-02-20" status="final"/>
370- <revision version="13.10" date="2013-09-15" status="review"/>
371+ <revision version="16.04" date="2016-03-14" status="review"/>
372
373 <credit type="author">
374 <name>Phil Bull</name>
375@@ -25,32 +25,34 @@
376 <p>Would be nice to (soft?) link to a page on the software installer</p>
377 </comment>
378
379-<p>If you do not have Flash installed, you will probably see a message telling you so when you visit a website that needs it. Flash is available as a free (but not open-source) download for most web browsers.</p>
380+<p>If you do not have Flash installed, you will probably see a message telling you so when you visit a website
381+that needs it. Flash is available as a free (but not open-source) download for most web browsers.</p>
382
383 <steps>
384 <title>How to install Flash</title>
385 <item>
386- <p>Click <link href="apt:flashplugin-installer">this link</link> to launch the <app>Software Center</app>.</p>
387- </item>
388- <item>
389- <p>Read the information and reviews to make sure you want to install Flash.</p>
390- </item>
391- <item>
392- <p>If you choose to install Flash, click <gui>Install</gui> from the Software Center window.</p>
393- </item>
394- <item>
395- <p>If you have any web browser windows open, close them and then re-open them. The web browser should detect that Flash is installed when you open it again, and you should now be able to view websites using Flash.</p>
396+ <p>Click <link href="apt:flashplugin-installer">this link</link> to launch an install option window.</p>
397+ </item>
398+ <item>
399+ <p>If you choose to install Flash, click <gui>Install</gui>.</p>
400+ </item>
401+ <item>
402+ <p>If you have any web browser windows open, close them and then re-open them. The web browser should detect
403+ that Flash is installed when you open it again, and you should now be able to view websites using Flash.</p>
404 </item>
405 </steps>
406
407 <section id="alternatives">
408 <title>Open-source alternatives to Flash</title>
409- <p>A handful of free, open-source alternatives to Flash are available. These tend to work better than the Flash plug-in in some ways (for example, by handling sound playback better), but worse in others (for example, by not being able to display some of the more complicated Flash pages on the web).</p>
410- <p>You might like to try one of these if you are dissatisfied with the Flash player, or if you would like to use as much open-source software as possible on your computer. Here are a few of the options:</p>
411+ <p>A handful of free, open-source alternatives to Flash are available. These tend to work better than the Flash
412+ plug-in in some ways (for example, by handling sound playback better), but worse in others (for example, by not
413+ being able to display some of the more complicated Flash pages on the web).</p>
414+ <p>You might like to try one of these if you are dissatisfied with the Flash player, or if you would like to use
415+ as much open-source software as possible on your computer. Here are a few of the options:</p>
416 <list>
417 <item><p><link href="apt:browser-plugin-gnash">Gnash</link></p></item>
418 <item><p><link href="apt:browser-plugin-lightspark">LightSpark</link></p></item>
419 </list>
420 </section>
421
422-</page>
423\ No newline at end of file
424+</page>
425
426=== modified file 'ubuntu-help/C/net-vpn-connect.page'
427--- ubuntu-help/C/net-vpn-connect.page 2013-09-15 18:32:55 +0000
428+++ ubuntu-help/C/net-vpn-connect.page 2016-03-15 22:26:07 +0000
429@@ -6,7 +6,7 @@
430 <link type="guide" xref="net-wired"/>
431
432 <revision pkgversion="3.4.0" date="2012-02-19" status="review"/>
433- <revision version="13.10" date="2013-09-15" status="review"/>
434+ <revision version="16.04" date="2016-03-14" status="review"/>
435
436 <credit type="author">
437 <name>GNOME Documentation Project</name>
438@@ -19,12 +19,20 @@
439
440 <title>Connect to a VPN</title>
441
442-<p>A VPN (or <em>Virtual Private Network</em>) is a way of connecting to a local network over the internet. For example, say you want to connect to the local network at your workplace while you're on a business trip. You would find an internet connection somewhere (like at a hotel) and then connect to your workplace's VPN. It would be as if you were directly connected to the network at work, but the actual network connection would be through the hotel's internet connection. VPN connections are usually <em>encrypted</em> to prevent people from accessing the local network you're connecting to without logging in.</p>
443+<p>A VPN (or <em>Virtual Private Network</em>) is a way of connecting to a local network over the internet. For example,
444+say you want to connect to the local network at your workplace while you're on a business trip. You would find an internet
445+connection somewhere (like at a hotel) and then connect to your workplace's VPN. It would be as if you were directly connected
446+to the network at work, but the actual network connection would be through the hotel's internet connection. VPN connections
447+are usually <em>encrypted</em> to prevent people from accessing the local network you're connecting to without logging in.</p>
448
449-<p>There are a number of different types of VPN. You may have to install some extra software depending on what type of VPN you're connecting to. Find out the connection details from whoever is in charge of the VPN and see which <em>VPN client</em> you need to use. Then, open <app>Ubuntu Software Center</app> and search for the <app>network-manager</app> package which works with your VPN (if there is one) and install it. You will need to click the <gui>Show technical items</gui> link at the bottom of <app>Ubuntu Software Center</app>.</p>
450+<p>There are a number of different types of VPN. You may have to install some extra software depending on what type of VPN
451+you're connecting to. Find out the connection details from whoever is in charge of the VPN and see which <em>VPN client</em>
452+you need to use. Then, open <app>Software</app> and search for the <app>network-manager</app> package which works
453+with your VPN (if there is one) and install it.</p>
454
455 <note>
456- <p>If there isn't a NetworkManager package for your type of VPN, you will probably have to download and install some client software from the company that provides the VPN software. You'll probably have to follow some different instructions to get that working.</p>
457+ <p>If there isn't a NetworkManager package for your type of VPN, you will probably have to download and install some client
458+ software from the company that provides the VPN software. You'll probably have to follow some different instructions to get that working.</p>
459 </note>
460
461 <p>Once that's done, you can set up the VPN connection:</p>
462@@ -43,11 +51,13 @@
463 </item>
464
465 <item>
466- <p>When you've finished setting-up the VPN, click the <gui>network menu</gui> on the menu bar, go to <gui>VPN Connections</gui> and click on the connection you just created. It will try to establish a VPN connection - the network icon will change as it tries to connect.</p>
467+ <p>When you've finished setting-up the VPN, click the <gui>network menu</gui> on the menu bar, go to <gui>VPN Connections</gui> and
468+ click on the connection you just created. It will try to establish a VPN connection - the network icon will change as it tries to connect.</p>
469 </item>
470
471 <item>
472- <p>Hopefully, you will successfully connect to the VPN. If not, you may need to double-check the VPN settings you entered. You can do this by clicking the network menu, selecting <gui>Edit Connections</gui> and going to the <gui>VPN</gui> tab.</p>
473+ <p>Hopefully, you will successfully connect to the VPN. If not, you may need to double-check the VPN settings you entered. You can
474+ do this by clicking the network menu, selecting <gui>Edit Connections</gui> and going to the <gui>VPN</gui> tab.</p>
475 </item>
476
477 <item>
478@@ -55,4 +65,4 @@
479 </item>
480 </steps>
481
482-</page>
483\ No newline at end of file
484+</page>
485
486=== modified file 'ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page'
487--- ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page 2013-10-23 22:18:16 +0000
488+++ ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page 2016-03-15 22:26:07 +0000
489@@ -4,7 +4,7 @@
490 <info>
491 <link type="guide" xref="net-wireless-troubleshooting"/>
492 <revision pkgversion="3.4.0" date="2012-03-05" status="outdated"/>
493- <revision version="13.10" date="2013-10-23" status="outdated"/>
494+ <revision version="16.04" date="2016-03-14" status="outdated"/>
495
496 <credit type="author">
497 <name>Contributors to the Ubuntu documentation wiki</name>
498@@ -24,12 +24,20 @@
499
500 <!-- Needs links (see below) -->
501
502-<p>In this step you can check to see if you can get working device drivers for your wireless adapter. A <em>device driver</em> is a piece of software which tells the computer how to make a hardware device work properly. Even though the wireless adapter has been recognized by the computer, it may not have drivers which work very well. You may be able to find different drivers for the wireless adapter which do work. Try some of the options below:</p>
503+<p>In this step you can check to see if you can get working device drivers for your wireless adapter.
504+A <em>device driver</em> is a piece of software which tells the computer how to make a hardware device
505+work properly. Even though the wireless adapter has been recognized by the computer, it may not have drivers
506+which work very well. You may be able to find different drivers for the wireless adapter which do work. Try some of the options below:</p>
507
508 <list>
509 <item>
510 <p>Check to see if your wireless adapter is on a list of supported devices</p>
511- <p>Most Linux distributions keep a list of wireless devices that they have support for. Sometimes, these lists provide extra information on how to get the drivers for certain adapters working properly. Go to the list for your distribution (for example, <link href="https://help.ubuntu.com/community/WifiDocs/WirelessCardsSupported">Ubuntu</link>, <link href="http://linuxwireless.org/en/users/Drivers">Fedora</link> or <link href="http://en.opensuse.org/HCL:Network_(Wireless)">openSuSE</link>) and see if your make and model of wireless adapter is listed. You may be able to use some of the information there to get your wireless drivers working.</p>
512+ <p>Most Linux distributions keep a list of wireless devices that they have support for. Sometimes, these lists provide extra information
513+ on how to get the drivers for certain adapters working properly. Go to the list for your distribution
514+ (for example, <link href="https://help.ubuntu.com/community/WifiDocs/WirelessCardsSupported">Ubuntu</link>,
515+ <link href="http://linuxwireless.org/en/users/Drivers">Fedora</link> or
516+ <link href="http://en.opensuse.org/HCL:Network_(Wireless)">openSuSE</link>) and see if your make and model of wireless
517+ adapter is listed. You may be able to use some of the information there to get your wireless drivers working.</p>
518 </item>
519
520 <item>
521@@ -44,7 +52,7 @@
522 Click the button at the far right side of the menu bar and select <gui>System Settings</gui>.
523 </p></item>
524 <item><p>
525- In the System section, click <gui>Software Sources</gui>.
526+ In the System section, click <gui>Software &amp; Updates</gui>.
527 </p></item>
528 <item><p>
529 Switch to the <gui>Additional Drivers</gui> tab.
530@@ -55,7 +63,13 @@
531
532 <item>
533 <p>Use the Windows drivers for your adapter</p>
534- <p>In general, you cannot use a device driver designed for one operating system (like Windows) on another operating system (like Linux). This is because they have different ways of handling devices. For wireless adapters, however, you can install a compatibility layer called <em>NDISwrapper</em> which lets you use some Windows wireless drivers on Linux. This is useful because wireless adapters almost always have Windows drivers available for them, whereas Linux drivers are sometimes not available. You can learn more about how to use NDISwrapper <link href="http://sourceforge.net/apps/mediawiki/ndiswrapper/index.php?title=Main_Page">here</link>. Note that not all wireless drivers can be used through NDISwrapper.</p>
535+ <p>In general, you cannot use a device driver designed for one operating system (like Windows) on another operating
536+ system (like Linux). This is because they have different ways of handling devices. For wireless adapters, however,
537+ you can install a compatibility layer called <em>NDISwrapper</em> which lets you use some Windows wireless drivers
538+ on Linux. This is useful because wireless adapters almost always have Windows drivers available for them, whereas
539+ Linux drivers are sometimes not available. You can learn more about how to use NDISwrapper
540+ <link href="http://sourceforge.net/apps/mediawiki/ndiswrapper/index.php?title=Main_Page">here</link>.
541+ Note that not all wireless drivers can be used through NDISwrapper.</p>
542 <p>Full information on ndiswrapper kept on
543 <link href="https://help.ubuntu.com/community/WifiDocs/Driver/Ndiswrapper">this page</link>
544 including troubleshooting help specific to ndiswrapper.</p>
545
546=== modified file 'ubuntu-help/C/unity-dash-apps.page'
547--- ubuntu-help/C/unity-dash-apps.page 2015-03-04 16:17:22 +0000
548+++ ubuntu-help/C/unity-dash-apps.page 2016-03-15 22:26:07 +0000
549@@ -7,7 +7,7 @@
550
551 <desc>Run, install, or uninstall apps.</desc>
552
553- <revision version="13.10" date="2013-10-23" status="outdated"/>
554+ <revision version="16.04" date="2013-03-14" status="outdated"/>
555
556 <credit type="author">
557 <name>Jeremy Bicha</name>
558@@ -30,7 +30,7 @@
559
560 <p>Right click on a search result to open a <gui>preview</gui>. The
561 preview shows a short description of the application, a screenshot, its
562- <gui>Software Center</gui> rating, and what version is available.</p>
563+ <app>Software</app> rating, and what version is available.</p>
564
565 <p>For installed applications, you can see when the application was installed and
566 either launch the application or uninstall it. Certain essential applications cannot
567
568=== modified file 'ubuntu-help/C/video-sending.page'
569--- ubuntu-help/C/video-sending.page 2013-10-24 03:29:17 +0000
570+++ ubuntu-help/C/video-sending.page 2016-03-15 22:26:07 +0000
571@@ -44,7 +44,7 @@
572 Windows and Mac OS as well as Linux, and supports a lot of different video
573 formats. Otherwise, try converting your video into a different format. Most
574 video editors are able to do this, and specific video converter applications are
575- available. Check the <app>Ubuntu Software Center</app> to see what's available.</p>
576+ available. Check <app>Software</app> to see what's available.</p>
577
578 <note>
579 <p>There are a few other problems which might prevent someone from playing
580@@ -53,5 +53,6 @@
581 with their video playback application, or the video may not have been created
582 properly (there could have been some errors when you saved the video).</p>
583 </note>
584-
585-</page>
586\ No newline at end of file
587+
588+</page>
589+

Subscribers

People subscribed via source and target branches