Ubuntu Documentation

Merge lp:~ki7mt/ubuntu-docs/online-accounts-update into lp:ubuntu-docs/trusty

  1. online-accounts-update
  2. Merge into trusty
Proposed by Greg Beam
Status: Merged
Merged at revision: 325
Proposed branch: lp:~ki7mt/ubuntu-docs/online-accounts-update
Merge into: lp:ubuntu-docs/trusty
Diff against target: 943 lines (+330/-389)
11 files modified
ubuntu-help/C/accounts-add.page (+79/-98)
ubuntu-help/C/accounts-create.page (+0/-93)
ubuntu-help/C/accounts-disable-service.page (+73/-61)
ubuntu-help/C/accounts-provider-not-available.page (+37/-54)
ubuntu-help/C/accounts-remove.page (+68/-45)
ubuntu-help/C/accounts-which-application.page (+16/-8)
ubuntu-help/C/accounts-whyadd.page (+16/-11)
ubuntu-help/C/accounts.page (+25/-13)
ubuntu-help/C/figures/system-devices-panel.svg (+8/-0)
ubuntu-help/C/legal.xml (+5/-4)
ubuntu-help/Makefile.am (+3/-2)
To merge this branch: bzr merge lp:~ki7mt/ubuntu-docs/online-accounts-update
Reviewer Review Type Date Requested Status
Benjamin Kerensa (community) Approve
Review via email: mp+201135@code.launchpad.net

Description of the change

While this looks a big change it's not. I tidy'ed up all the accounts...page files, removed one file that was a dupe,
edited the Makefile to remove it from build and add two small icons to the build tree.

Below is a detailed list of changes I kept while working through the files.

Online Accounts (accounts-...page) Series Updates

1. /ubuntu-docs/ubuntu-help/C/accounts.page
* added editor / author info
* updated pkversoin review information, status="writing"
* added license Info
* small grammer & content edits
* tested yelp-build and yelp-checks

2. /ubuntu-docs/ubuntu-help/C/accounts-add.page
* added editor / author info
* updated pkversoin review information, status="writing"
* removed if:choose if:when conditionals
* re-worked the steps
* added license Info
* tested yelp-build and yelp-checks
* LP:1220971 fix proposed.
* Note: This file needs a thorough review as
 most of the steps were changed

3. /ubuntu-docs/ubuntu-help/C/accounts-create.page
* removed, duplicate of accounts-add

4. /ubuntu-docs/ubuntu-help/C/accounts-remove.page
* added editor / author info
* updated pkversoin review information, status="writing"
* added note
* added license Info
* small content edits

5. /ubuntu-docs/ubuntu-help/C/accounts-disable-service.page
* added editor / author info
* updated pkversoin review information, status="writing"
* added notes
* added License Info
* re-worked the steps
* Note: This file needs a thorough review as
 most of the steps were changed

6. /ubuntu-docs/ubuntu-help/C/accounts-which-applications.page
* author copyright document
* updated pkversoin review information, status="review"

7. /ubuntu-docs/ubuntu-help/C/accounts-provider-not-available.page
* added editor / author info
* updated pkversoin review information, status="writing"
* added 3col table to shorten page length v.s list

8. /ubuntu-docs/ubuntu-help/C/accounts-whyadd.page
* author copyright document
* updated pkversoin review information, status="review"
* minor gramer change to shorten sentence.
* lp:1220983 fix applied.

9. /ubuntu-docs/ubuntu-help/C/legal.xml
* updated the format to work with About info, Author & Editor footer

10 /ubuntu-docs/ubuntu-help/Makefile.am
* added figures/system-devices-panel.svg
* added figures/credentials-preferences.png
* removed accounts-create.page from build list

To post a comment you must log in.
Revision history for this message
Benjamin Kerensa (bkerensa) wrote :

Looks good to me thanks for the contribution. Merged.

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

Thanks for your hard work on this. It's going to take a bit to review properly.

Please have a look at bug 1228952 about the use of "Windows Live".

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

When I wrote a few minutes ago, I did not realize that Benjamin was already in progress on merging this.

Revision history for this message
Greg Beam (ki7mt) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Doug,

That's ok, no worries. Windows Live is still valid to a degree.
Messenger has moved over to Skype, Mail is Outlook of course, but the
service account nomenclature is still referrers to Windows Live.

I did not see that bug, need to hone my bug hunting skills for sure.
I'm digging around to see if I need a patch or not. While they have
different names for things, Email, Chat, XBox Live, SkyDrive it seems
they are still under one service account, and all the links are
something.live.com etc etc.

If I need to fix it, should be a small small patch, thing is, what
would we call it :-)

73's
Greg

On 01/10/2014 12:34 AM, Doug Smythies wrote:
> When I wrote a few minutes ago, I did not realize that Benjamin was
> already in progress on merging this.
>
 -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJSz6T0AAoJEAmfcyeKlj0xKZwH/jyAn11CMgMGu9NEaGfAN6fQ
a7VUpeG3QaJsDGlrZpSZD4PcU81sTI6xDzp6LDfQ+xht6Rrtv8Zi9La12pP5L1yV
/zsaXDMHukgTqczgDJfxcWay0LJA/S/iJ0jopGePLpyVZIvHChCp0ITAQPXgXCSK
Zj+pyORVEZBd1Wup7pvrwKgsAEj4mBxdi9rbBph3Mq/kim9/FrxkmnQ8t356yDXr
8Rz1EhpeWJvC+FP6t6CgUCFa9rSN06G7g93lb+agRjfAu+Wzu0dPSBESECGDk/gX
hEyiudXzgfNCW/XHOxlhHhnikPpfmvmRUUSBFTAgwK0WOdpsJA0Re6lwwSNEbLw=
=Rm2r
-----END PGP SIGNATURE-----

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

The change to ubuntu-help/C/legal.xml seems to prevent the license reference from being showed when you click the "About" link at the bottom of each page.

Revision history for this message
Greg Beam (ki7mt) wrote :

Hi Gunnar,

How are you building the pages?

I built all pages with:
cd ./ubuntu/C/ && yelp-build html -x ../../html/ubuntu.xsl .

See accounts.html.png

However, when I build with the traditional method:
cd ./ubuntu-docs && autogen.sh
cd ./html && make
cd ./build/en && chromium-browser index.html

The About page items are not displayed at all. I need to verify why this
is, but I suspect it's the C.css, ubuntu.xsl and js that is adding the
Ubuntu custom footer.

Also, using the traditional build method, even r324, which was prior to
any changes I've made, the legal link points to file://legal.html and
does not render. So we need to look into that also.

Thanks

Greg.

On 01/12/2014 05:19 AM, Gunnar Hjalmarsson wrote:
> The change to ubuntu-help/C/legal.xml seems to prevent the license reference from being showed when you click the "About" link at the bottom of each page.
>

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

Gunner: This MP is actually 1 of 2 parts. The other one is still pending, but is needed to sort out issues with this one.

KI7MT: Use the documented build method only (well, O.K. from the proper documented method). I do not care what results you get from your own build method.

And, no the "about" stuff is not in the HTML, and as far as I know that is on purpose, but I admit it predates my involvement.

Revision history for this message
Greg Beam (ki7mt) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Just for clarity, I know we are to use Unity as the DE, but as a point
of reference, if you install gnome-shell and go to dasher >> help you
can see the difference between Unity Help footers and Gnome-Shell Help.

Many, I've not checked all of them however, are set up to display the
"About" information in footers. If we don't want that style of footer
information, it should be removed completely, from all files, as it
serves no purpose in Unity Desktop Help.

Also, since my first MP was submitted, I've been using the (proper
documented method), and do a full build each time. Only problem with
that is, it adds a bunch of files we don't need / want in the root
directory plus the html/build stuff.

On 01/12/2014 10:27 AM, Doug Smythies wrote:
> Gunner: This MP is actually 1 of 2 parts. The other one is still
> pending, but is needed to sort out issues with this one.
>
> KI7MT: Use the documented build method only (well, O.K. from the
> proper documented method). I do not care what results you get from
> your own build method.
>
> And, no the "about" stuff is not in the HTML, and as far as I know
> that is on purpose, but I admit it predates my involvement.
>
 -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS0uJRAAoJEAmfcyeKlj0xtFkH/2CdkV6NkLh9ZP+rAuZxCWuk
N/VrjMaPRowQuG4KhY3lSdO8vOQa4TG6p5WC2qq5PPRMxvRvStKMR+KqWvVjP06u
c+HKt4CsYaxkP3Vqm2eJSMVpH8RqRIsgvE7SmPsij3O09r69YVLfaK4fW3wA0tR+
8WXjqwdYUICBBEIQkg87JBrJrXKAJs2LHiQ1bSJZPqSHidsjX+VQGR/+MCW0lZ76
5nmSQveHQ6nze2Qsw9mSBrq67n1XgZnIzNikGYEuarnQ8KQPyrXWTiUQMe4+zmsU
clqKtCcH8qIcsZcu8cpnKTtIyjoIozG+80s8uHfLKOy/aVpZACgUfn026iGPZZ4=
=0cAH
-----END PGP SIGNATURE-----

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

The footer information (about) for the two help systems are identical. (see also that e-mail with the screen shots, where in every case the "about" has been opened.)
The footer information for the compiled html is different.

Many Files made on build: Yes, it does and that is annoying, as it can make "bzr status" hard to follow. I tend to use "bzr status | more" instead.

However, I am not aware of any files that we don't need or want. Could you elaborate? (Should we take this up on IRC?)

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

@Greg: I was working on a MP, and after having pulled the revision with this branch, I noticed that the license reference did no longer show up when viewing pages via yelp. You don't need to build anything to see it; I'm talking about the XML (Mallard) pages, not the generated HTML.

Before submitting my own MP, I built the whole package using debuild, and the observation stands.

Revision history for this message
Greg Beam (ki7mt) wrote :

@Gunnar, Ok, I misunderstood you, I thought we were talking about the <license> tags.

I can easily revert it back to r324, as the files I updated should all have <license> tags v.s. the using the legal.xml xref. I should have done that with the last MP update.

The reason I messed with it at all was the link is not in every file, which is a point that needs a decision from allot higher pay grade than mine.

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

Maybe Doug has already prepared something... As I wrote on the list, I think that *somebody* should commit the old version of legal.xml. Maybe it's motivated to talk about it further, but if so, let's have that discussion after the 14.04 release, and focus on the contents now.

Revision history for this message
Greg Beam (ki7mt) wrote :

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I agree .. it's time $hit or get off the pot.

I'm not used to the Gatekeep work-flow, If I balls something up, I
just fix it, and move on. This process needs more GK's I think.

On 01/12/2014 02:18 PM, Gunnar Hjalmarsson wrote:
> Maybe Doug has already prepared something... As I wrote on the
> list, I think that *somebody* should commit the old version of
> legal.xml. Maybe it's motivated to talk about it further, but if
> so, let's have that discussion after the 14.04 release, and focus
> on the contents now.
>
 -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQEcBAEBAgAGBQJS0wsGAAoJEAmfcyeKlj0xUacH/AwgttpKUK1t2M2mLy9qHfe/
Ds+36Enc1zy5qWBA9WvpHM5/3WGMc6qbDpDblNVyIkgH4ivJfkj/b4m9iOqQYCOD
c4J+RkvYQJioOpp3axylfWsPqljRm6HBdWeR3IlYkwHdF+A6BVMpSYlbGkZ5LB3Q
riLKzRjL3owNw1RMPvtzrl4mcQz0hoSur/nNIBwFYQingVNk6mpZ6Uhdrg6dm+9U
xJoxFZ53YBjHrgmBvppiiWTpsSwJmuH4XFlYx76IrfDMWWwFdf+UrMGAGecY9ZkJ
ujpRmOF7e4oN1P0NpA22/No7B3jBm+I/nrhWQppq7BP7CZPMeGhR2J3DGRE2o0Q=
=yizN
-----END PGP SIGNATURE-----

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 2013-10-25 18:20:48 +0000
3+++ ubuntu-help/C/accounts-add.page 2014-01-10 04:19:38 +0000
4@@ -1,123 +1,105 @@
5-<page xmlns="http://projectmallard.org/1.0/"
6- xmlns:if="http://projectmallard.org/if/1.0/"
7- type="topic" style="task"
8- id="accounts-add">
9+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="accounts-add">
10
11 <info>
12 <credit type="author">
13 <name>Jim Campbell</name>
14 <email>jwcampbell@gmail.com</email>
15 </credit>
16+
17 <credit type="editor">
18 <name>Michael Hill</name>
19 <email>mdhillca@gmail.com</email>
20 </credit>
21- <desc>
22- Connect an online account.
23- </desc>
24- <link type="guide" xref="accounts"/>
25- <revision pkgversion="3.5.5" version="0.1" date="2012-08-14" status="draft"/>
26- <revision version="13.10" date="2013-10-25" status="review"/>
27+
28+ <credit type="author">
29+ <name>Greg Beam</name>
30+ <email>ki7mt@yahoo.com</email>
31+ </credit>
32+
33+ <link type="guide" xref="accounts" />
34+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
35+ <revision version="14.04" date="2014-01-08" status="review"/>
36+
37+ <license>
38+ <p>
39+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
40+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
41+ </p>
42+ </license>
43+
44+ <desc>
45+ Connect an online account using <app>Online Accounts</app>.
46+ </desc>
47+
48 </info>
49
50- <title>
51- Add an account
52- </title>
53+ <title>
54+ Add an account
55+ </title>
56
57 <p>
58 Adding an account will help link your online accounts with your Ubuntu
59- desktop. Thus, your email program, chat program, and other related
60- applications will be set up for you.
61+ desktop. Thus, your email, chat, and other related applications will be set
62+ up for you.
63 </p>
64
65 <steps>
66- <item>
67- <if:choose>
68- <if:when test="platform:unity">
69- <p>
70- Click the icon at the very right of the <gui>menu bar</gui> and
71- select <gui>System Settings</gui>.
72- </p>
73- </if:when>
74- <p>
75- Click your name on the top bar and select <gui>Settings</gui>.
76- </p>
77- </if:choose>
78- </item>
79- <item>
80- <if:choose>
81- <if:when test="platform:unity">
82- <p>
83- Open <gui>Online Accounts</gui>.
84- </p>
85- </if:when>
86- <p>
87- Click the <key>+</key> button in the lower-left portion of the window.
88- </p>
89- </if:choose>
90- </item>
91- <item>
92- <if:choose>
93- <if:when test="platform:unity">
94- <p>
95- Select <gui>Add account...</gui>.
96- </p>
97- </if:when>
98- <p>
99- Click the <gui>Account Type</gui> menu and select one.
100- </p>
101- <p>
102- If you have more than one account type, you can add the other accounts
103- at a later time.
104- </p>
105- </if:choose>
106- </item>
107- <item>
108- <if:choose>
109- <if:when test="platform:unity">
110- <p>
111- Choose the account type you would like to add.
112- </p>
113- <p>
114- If you have more than one account type, you can add the other
115- accounts at a later time.
116- </p>
117- </if:when>
118- <p>
119- Click <gui>Add…</gui>
120- </p>
121- </if:choose>
122- </item>
123- <item>
124- <p>
125- A small website window will open where you can enter your online account
126- credentials. For example, if you are setting up a Google account, enter
127- your Google username and password.
128- </p>
129- </item>
130- <item>
131- <p>
132- If you've entered your credentials correctly, you will be prompted to
133- allow Ubuntu access to your online account. Select <gui>Grant
134- Access</gui> to continue.
135- </p>
136- </item>
137- <item>
138- <p>
139- Select the applications that you want linked to your online account. For
140- example, if you want to use an online account for chat, but do not want
141- to use an online account for your calendar, turn the
142- <gui>calendar</gui> option off.
143+ <item>
144+ <p>
145+ Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
146+ mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
147+ and select <gui>System Settings</gui>.
148+ </p>
149+ </item>
150+
151+ <item>
152+ <p>
153+ Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
154+ src="figures/credentials-preferences.png"></media> to open the
155+ application.
156+ </p>
157+ </item>
158+ <item>
159+ <p>
160+ Select an <gui>Account Type</gui> from the right hand windowpane.
161+ </p>
162+ <note>
163+ <p>
164+ If you want to configure more accounts, you can repeat this process
165+ afterwards.
166+ </p>
167+ </note>
168+ </item>
169+ <item>
170+ <p>
171+ A small web user interface will open where you can enter your online
172+ account credentials. For example, if you are setting up a Google
173+ account, enter your Google username, password and sign in.
174+ </p>
175+ </item>
176+ <item>
177+ <p>
178+ If you entered your credentials correctly, you will be prompted to
179+ accept the terms. Select <gui>Accept</gui> to continue.
180+
181+ Once accepted, Ubuntu needs permission to access your account. To allow
182+ access, click on the <gui>Grant Access</gui> button. When prompted,
183+ enter the current users password.
184+ </p>
185+ </item>
186+ <item>
187+ <p>
188+ Now you can select the applications you want linked to your online
189+ account. For example, if you want to use an online account for chat,
190+ but do not want the calendar, turn the <gui>calendar</gui> option off.
191 </p>
192 </item>
193 </steps>
194-
195 <p>
196- After you have added the accounts, each application that you have selected
197- will automatically use those credentials when you start them.
198+ After you have added the accounts, each application you have selected will
199+ automatically use those credentials when you log into your account them.
200 </p>
201-
202- <note style="tip">
203+ <note>
204 <p>
205 For security reasons, Ubuntu will not store your password on your
206 computer. Instead, it stores a token that is provided by the online
207@@ -125,5 +107,4 @@
208 online service, <link xref="accounts-remove">remove</link> it.
209 </p>
210 </note>
211-
212 </page>
213
214=== removed file 'ubuntu-help/C/accounts-create.page'
215--- ubuntu-help/C/accounts-create.page 2013-10-25 18:20:48 +0000
216+++ ubuntu-help/C/accounts-create.page 1970-01-01 00:00:00 +0000
217@@ -1,93 +0,0 @@
218-<page xmlns="http://projectmallard.org/1.0/"
219- xmlns:if="http://projectmallard.org/if/1.0/"
220- type="topic" style="task"
221- id="accounts-create">
222-
223- <info>
224- <credit type="author">
225- <name>Ekaterina Gerasimova</name>
226- <email>kittykat3756@gmail.com</email>
227- </credit>
228- <credit type="author">
229- <name>Julita Inca</name>
230- <email>yrazes@gmail.com</email>
231- </credit>
232- <credit type="editor">
233- <name>Michael Hill</name>
234- <email>mdhillca@gmail.com</email>
235- </credit>
236- <desc>
237- Create a new account using <app>Online Accounts</app>.
238- </desc>
239- <link type="guide" xref="accounts" />
240- <revision pkgversion="3.5.5" date="2012-08-14" status="review"/>
241- <revision version="13.10" date="2013-10-25" status="review"/>
242- </info>
243-
244- <title>
245- Create an online account
246- </title>
247-
248- <p>
249- Some online account service providers allow you to create an account while
250- adding it to <app>Online Accounts</app>. This allows you to manage all your
251- online accounts from one application.
252- </p>
253-
254- <steps>
255- <item>
256- <p>
257- Click the icon at the far right of the <gui>menu bar</gui> and select
258- <gui>System Settings</gui>.
259- </p>
260- </item>
261- <item>
262- <p>
263- Open <gui>Online Accounts</gui>.
264- </p>
265- </item>
266- <item>
267- <p>
268- Click <gui style="button">Add account</gui>.
269- </p>
270- </item>
271- <item>
272- <p>
273- Select an account provider.
274- </p>
275- </item>
276- <item>
277- <p>
278- Find and click the <gui>Sign Up</gui> button or link on the page which
279- appears.
280- </p>
281- <note>
282- <p>
283- Not all online account providers offer the option to create an account
284- at this stage. If this applies to the service you wish to register,
285- you will need to use an alternative method to create an account.
286- </p>
287- </note>
288- </item>
289- <item>
290- <p>
291- Fill in the registration form. You will be asked for your username and
292- password.
293- </p>
294- </item>
295- <item>
296- <p>
297- You need to grant Ubuntu access to your new account in order to use it
298- with <app>Online Accounts</app>.
299- </p>
300- </item>
301- <item>
302- <p>
303- All services that are offered by an account provider will be enabled by
304- default. <link xref="accounts-disable-service">Switch off</link>
305- individual services to disable them.
306- </p>
307- </item>
308- </steps>
309-
310-</page>
311
312=== modified file 'ubuntu-help/C/accounts-disable-service.page'
313--- ubuntu-help/C/accounts-disable-service.page 2013-10-25 18:20:48 +0000
314+++ ubuntu-help/C/accounts-disable-service.page 2014-01-10 04:19:38 +0000
315@@ -1,78 +1,90 @@
316-<page xmlns="http://projectmallard.org/1.0/"
317- xmlns:if="http://projectmallard.org/if/1.0/"
318- type="topic" style="task" id="accounts-disable-service">
319-
320- <info>
321- <credit type="author">
322- <name>Phil Bull</name>
323- <email>philbull@gmail.com</email>
324+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task"
325+ id="accounts-disable-service">
326+
327+ <info>
328+ <credit type="author">
329+ <name>Phil Bull</name>
330+ <email>philbull@gmail.com</email>
331+ </credit>
332+
333+ <credit type="editor">
334+ <name>Greg Beam</name>
335+ <email>ki7mt@yahoo.com</email>
336 </credit>
337+
338+ <link type="guide" xref="accounts" />
339+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
340+ <revision version="14.04" date="2014-01-08" status="review"/>
341+
342+ <license>
343+ <p>
344+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
345+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
346+ </p>
347+ </license>
348+
349 <desc>
350- Some online accounts can be used to access multiple services (like
351- calendar and email). You can control which of these services can be used
352- by applications.
353+ Some online account allow you to use multiple services (like calendar
354+ and email). You can control which of these services can be used by
355+ applications.
356 </desc>
357- <link type="guide" xref="accounts"/>
358- <revision pkgversion="3.5.5" version="0.1" date="2012-08-14" status="review"/>
359- <revision version="13.10" date="2013-10-25" status="review"/>
360- </info>
361+ </info>
362
363 <title>
364- Control which online services an account can be used to access
365+ Disable account services
366 </title>
367
368 <p>
369- Some types of online account allow you to access several services with the
370- same user account. For example, Google accounts provide access to calendar,
371- email, contacts and chat. You may want to use your account for some
372- services, but not others. For example, you may want to use your Google
373- account for email but not chat, since you have a different online account
374- that you use for chat.
375- </p>
376+ Some types of online accounts allow access to several services from a single
377+ user account. For example, Google accounts provide access to email,
378+ calendar, code, contacts, among others. You can choose Google for email and
379+ Yahoo! for chat, or any combination the service provider allows.
380+ </p>
381
382- <p>
383- You can disable some of the services that are provided by each online
384- account:
385- </p>
386+ <p>
387+ To disable services:
388+ </p>
389
390 <steps>
391- <item>
392- <p>
393- Click the icon at the far right of the <gui>menu bar</gui> and select
394- <gui>System Settings</gui>.
395- </p>
396- </item>
397- <item>
398- <p>
399- Open <gui>Online Accounts</gui>.
400- </p>
401- </item>
402- <item>
403- <p>
404- Select the account you want to change from the list on the left.
405- </p>
406- </item>
407- <item>
408- <p>
409- A list of services that are available with this account will be shown.
410- </p>
411- </item>
412- <item>
413- <p>
414- Switch off any of the services that you don't want to be used.
415+ <item>
416+ <p>
417+ Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
418+ mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
419+ and select <gui>System Settings</gui>.
420+ </p>
421+ </item>
422+
423+ <item>
424+ <p>
425+ Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
426+ src="figures/credentials-preferences.png"></media> to open the
427+ application.
428+ </p>
429+ </item>
430+
431+ <item>
432+ <p>
433+ Select the account you want to change from left windowpane.
434+ </p>
435+ </item>
436+ <item>
437+ <p>
438+ Services available for this account are listed in the right windowpane.
439+ </p>
440+ </item>
441+ <item>
442+ <p>
443+ Switch off the services you do not want used.
444 </p>
445 </item>
446 </steps>
447
448- <p>
449- Once a service has been disabled for an account, applications on your
450- computer won't be able to use the account to connect to that service any
451- more.
452- </p>
453-
454- <p>
455- To turn on a service that you disabled, just go back to the <gui>Online
456- Accounts</gui> window and switch it on.
457- </p>
458+ <note style="tip">
459+ <p>
460+ Once a service has been disabled, local applications no longer have
461+ access to it. To regain access, go back into <gui>Online Accounts</gui>
462+ and switch it on.
463+ </p>
464+ </note>
465
466 </page>
467
468=== modified file 'ubuntu-help/C/accounts-provider-not-available.page'
469--- ubuntu-help/C/accounts-provider-not-available.page 2013-10-25 18:20:48 +0000
470+++ ubuntu-help/C/accounts-provider-not-available.page 2014-01-10 04:19:38 +0000
471@@ -1,5 +1,4 @@
472-<page xmlns="http://projectmallard.org/1.0/"
473- type="topic" style="question"
474+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="question"
475 id="accounts-provider-not-available">
476
477 <info>
478@@ -7,20 +6,36 @@
479 <name>Baptiste Mille-Mathias</name>
480 <email>baptistem@gnome.org</email>
481 </credit>
482+
483 <credit type="editor">
484 <name>Kevin M. Godby</name>
485 <email>kevin@godby.org</email>
486 </credit>
487+
488 <credit type="editor">
489 <name>Michael Hill</name>
490 <email>mdhillca@gmail.com</email>
491 </credit>
492+
493+ <credit type="editor">
494+ <name>Greg Beam</name>
495+ <email>ki7mt@yahoo.com</email>
496+ </credit>
497+
498+ <link type="topic" xref="accounts" />
499+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
500+ <revision version="14.04" date="2014-01-08" status="review"/>
501+
502+ <license>
503+ <p>
504+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
505+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
506+ </p>
507+ </license>
508+
509 <desc>
510 What if an online service provider is not listed?
511 </desc>
512- <link type="guide" xref="accounts"/>
513- <revision pkgversion="3.5.5" version="0.1" date="2012-08-14" status="review"/>
514- <revision version="13.10" date="2013-10-25" status="review"/>
515 </info>
516
517 <title>
518@@ -31,55 +46,23 @@
519 Support for your favorite online service provider needs someone to develop
520 it. Currently, the following types of online accounts are supported:
521 </p>
522- <list>
523- <item>
524- <p>
525- Facebook
526- </p>
527- </item>
528- <item>
529- <p>
530- Flickr
531- </p>
532- </item>
533- <item>
534- <p>
535- Google
536- </p>
537- </item>
538- <item>
539- <p>
540- Twitter
541- </p>
542- </item>
543- <item>
544- <p>
545- AIM
546- </p>
547- </item>
548- <item>
549- <p>
550- Windows Live
551- </p>
552- </item>
553- <item>
554- <p>
555- Salut
556- </p>
557- </item>
558- <item>
559- <p>
560- Jabber
561- </p>
562- </item>
563- <item>
564- <p>
565- Yahoo!
566- </p>
567- </item>
568- </list>
569-
570- <note style="advanced">
571+
572+<table>
573+ <tr>
574+ <td><p>Facebook</p></td> <td><p>Flickr</p></td>
575+ <td><p>Google</p></td>
576+ </tr>
577+ <tr>
578+ <td><p>Twitter</p></td> <td><p>AIM</p></td>
579+ <td><p>Windows Live</p></td>
580+ </tr>
581+ <tr>
582+ <td><p>Salut</p></td> <td><p>Jabber</p></td>
583+ <td><p>Yahoo</p></td>
584+ </tr>
585+</table>
586+
587+ <note style="important">
588 <p>
589 If you're interested in adding support for other services, contact the
590 developers on the <link
591
592=== modified file 'ubuntu-help/C/accounts-remove.page'
593--- ubuntu-help/C/accounts-remove.page 2013-10-25 18:20:48 +0000
594+++ ubuntu-help/C/accounts-remove.page 2014-01-10 04:19:38 +0000
595@@ -1,49 +1,73 @@
596-<page xmlns="http://projectmallard.org/1.0/"
597- xmlns:if="http://projectmallard.org/if/1.0/"
598- type="topic" style="task"
599- id="accounts-remove">
600-
601- <info>
602- <credit type="author">
603- <name>Michael Hill</name>
604- <email>mdhillca@gmail.com</email>
605- </credit>
606- <desc>
607- Completely remove an online account.
608- </desc>
609- <link type="guide" xref="accounts"/>
610- <link type="seealso" xref="accounts-disable-service"/>
611- <revision pkgversion="3.5.5" version="0.1" date="2012-08-15" status="draft"/>
612- <revision version="13.10" date="2013-10-25" status="review"/>
613- </info>
614-
615- <title>
616- Remove an account
617- </title>
618-
619- <steps>
620- <item>
621- <p>
622- Click the icon at the far right of the <gui>menu bar</gui> and select
623- <gui>System Settings</gui>.
624- </p>
625- </item>
626- <item>
627- <p>
628- Open <gui>Online Accounts</gui>.
629- </p>
630- </item>
631- <item>
632- <p>
633- Select the account you wish to remove.
634- </p>
635- </item>
636+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task" id="accounts-remove">
637+
638+ <info>
639+ <credit type="author">
640+ <name>Michael Hill</name>
641+ <email>mdhillca@gmail.com</email>
642+ </credit>
643+
644+ <credit type="author">
645+ <name>Greg Beam</name>
646+ <email>ki7mt@yahoo.com</email>
647+ </credit>
648+
649+ <link type="guide" xref="accounts" />
650+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
651+ <revision version="14.04" date="2014-01-08" status="review"/>
652+
653+ <license>
654+ <p>
655+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
656+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
657+ </p>
658+ </license>
659+
660+ <desc>
661+ Completely remove an online account from <app>Online Accounts</app>.
662+ </desc>
663+ </info>
664+
665+ <title>
666+ Remove an account
667+ </title>
668+
669+ <steps>
670+ <item>
671+ <p>
672+ Click the <gui>Unity Service Panel Icon </gui> [ <media type="image"
673+ mime="image/svg" src="figures/system-devices-panel.svg"></media> ]
674+ and select <gui>System Settings</gui>.
675+ </p>
676+ </item>
677+
678+ <item>
679+ <p>
680+ Click the <gui>Online Accounts Icon</gui> <media type="image" mime="image/png"
681+ src="figures/credentials-preferences.png"></media> to open the
682+ application.
683+ </p>
684+ </item>
685+
686+ <item>
687+ <p>
688+ From the left windowpane, slect the account you wish to remove.
689+ </p>
690+ </item>
691+
692 <item>
693 <p>
694 Click the <gui>Remove Account</gui> button in the lower-right portion of
695 the window.
696- </p>
697+ </p>
698+
699+ <note>
700+ <p>
701+ Removing the selection from <app>Online Accounts</app> in now way
702+ affects the account from your service providor.
703+ </p>
704+ </note>
705 </item>
706+
707 <item>
708 <p>
709 Click <gui>Remove</gui>.
710@@ -53,10 +77,9 @@
711
712 <note style="tip">
713 <p>
714- Instead of deleting the account completely, it's possible to <link
715- xref="accounts-disable-service">restrict the services</link> accessed by
716- your desktop.
717+ Instead of deleting the account completely, you can <link
718+ xref="accounts-disable-service">restrict the service</link> from being
719+ accessed by your desktop.
720 </p>
721 </note>
722-
723 </page>
724
725=== modified file 'ubuntu-help/C/accounts-which-application.page'
726--- ubuntu-help/C/accounts-which-application.page 2013-10-25 18:20:48 +0000
727+++ ubuntu-help/C/accounts-which-application.page 2014-01-10 04:19:38 +0000
728@@ -1,28 +1,36 @@
729-<page xmlns="http://projectmallard.org/1.0/"
730- type="topic" style="task"
731- id="accounts-which-application">
732+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task"
733+ id="accounts-which-application">
734+
735 <info>
736 <credit type="author copyright">
737 <name>Baptiste Mille-Mathias</name>
738 <email>baptistem@gnome.org</email>
739- <years>2012-2013</years>
740+ <years>2012-2013</years>
741 </credit>
742+
743 <credit type="editor">
744 <name>Michael Hill</name>
745 <email>mdhillca@gmail.com</email>
746 </credit>
747+
748 <credit type="editor">
749 <name>Andre Klapper</name>
750 <email>ak-47@gmx.net</email>
751 </credit>
752+
753+ <credit type="editor">
754+ <name>Greg Beam</name>
755+ <email>ki7mt@yahoo.com</email>
756+ </credit>
757+
758+ <link type="guide" xref="accounts" />
759+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
760+ <revision version="14.04" date="2014-01-08" status="review"/>
761+
762 <desc>
763 Applications can use the accounts created in <app>Online Accounts</app>
764 and the services they exploit.
765 </desc>
766- <link type="guide" xref="accounts"/>
767- <link type="seealso" xref="accounts-disable-service"/>
768- <revision pkgversion="3.8.2" version="0.2" date="2013-05-22" status="review"/>
769- <revision version="13.10" date="2013-10-25" status="review"/>
770 </info>
771
772 <title>
773
774=== modified file 'ubuntu-help/C/accounts-whyadd.page'
775--- ubuntu-help/C/accounts-whyadd.page 2013-10-25 18:20:48 +0000
776+++ ubuntu-help/C/accounts-whyadd.page 2014-01-10 04:19:38 +0000
777@@ -1,5 +1,4 @@
778-<page xmlns="http://projectmallard.org/1.0/"
779- type="topic" style="question"
780+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="question"
781 id="accounts-whyadd">
782 <info>
783 <credit type="author copyright">
784@@ -11,13 +10,19 @@
785 <name>Michael Hill</name>
786 <email>mdhillca@gmail.com</email>
787 </credit>
788+
789+ <credit type="editor">
790+ <name>Greg Beam</name>
791+ <email>ki7mt@yahoo.com</email>
792+ </credit>
793+
794+ <link type="guide" xref="accounts"/>
795+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
796+ <revision version="14.04" date="2014-01-08" status="review"/>
797+
798 <desc>
799 Why add your email or social media accounts to your desktop?
800 </desc>
801- <link type="guide" xref="accounts"/>
802- <revision pkgversion="3.5.5" version="0.1" date="2012-08-14"
803- status="review"/>
804- <revision version="13.10" date="2013-10-25" status="review"/>
805 </info>
806
807 <title>
808@@ -26,11 +31,11 @@
809
810 <p>
811 Adding your accounts brings a choice of services like calendar, chat, and
812- e-mail straight to your desktop and makes the information of the services a
813- seamless part of your user experience. By adding accounts, you can keep in
814- touch with services of different accounts, like chats, at the same time.
815- Just set your account once and every time you start your computer all the
816- accounts and services you've added will be ready for you.
817+ e-mail straight to your desktop, making services a seamless part of your
818+ user experience. By adding accounts, you can keep in touch with services of
819+ different accounts, like chats, at the same time. Just set your account once
820+ and every time you start your computer all the accounts and services you've
821+ added will be ready for you.
822 </p>
823
824 </page>
825
826=== modified file 'ubuntu-help/C/accounts.page'
827--- ubuntu-help/C/accounts.page 2014-01-01 07:51:14 +0000
828+++ ubuntu-help/C/accounts.page 2014-01-10 04:19:38 +0000
829@@ -1,20 +1,33 @@
830-<page xmlns="http://projectmallard.org/1.0/"
831- type="guide" style="task"
832- id="accounts">
833+<page xmlns="http://projectmallard.org/1.0/" type="guide" style="task" id="accounts">
834
835 <info>
836 <credit type="author">
837 <name>Phil Bull</name>
838 <email>philbull@gmail.com</email>
839 </credit>
840- <desc>
841- <link xref="accounts-create">Create a new account</link>,
842- <link xref="accounts-add">Add an existing account</link>,
843- <link xref="accounts-remove">Remove an account</link>…
844- </desc>
845+
846+ <credit type="editor">
847+ <name>Greg Beam</name>
848+ <email>ki7mt@yahoo.com</email>
849+ </credit>
850+
851 <link type="guide" xref="prefs"/>
852- <revision pkgversion="3.5.5" version="0.1" date="2012-08-14" status="review"/>
853- <revision version="13.10" date="2013-10-25" status="review"/>
854+ <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
855+ <revision version="14.04" date="2014-01-08" status="review"/>
856+
857+ <license>
858+ <p>
859+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
860+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
861+ </p>
862+ </license>
863+
864+ <desc>
865+ <link xref="accounts-create">Create a new account</link>,
866+ <link xref="accounts-add">Add an existing account</link>,
867+ <link xref="accounts-remove">Remove an account</link>…
868+ </desc>
869+
870 </info>
871
872 <title>
873@@ -24,8 +37,7 @@
874 <p>
875 You can enter your login details for online services (like Google and
876 Facebook) into the <app>Online Accounts</app> window. This will let you
877- access your calendar, mail, chat accounts, and similar from those
878- applications without having to enter your account details again.
879+ access your calendar, mail, chat accounts, and similar applications without
880+ having to enter your account details again.
881 </p>
882-
883 </page>
884
885=== added file 'ubuntu-help/C/figures/credentials-preferences.png'
886Binary files ubuntu-help/C/figures/credentials-preferences.png 1970-01-01 00:00:00 +0000 and ubuntu-help/C/figures/credentials-preferences.png 2014-01-10 04:19:38 +0000 differ
887=== added file 'ubuntu-help/C/figures/system-devices-panel.svg'
888--- ubuntu-help/C/figures/system-devices-panel.svg 1970-01-01 00:00:00 +0000
889+++ ubuntu-help/C/figures/system-devices-panel.svg 2014-01-10 04:19:38 +0000
890@@ -0,0 +1,8 @@
891+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
892+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
893+<svg id="Layer_1" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 22 22" xml:space="preserve" height="22px" viewBox="0 0 22 22" width="22px" version="1.1" y="0px" x="0px" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata13"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/><dc:title/></cc:Work></rdf:RDF></metadata>
894+<rect id="rect3" style="opacity:.3;fill:#fff" height="7" width="2" y="4" x="10"/>
895+<g id="g5" style="opacity:.3;fill:#fff" transform="translate(0,1)">
896+ <path id="path7" style="fill:#fff" d="m19 12v-2h-2.09c-0.153-0.911-0.509-1.75-1.023-2.473l1.478-1.478-1.415-1.413-1.478 1.477c-0.448-0.319-0.945-0.57-1.472-0.758v2.2c1.19 0.693 2 1.969 2 3.445 0 1.1-0.444 2.094-1.162 2.817l-0.021 0.021c-0.723 0.718-1.717 1.162-2.817 1.162-1.104 0-2.103-0.447-2.827-1.171l-0.003-0.002c-0.723-0.723-1.17-1.723-1.17-2.827 0-1.477 0.81-2.752 2-3.445v-2.2c-0.527 0.188-1.025 0.439-1.473 0.758l-1.478-1.478-1.414 1.414 1.478 1.478c-0.514 0.723-0.87 1.562-1.023 2.473h-2.09v2h2.09c0.153 0.91 0.509 1.75 1.023 2.473l-1.477 1.477 1.414 1.414 1.477-1.477c0.723 0.514 1.562 0.87 2.473 1.023v2.09h2v-2.09c0.91-0.153 1.75-0.509 2.473-1.023l1.477 1.477 1.414-1.414-1.477-1.477c0.515-0.723 0.87-1.562 1.023-2.473h2.09z"/>
897+</g>
898+<rect id="rect3-8" style="fill:#3c3c3c" height="7" width="2" y="3" x="10"/><g id="g5-2" style="fill:#3c3c3c"><path id="path7-6" style="fill:#3c3c3c" d="m19 12v-2h-2.09c-0.153-0.911-0.509-1.75-1.023-2.473l1.478-1.478-1.415-1.413-1.478 1.477c-0.448-0.319-0.945-0.57-1.472-0.758v2.2c1.19 0.693 2 1.969 2 3.445 0 1.1-0.444 2.094-1.162 2.817l-0.021 0.021c-0.723 0.718-1.717 1.162-2.817 1.162-1.104 0-2.103-0.447-2.827-1.171l-0.003-0.002c-0.723-0.723-1.17-1.723-1.17-2.827 0-1.477 0.81-2.752 2-3.445v-2.2c-0.527 0.188-1.025 0.439-1.473 0.758l-1.478-1.478-1.414 1.414 1.478 1.478c-0.514 0.723-0.87 1.562-1.023 2.473h-2.09v2h2.09c0.153 0.91 0.509 1.75 1.023 2.473l-1.477 1.477 1.414 1.414 1.477-1.477c0.723 0.514 1.562 0.87 2.473 1.023v2.09h2v-2.09c0.91-0.153 1.75-0.509 2.473-1.023l1.477 1.477 1.414-1.414-1.477-1.477c0.515-0.723 0.87-1.562 1.023-2.473h2.09z"/></g></svg>
899
900=== modified file 'ubuntu-help/C/legal.xml'
901--- ubuntu-help/C/legal.xml 2012-09-16 23:35:12 +0000
902+++ ubuntu-help/C/legal.xml 2014-01-10 04:19:38 +0000
903@@ -1,5 +1,6 @@
904-<license xmlns="http://projectmallard.org/1.0/"
905- href="http://creativecommons.org/licenses/by-sa/3.0/">
906- <p>This work is licensed under a <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative
907- Commons Attribution-ShareAlike 3.0 Unported License</link>.</p>
908+<license>
909+ <p>
910+ <link href="http://creativecommons.org/licenses/by-sa/3.0/">
911+ Creative Commons Attribution-ShareAlike 3.0 (CC BY-SA 3.0)</link>.
912+ </p>
913 </license>
914
915=== modified file 'ubuntu-help/Makefile.am'
916--- ubuntu-help/Makefile.am 2014-01-06 21:56:33 +0000
917+++ ubuntu-help/Makefile.am 2014-01-10 04:19:38 +0000
918@@ -11,11 +11,13 @@
919 figures/color-printer.png \
920 figures/color-profile-default.png \
921 figures/color-space.png \
922+ figures/credentials-preferences.png \
923 figures/go-down.png \
924 figures/input-keyboard-symbolic.svg \
925 figures/nautilus.png \
926 figures/nautilus-icons.png \
927 figures/printing-select.png \
928+ figures/system-devices-panel.svg \
929 figures/ubuntu-logo.png \
930 figures/ubuntu-quantal.jpg \
931 figures/unity.png \
932@@ -46,10 +48,9 @@
933 a11y-stickykeys.page \
934 a11y-visualalert.page \
935 about-this-guide.page \
936+ accounts.page \
937 accounts-add.page \
938- accounts-create.page \
939 accounts-disable-service.page \
940- accounts.page \
941 accounts-provider-not-available.page \
942 accounts-remove.page \
943 accounts-which-application.page \

Subscribers

People subscribed via source and target branches