Merge lp:~ki7mt/ubuntu-docs/accounts-files-patch into lp:ubuntu-docs/trusty

Proposed by Greg Beam
Status: Merged
Merged at revision: 328
Proposed branch: lp:~ki7mt/ubuntu-docs/accounts-files-patch
Merge into: lp:ubuntu-docs/trusty
Diff against target: 162 lines (+21/-20)
6 files modified
ubuntu-help/C/accounts-add.page (+3/-3)
ubuntu-help/C/accounts-disable-service.page (+3/-2)
ubuntu-help/C/accounts-provider-not-available.page (+5/-5)
ubuntu-help/C/accounts-remove.page (+4/-3)
ubuntu-help/C/accounts-whyadd.page (+2/-2)
ubuntu-help/C/accounts.page (+4/-5)
To merge this branch: bzr merge lp:~ki7mt/ubuntu-docs/accounts-files-patch
Reviewer Review Type Date Requested Status
Doug Smythies Needs Fixing
Review via email: mp+201182@code.launchpad.net

Description of the change

* Fixed the navigation issues.
* Shortened a couple <desc> tags for better index page rendering.
* Edited a could minor typos and reworded some text.
* Added two seealso links.

The accounts-which-applications.page is using <section id="provider-x">
tags and the pages looks a bit out of place compared to the other pages in
the group. It could use some massaging if anyone is feeling energetic :-)
Other than that things look ok I think.

Doug sent me a bug to consider, LP:1228952 which could use further investigation.
The best I can determine, Windows Live is still the same umbrella, all be it, some
of the apps have shifted like, Messenger is now Skype.

Details of the files changed should be in the log. Apologies for the 2x MP.

Greg
------------

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

When I compare the proposed new "Online Accounts" page with the old one (basically with the 13.10 one), it is not clear to me why "Create an Online Account" and "Control Which online services an account can be be used to access" were deleted from that page.

For lines 129 and 130 below, shouldn't there be a couple of commas? (but note, I am an engineer and not an English major) I.E.

You can enter your login details for online services, like Google and
Facebook, into the <app>Online Accounts</app> window.

For "Add an Account" this sentence is odd:

    After you have added the accounts, each application you have selected will
                automatically use those credentials when you log into your account them.

I think the "them" at the end is somehow left over. (and might have been in yesterdays MP, as in the end I am looking both together).

I'm not done reviewing yet, but am saving this comment for now. More later.

Again, for the "Add an Account" page:
. I like the blue circle with the "i" in it (the original) better than the yellow box with a pin in it (proposed) for the security reasons note.
. Note sure I would have made the second line of what is now item 3 a yellow pinned note. Wasn't it good enough before? (in the end I don't really care).

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

Under "Remove an Account" note added to item 4. Please change "now" to "no".

O.K. now I see the copyright notice talked about on IRC. Yes, in my opinion that is wrong and needs to be deleted.

Under "Why is my account type not on the list?" I like the original page better, but in the end I don't really care.

Note: I haven't built or looked at the html yet.

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

On Sat, 2014-01-11 at 00:03 +0000, Doug Smythies wrote:
> When I compare the proposed new "Online Accounts" page with the old one
> (basically with the 13.10 one), it is not clear to me why "Create an Online Account">
> and "Control Which online services an account can be be used to access" were deleted
> from that page.

-----
Create online account and Add an Account were duplicate files:
- accounts-create.page
- accounts-add.page

I picked one to use, accounts-add.page as I felt "Create an Online Account" was a bit
misleading, in so far as, it would lead the user to belive they could or should use the
Online Accounts apps to create their service account, e.g. Google, Yahoo, AIM etc.
-----

> For lines 129 and 130 below, shouldn't there be a couple of commas? (but note, I am an
> engineer and not an English major) I.E.
>
> You can enter your login details for online services, like Google and
> Facebook, into the <app>Online Accounts</app> window.

-----
A simple fox for this would be to put the ( ) back in: (like Google and
Facebook). But I believe I also changed Window to application for
clarity.

I've updated the MP and will push the changes when the remaining itmes
are are resolved.
-----

> For "Add an Account" this sentence is odd:
>
> After you have added the accounts, each application you have selected will
> automatically use those credentials when you log into your account them.

-----
This is fixed for the MP update:

"You can enter your login details for online services (like Google and
Facebook) into the <app>Online Accounts</app> application. This will let
you access your calendar, mail, chat accounts, and similar applications
without having to enter your account details again."
-----

> I think the "them" at the end is somehow left over. (and might have been in
> yesterdays MP, as in the end I am looking both together).
>
> I'm not done reviewing yet, but am saving this comment for now. More later.
>
> Again, for the "Add an Account" page:
> . I like the blue circle with the "i" in it (the original) better than the yellow
> box with a pin in it (proposed) for the security reasons note.
> Note sure I would have made the second line of what is now item
> 3 a yellow pinned note. Wasn't it good enough before? (in the end I don't really care).

-----
This is fixed for the MP update:
I changed them back to <note style="tip">
-----

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

On Sat, 2014-01-11 at 00:20 +0000, Doug Smythies wrote:
> Review: Needs Fixing
>
> Under "Remove an Account" note added to item 4. Please change "now" to "no".
>

-----
This is fixed for the MP update:
fixed now to no
also fixed "providor to "provider"
-----

> O.K. now I see the copyright notice talked about on IRC. Yes, in my opinion
> that is wrong and needs to be deleted. Under "Why is my account type not on
> the list?" I like the original page better, but in the end I don't really care.

-----
As noted in my submit logs, I'm not fond of either page, but saw no
reason to have long list of single point <item> tags.
-----

> Note: I haven't built or looked at the html yet.

-----
I've not built 13.10 for comparison. Im using the Help Doc currently in
14.04 which was probably pulled form 13.10, not sure.

But allot of the changes made make sense when viewing the HTML.
----

327. By Greg Beam

Minor text fix, lp:1222288

328. By Greg Beam

Minor updated based on MP review

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

bzr reported a conflict in accounts.page when I tried to "pull" the updated MP. I made an additional change while resolving the conflict, and am now proposing this:

  <p>
    You can enter your login details for online services, such as Google and
    Facebook, into the <app>Online Accounts</app> application. This will let you
    access your calendar, mail, chat accounts, and similar applications without
                having to enter your account details again.
  </p>

Also, we need to agree if increased deviation between GNOME help and unity help is the way forward. I'll make an e-mail with screen shots, and send it to KI7MT and desktop help active doc committers to try to assist in explaining. That e-mail will not be sent for at least several hours from now.

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-10 04:05:24 +0000
3+++ ubuntu-help/C/accounts-add.page 2014-01-11 16:15:56 +0000
4@@ -28,7 +28,7 @@
5 </license>
6
7 <desc>
8- Connect an online account using <app>Online Accounts</app>.
9+ Connect to online accounts
10 </desc>
11
12 </info>
13@@ -63,7 +63,7 @@
14 <p>
15 Select an <gui>Account Type</gui> from the right hand windowpane.
16 </p>
17- <note>
18+ <note style="tip">
19 <p>
20 If you want to configure more accounts, you can repeat this process
21 afterwards.
22@@ -99,7 +99,7 @@
23 After you have added the accounts, each application you have selected will
24 automatically use those credentials when you log into your account them.
25 </p>
26- <note>
27+ <note style="tip">
28 <p>
29 For security reasons, Ubuntu will not store your password on your
30 computer. Instead, it stores a token that is provided by the online
31
32=== modified file 'ubuntu-help/C/accounts-disable-service.page'
33--- ubuntu-help/C/accounts-disable-service.page 2014-01-10 04:05:24 +0000
34+++ ubuntu-help/C/accounts-disable-service.page 2014-01-11 16:15:56 +0000
35@@ -13,6 +13,7 @@
36 </credit>
37
38 <link type="guide" xref="accounts" />
39+ <link type="seealso" xref="accounts-remove"/>
40 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
41 <revision version="14.04" date="2014-01-08" status="review"/>
42
43@@ -24,9 +25,9 @@
44 </license>
45
46 <desc>
47- Some online account allow you to use multiple services (like calendar
48+ Some online accounts allow you to use multiple services (like calendar
49 and email). You can control which of these services can be used by
50- applications.
51+ local applications.
52 </desc>
53 </info>
54
55
56=== modified file 'ubuntu-help/C/accounts-provider-not-available.page'
57--- ubuntu-help/C/accounts-provider-not-available.page 2014-01-10 04:05:24 +0000
58+++ ubuntu-help/C/accounts-provider-not-available.page 2014-01-11 16:15:56 +0000
59@@ -1,5 +1,5 @@
60-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="question"
61- id="accounts-provider-not-available">
62+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task"
63+ id="accounts-provider-not-available">
64
65 <info>
66 <credit type="author">
67@@ -22,7 +22,7 @@
68 <email>ki7mt@yahoo.com</email>
69 </credit>
70
71- <link type="topic" xref="accounts" />
72+ <link type="guide" xref="accounts" />
73 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
74 <revision version="14.04" date="2014-01-08" status="review"/>
75
76@@ -34,12 +34,12 @@
77 </license>
78
79 <desc>
80- What if an online service provider is not listed?
81+ Why aren't service providors listed?
82 </desc>
83 </info>
84
85 <title>
86- Why isn't my account type on the list?
87+ Why is my account type not on the list?
88 </title>
89
90 <p>
91
92=== modified file 'ubuntu-help/C/accounts-remove.page'
93--- ubuntu-help/C/accounts-remove.page 2014-01-10 04:05:24 +0000
94+++ ubuntu-help/C/accounts-remove.page 2014-01-11 16:15:56 +0000
95@@ -12,6 +12,7 @@
96 </credit>
97
98 <link type="guide" xref="accounts" />
99+ <link type="seealso" xref="accounts-disable-service"/>
100 <revision pkgversion="3.10.2" version="0.1" date="2014-01-08" status="review"/>
101 <revision version="14.04" date="2014-01-08" status="review"/>
102
103@@ -23,7 +24,7 @@
104 </license>
105
106 <desc>
107- Completely remove an online account from <app>Online Accounts</app>.
108+ Remove online account services
109 </desc>
110 </info>
111
112@@ -62,8 +63,8 @@
113
114 <note>
115 <p>
116- Removing the selection from <app>Online Accounts</app> in now way
117- affects the account from your service providor.
118+ Removing the selection from <app>Online Accounts</app> in no way affects
119+ the account from your service provider.
120 </p>
121 </note>
122 </item>
123
124=== modified file 'ubuntu-help/C/accounts-whyadd.page'
125--- ubuntu-help/C/accounts-whyadd.page 2014-01-10 04:05:24 +0000
126+++ ubuntu-help/C/accounts-whyadd.page 2014-01-11 16:15:56 +0000
127@@ -1,5 +1,5 @@
128-<page xmlns="http://projectmallard.org/1.0/" type="topic" style="question"
129- id="accounts-whyadd">
130+<page xmlns="http://projectmallard.org/1.0/" type="topic" style="task"
131+ id="accounts-whyadd">
132 <info>
133 <credit type="author copyright">
134 <name>Susanna Huhtanen</name>
135
136=== modified file 'ubuntu-help/C/accounts.page'
137--- ubuntu-help/C/accounts.page 2014-01-10 04:05:24 +0000
138+++ ubuntu-help/C/accounts.page 2014-01-11 16:15:56 +0000
139@@ -23,11 +23,10 @@
140 </license>
141
142 <desc>
143- <link xref="accounts-create">Create a new account</link>,
144- <link xref="accounts-add">Add an existing account</link>,
145- <link xref="accounts-remove">Remove an account</link>…
146+ <link xref="accounts-add">Add accounts, </link>
147+ <link xref="accounts-remove">Remove accounts, </link>
148+ <link xref="accounts-disable-service">Disable services</link>
149 </desc>
150-
151 </info>
152
153 <title>
154@@ -36,7 +35,7 @@
155
156 <p>
157 You can enter your login details for online services (like Google and
158- Facebook) into the <app>Online Accounts</app> window. This will let you
159+ Facebook) into the <app>Online Accounts</app> application. This will let you
160 access your calendar, mail, chat accounts, and similar applications without
161 having to enter your account details again.
162 </p>

Subscribers

People subscribed via source and target branches