Ubuntu Documentation

Merge lp:~jan-simon/ubuntu-docs/session-system-menu into lp:ubuntu-docs/precise

  1. session-system-menu
  2. Merge into precise
Proposed by Jan Simon
Status: Merged
Merged at revision: 83
Proposed branch: lp:~jan-simon/ubuntu-docs/session-system-menu
Merge into: lp:ubuntu-docs/precise
Diff against target: 65 lines (+7/-7)
2 files modified
ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page (+3/-3)
ubuntu-help/C/shell-exit.page (+4/-4)
To merge this branch: bzr merge lp:~jan-simon/ubuntu-docs/session-system-menu
Reviewer Review Type Date Requested Status
Ubuntu Documentation Committers Pending
Review via email: mp+94805@code.launchpad.net

Description of the change

Replaces "session menu", where it was still in the doc, with "system menu".

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page'
2--- ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page 2011-08-26 09:26:02 +0000
3+++ ubuntu-help/C/net-wireless-troubleshooting-device-drivers.page 2012-02-27 17:03:11 +0000
4@@ -27,7 +27,7 @@
5 <p>
6 If you are not running the most recent kernel, update your system first. Drivers,
7 especially wireless, are constantly being added and modified. You can do this by clicking
8- on the <link xref="unity-appmenu-intro">session menu</link> and selecting <gui>System
9+ on the <link xref="unity-appmenu-intro">system menu</link> and selecting <gui>System
10 Settings</gui>. In the System section, click <gui>Update Manager</gui>.
11 </p>
12 </section>
13@@ -38,7 +38,7 @@
14 <list>
15 <item>
16 <p>
17- Check for a driver by clicking the <link xref="unity-appmenu-intro">session menu</link>
18+ Check for a driver by clicking the <link xref="unity-appmenu-intro">system menu</link>
19 and selecting <gui>System Settings</gui>. In the Hardware section, click
20 <gui>Additional Drivers</gui>. Wait a moment for Ubuntu to update its database.
21 </p>
22@@ -123,4 +123,4 @@
23 </section>
24
25 <links type="series"/>
26-</page>
27\ No newline at end of file
28+</page>
29
30=== modified file 'ubuntu-help/C/shell-exit.page'
31--- ubuntu-help/C/shell-exit.page 2012-02-05 20:42:42 +0000
32+++ ubuntu-help/C/shell-exit.page 2012-02-27 17:03:11 +0000
33@@ -36,7 +36,7 @@
34 yourself logged in and just switch users. If you switch users, all of
35 your applications will continue running, and everything will be where you
36 left it when you log back in.</p>
37- <p>To log out or switch users, click the <link xref="unity-appmenu-intro">session menu</link> at the
38+ <p>To log out or switch users, click the <link xref="unity-appmenu-intro">system menu</link> at the
39 very right of the menu bar and select the appropriate option.</p>
40 </section>
41
42@@ -51,7 +51,7 @@
43 If you don't lock your screen, it will lock automatically after a certain
44 amount of time.</p>
45
46- <p>To lock your screen, click the <gui>session menu</gui> in the menu bar and select
47+ <p>To lock your screen, click the <gui>system menu</gui> in the menu bar and select
48 <gui>Lock Screen</gui>.</p>
49
50 <p>When your screen is locked, other users can log in to their own accounts
51@@ -69,12 +69,12 @@
52 memory and powers off most of your computer's functions. A very small amount of
53 power is still used during suspend.</p>
54
55-<p>To suspend your computer, click the <gui>session menu</gui> in the menu bar and select
56+<p>To suspend your computer, click the <gui>system menu</gui> in the menu bar and select
57 <gui>Suspend</gui>. Or, if you have a laptop, simply close the lid. Your
58 computer will automatically suspend when the lid is closed.</p>
59
60 <p>If you want to power off your computer entirely, or do a full restart,
61-click the <gui>session menu</gui> and
62+click the <gui>system menu</gui> and
63 select <gui>Shut Down</gui>.</p>
64
65 <p>If there are other users logged in, you may not be allowed to

Subscribers

People subscribed via source and target branches