Ubuntu Documentation

Merge lp:~ki7mt/ubuntu-docs/lp1268775-fix into lp:ubuntu-docs/trusty

  1. lp1268775-fix
  2. Merge into trusty
Proposed by Greg Beam
Status: Merged
Merged at revision: 333
Proposed branch: lp:~ki7mt/ubuntu-docs/lp1268775-fix
Merge into: lp:ubuntu-docs/trusty
Diff against target: 227 lines (+31/-78)
6 files modified
ubuntu-help/C/accounts-add.page (+10/-22)
ubuntu-help/C/accounts-disable-service.page (+9/-21)
ubuntu-help/C/accounts-provider-not-available.page (+2/-7)
ubuntu-help/C/accounts-remove.page (+9/-20)
ubuntu-help/C/accounts.page (+1/-7)
ubuntu-help/Makefile.am (+0/-1)
To merge this branch: bzr merge lp:~ki7mt/ubuntu-docs/lp1268775-fix
Reviewer Review Type Date Requested Status
Kevin Godby (community) Approve
Review via email: mp+201531@code.launchpad.net

Description of the change

Updated the launch instructions for System Settings to match
others in the Gnome Control Center group.

Removed the inline <license> declaration and replaced with
xref legal.xml method.

Updated Makefile.am to remove the the image link for unused icon.

See commit log for details.

To post a comment you must log in.
Revision history for this message
Kevin Godby (godbyk) :
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/accounts-add.page'
2--- ubuntu-help/C/accounts-add.page 2014-01-11 16:10:16 +0000
3+++ ubuntu-help/C/accounts-add.page 2014-01-14 01:43:21 +0000
4@@ -11,7 +11,7 @@
5 <email>mdhillca@gmail.com</email>
6 </credit>
7
8- <credit type="author">
9+ <credit type="editor">
10 <name>Greg Beam</name>
11 <email>ki7mt@yahoo.com</email>
12 </credit>
13@@ -19,13 +19,7 @@
14 <link type="guide" xref="accounts" />
15 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
16 <revision version="14.04" date="2014-01-08" status="review"/>
17-
18- <license>
19- <p>
20- <link href="http://creativecommons.org/licenses/by-sa/3.0/">
21- Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
22- </p>
23- </license>
24+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
25
26 <desc>
27 Connect to online accounts
28@@ -45,20 +39,14 @@
29
30 <steps>
31 <item>
32- <p>
33- Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
34- mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
35- and select <gui>System Settings</gui>.
36- </p>
37- </item>
38-
39- <item>
40- <p>
41- Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
42- src="figures/credentials-preferences.png"></media> to open the
43- application.
44- </p>
45- </item>
46+ <p>Click the icon at the very right of the <gui>menu bar</gui> and select
47+ <gui>System Settings</gui>.
48+ </p>
49+ </item>
50+ <item>
51+ <p>Select <gui>Online Accounts</gui>.
52+ </p>
53+ </item>
54 <item>
55 <p>
56 Select an <gui>Account Type</gui> from the right hand windowpane.
57
58=== modified file 'ubuntu-help/C/accounts-disable-service.page'
59--- ubuntu-help/C/accounts-disable-service.page 2014-01-10 12:45:20 +0000
60+++ ubuntu-help/C/accounts-disable-service.page 2014-01-14 01:43:21 +0000
61@@ -16,13 +16,7 @@
62 <link type="seealso" xref="accounts-remove"/>
63 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
64 <revision version="14.04" date="2014-01-08" status="review"/>
65-
66- <license>
67- <p>
68- <link href="http://creativecommons.org/licenses/by-sa/3.0/">
69- Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
70- </p>
71- </license>
72+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
73
74 <desc>
75 Some online accounts allow you to use multiple services (like calendar
76@@ -48,20 +42,14 @@
77
78 <steps>
79 <item>
80- <p>
81- Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
82- mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
83- and select <gui>System Settings</gui>.
84- </p>
85- </item>
86-
87- <item>
88- <p>
89- Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
90- src="figures/credentials-preferences.png"></media> to open the
91- application.
92- </p>
93- </item>
94+ <p>Click the icon at the very right of the <gui>menu bar</gui> and select
95+ <gui>System Settings</gui>.
96+ </p>
97+ </item>
98+ <item>
99+ <p>Select <gui>Online Accounts</gui>.
100+ </p>
101+ </item>
102
103 <item>
104 <p>
105
106=== modified file 'ubuntu-help/C/accounts-provider-not-available.page'
107--- ubuntu-help/C/accounts-provider-not-available.page 2014-01-10 12:45:20 +0000
108+++ ubuntu-help/C/accounts-provider-not-available.page 2014-01-14 01:43:21 +0000
109@@ -25,19 +25,14 @@
110 <link type="guide" xref="accounts" />
111 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
112 <revision version="14.04" date="2014-01-08" status="review"/>
113-
114- <license>
115- <p>
116- <link href="http://creativecommons.org/licenses/by-sa/3.0/">
117- Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
118- </p>
119- </license>
120+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
121
122 <desc>
123 Why aren't service providors listed?
124 </desc>
125 </info>
126
127+
128 <title>
129 Why is my account type not on the list?
130 </title>
131
132=== modified file 'ubuntu-help/C/accounts-remove.page'
133--- ubuntu-help/C/accounts-remove.page 2014-01-11 16:10:16 +0000
134+++ ubuntu-help/C/accounts-remove.page 2014-01-14 01:43:21 +0000
135@@ -6,7 +6,7 @@
136 <email>mdhillca@gmail.com</email>
137 </credit>
138
139- <credit type="author">
140+ <credit type="editor">
141 <name>Greg Beam</name>
142 <email>ki7mt@yahoo.com</email>
143 </credit>
144@@ -15,13 +15,7 @@
145 <link type="seealso" xref="accounts-disable-service"/>
146 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
147 <revision version="14.04" date="2014-01-08" status="review"/>
148-
149- <license>
150- <p>
151- <link href="http://creativecommons.org/licenses/by-sa/3.0/">
152- Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
153- </p>
154- </license>
155+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
156
157 <desc>
158 Remove online account services
159@@ -34,20 +28,15 @@
160
161 <steps>
162 <item>
163- <p>
164- Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
165- mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
166- and select <gui>System Settings</gui>.
167+ <p>Click the icon at the very right of the <gui>menu bar</gui> and select
168+ <gui>System Settings</gui>.
169 </p>
170 </item>
171
172- <item>
173- <p>
174- Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
175- src="figures/credentials-preferences.png"></media> to open the
176- application.
177- </p>
178- </item>
179+ <item>
180+ <p>Select <gui>Online Accounts</gui>.
181+ </p>
182+ </item>
183
184 <item>
185 <p>
186@@ -61,7 +50,7 @@
187 the window.
188 </p>
189
190- <note>
191+ <note style="tip">
192 <p>
193 Removing the selection from <app>Online Accounts</app> in no way affects
194 the account from your service provider.
195
196=== modified file 'ubuntu-help/C/accounts.page'
197--- ubuntu-help/C/accounts.page 2014-01-12 22:53:14 +0000
198+++ ubuntu-help/C/accounts.page 2014-01-14 01:43:21 +0000
199@@ -14,13 +14,7 @@
200 <link type="guide" xref="prefs"/>
201 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
202 <revision version="14.04" date="2014-01-08" status="review"/>
203-
204- <license>
205- <p>
206- <link href="http://creativecommons.org/licenses/by-sa/3.0/">
207- Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
208- </p>
209- </license>
210+ <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
211
212 <desc>
213 <link xref="accounts-add">Add accounts, </link>
214
215=== removed file 'ubuntu-help/C/figures/credentials-preferences.png'
216Binary files ubuntu-help/C/figures/credentials-preferences.png 2014-01-10 04:05:24 +0000 and ubuntu-help/C/figures/credentials-preferences.png 1970-01-01 00:00:00 +0000 differ
217=== modified file 'ubuntu-help/Makefile.am'
218--- ubuntu-help/Makefile.am 2014-01-12 23:36:56 +0000
219+++ ubuntu-help/Makefile.am 2014-01-14 01:43:21 +0000
220@@ -11,7 +11,6 @@
221 figures/color-printer.png \
222 figures/color-profile-default.png \
223 figures/color-space.png \
224- figures/credentials-preferences.png \
225 figures/go-down.png \
226 figures/input-keyboard-symbolic.svg \
227 figures/nautilus.png \

Subscribers

People subscribed via source and target branches