Ubuntu Documentation

Merge lp:~clissold345/ubuntu-docs/miscellaneous-zesty-changes into lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10

  1. miscellaneous-zesty-changes
  2. Merge into trunk2017-07-10
Proposed by Chris Perry
Status: Merged
Merged at revision: 604
Proposed branch: lp:~clissold345/ubuntu-docs/miscellaneous-zesty-changes
Merge into: lp:~ubuntu-core-doc/ubuntu-docs/trunk2017-07-10
Diff against target: 135 lines (+23/-14)
4 files modified
ubuntu-help/C/addremove-install.page (+4/-3)
ubuntu-help/C/addremove-remove.page (+3/-3)
ubuntu-help/C/display-lock.page (+1/-1)
ubuntu-help/C/shell-exit.page (+15/-7)
To merge this branch: bzr merge lp:~clissold345/ubuntu-docs/miscellaneous-zesty-changes
Reviewer Review Type Date Requested Status
Doug Smythies Approve
Review via email: mp+319751@code.launchpad.net

Description of the change

Here's my first lot of changes. I'll be doing some more changes tomorrow and on Wednesday. There's no need to review these changes immediately. You could leave the reviewing until after I've finished on Wednesday if you want.

The local commit was:

Committing to: /home/chris/ubuntu-docs/
modified ubuntu-help/C/addremove-install.page
modified ubuntu-help/C/addremove-remove.page
modified ubuntu-help/C/display-lock.page
modified ubuntu-help/C/shell-exit.page
Committed revision 604.

In display-lock.page I noticed that a drop-down list has a name in the gui but wasn't named when referred to in the page. It's named on another page, so I've added the name here.

In shell-exit.page three references to "system menu" weren't marked up correctly so Gunnar missed them. I've corrected them to use the icon/picture. The other changes are simple changes from looking at the menu option names in 17.04.

The log on when adding or removing snaps in 17.04 now says "Snap Store" so I've updated addremove-remove.page and addremove-install.page. I've kept the references to Ubuntu One since someone who has an Ubuntu One account can use that to log on to the Snap Store.

To post a comment you must log in.
Revision history for this message
Doug Smythies (dsmythies) wrote :

Look good to me. (Note: I did not actually compile the docs).

review: Approve

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.page'
2--- ubuntu-help/C/addremove-install.page 2017-02-13 20:59:29 +0000
3+++ ubuntu-help/C/addremove-install.page 2017-03-13 21:06:54 +0000
4@@ -33,7 +33,7 @@
5 <p>
6 Applications are available in two formats: snap packages and Debian packages.
7 An application available as a snap package is from now on referred to as a <em>snap</em>.
8- In order to install (or remove) a snap you have to log on to Ubuntu One. Some
9+ In order to install (or remove) a snap you have to log on to the Snap Store/Ubuntu One. Some
10 applications are available in both formats. In such a case in <app>Ubuntu Software</app> the snap will be
11 listed first.
12 </p>
13@@ -70,14 +70,15 @@
14
15 <item>
16 <p>
17- If you're installing a snap, log on to Ubuntu One.
18+ If you're installing a snap, log on to the Snap Store/Ubuntu One.
19 </p>
20 </item>
21
22
23 <item>
24 <p>
25- You will be asked to authenticate by entering your password (that is, your user password, not your Ubuntu One password).
26+ You will be asked to authenticate by entering your password
27+ (that is, your user password, not your Snap Store/Ubuntu One password).
28 Once you have done that the installation will begin.
29 The installation usually finishes quickly, but could take a while if you
30 have a slow Internet connection.
31
32=== modified file 'ubuntu-help/C/addremove-remove.page'
33--- ubuntu-help/C/addremove-remove.page 2017-02-13 20:59:29 +0000
34+++ ubuntu-help/C/addremove-remove.page 2017-03-13 21:06:54 +0000
35@@ -25,7 +25,7 @@
36
37 <p>Applications are available in two formats: snap packages and Debian packages.
38 An application available as a snap package is from now on referred to as a <em>snap</em>.
39- In order to remove (or install) a snap you have to log on to Ubuntu One.
40+ In order to remove (or install) a snap you have to log on to the Snap Store/Ubuntu One.
41 Some applications are available in both formats. In such a case in <app>Ubuntu Software</app> the snap will be listed first.</p>
42
43
44@@ -71,14 +71,14 @@
45
46 <item>
47 <p>
48- If you're removing a snap, log on to Ubuntu One.
49+ If you're removing a snap, log on to the Snap Store/Ubuntu One.
50 </p>
51 </item>
52
53
54 <item>
55 <p>
56- You will be asked to authenticate by entering your password (that is, your user password, not your Ubuntu One password).
57+ You will be asked to authenticate by entering your password (that is, your user password, not your Snap Store/Ubuntu One password).
58 After you have done that, the application will be removed.
59 </p>
60 </item>
61
62=== modified file 'ubuntu-help/C/display-lock.page'
63--- ubuntu-help/C/display-lock.page 2017-03-06 20:00:25 +0000
64+++ ubuntu-help/C/display-lock.page 2017-03-13 21:06:54 +0000
65@@ -40,7 +40,7 @@
66 </item>
67 <item><p>Select <gui>Brightness &amp; Lock</gui>.</p></item>
68 <item><p>Make sure <gui>Lock</gui> is switched on, then select a timeout
69- from the drop-down list below. The screen will automatically lock after
70+ from the <gui>Lock screen after</gui> drop-down list. The screen will automatically lock after
71 you have been inactive for this long. You can also select <gui>Screen
72 turns off</gui> to lock the screen after the screen is automatically
73 turned off, controlled with the <gui>Turn screen off when inactive for</gui> drop-down
74
75=== modified file 'ubuntu-help/C/shell-exit.page'
76--- ubuntu-help/C/shell-exit.page 2017-03-06 20:00:25 +0000
77+++ ubuntu-help/C/shell-exit.page 2017-03-13 21:06:54 +0000
78@@ -50,6 +50,7 @@
79 yourself logged in and just switch users. If you switch users, all of
80 your applications will continue running, and everything will be where you
81 left it when you log back in.</p>
82+
83 <p>To log out or switch users, click the <em>system menu</em> <media type="image"
84 mime="image/svg" src="figures/system-devices-panel.svg">Power cog icon</media> and
85 select the appropriate option.</p>
86@@ -59,6 +60,7 @@
87 <info>
88 <link type="seealso" xref="session-screenlocks"/>
89 </info>
90+
91 <title>Lock the screen</title>
92 <p>If you're leaving your computer for a short time, you should lock your
93 screen to prevent other people from accessing your files or running
94@@ -66,11 +68,15 @@
95 If you don't lock your screen, it will lock automatically after a certain
96 amount of time.</p>
97
98- <p>To lock your screen, click the <gui>system menu</gui> in the menu bar and select
99- <gui>Lock Screen</gui>.</p>
100+ <p>To lock your screen, click the <em>system menu</em>
101+<media type="image" mime="image/svg" src="figures/system-devices-panel.svg">Power cog icon</media>
102+ and select <gui>Lock</gui>. Note: if your computer has two or more user accounts (other than the guest account)
103+ this option is displayed as <gui>Lock/Switch Account...</gui>.</p>
104
105 <p>When your screen is locked, other users can log in to their own accounts
106- by clicking <gui>Switch User</gui> on the password screen. You can switch
107+ by clicking the <em>system menu</em>
108+<media type="image" mime="image/svg" src="figures/system-devices-panel.svg">Power cog icon</media>
109+and selecting <gui>Switch Account...</gui> on the password screen. You can switch
110 back to your desktop when they are finished.</p>
111 </section>
112
113@@ -86,16 +92,18 @@
114 computer's functions. A very small amount of power is still used during
115 suspend.</p>
116
117- <p>To suspend your computer manually, click the <gui>system menu</gui> in the menu bar and
118- select <gui>Suspend</gui>.</p>
119+ <p>To suspend your computer manually, click the <em>system menu</em>
120+<media type="image" mime="image/svg" src="figures/system-devices-panel.svg">Power cog icon</media>
121+ and select <gui>Suspend</gui>.</p>
122 </section>
123
124 <section id="shutdown">
125 <title>Power off or restart</title>
126
127 <p>If you want to power off your computer entirely, or do a full restart,
128-click the <gui>system menu</gui> and
129-select <gui>Shut Down</gui>.</p>
130+click the <em>system menu</em>
131+<media type="image" mime="image/svg" src="figures/system-devices-panel.svg">Power cog icon</media>
132+and select <gui>Shut Down...</gui>.</p>
133
134 <p>If there are other users logged in, you may not be allowed to
135 power off or restart the computer, because this will end their sessions.

Subscribers

People subscribed via source and target branches