Merge lp:~evfool/ubuntu-docs/memenu into lp:ubuntu-docs/precise

Proposed by Robert Roth
Status: Merged
Merged at revision: 63
Proposed branch: lp:~evfool/ubuntu-docs/memenu
Merge into: lp:ubuntu-docs/precise
Diff against target: 37 lines (+4/-4)
2 files modified
ubuntu-help/C/net-chat-empathy.page (+2/-2)
ubuntu-help/C/net-chat-social.page (+2/-2)
To merge this branch: bzr merge lp:~evfool/ubuntu-docs/memenu
Reviewer Review Type Date Requested Status
Jeremy Bícha Approve
Review via email: mp+83260@code.launchpad.net

Description of the change

The Me Menu has been removed for Oneiric, but the docs still had some references to it in the Chat and Social Networking pages, so updated those pages to match the Oneiric UI.

To post a comment you must log in.
Revision history for this message
Jeremy Bícha (jbicha) wrote :

Thank you!

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/net-chat-empathy.page'
2--- ubuntu-help/C/net-chat-empathy.page 2011-08-16 10:01:09 +0000
3+++ ubuntu-help/C/net-chat-empathy.page 2011-11-24 09:32:41 +0000
4@@ -30,13 +30,13 @@
5 Empathy is installed by default in Ubuntu. Start <app>Empathy Instant
6 Messaging</app> from the <link xref="unity-dash-intro">dash</link>,
7 the <link xref="unity-launcher-intro">launcher</link> or choose
8- <gui>Chat</gui> from the <link xref="unity-appmenu-intro">Messaging Menu</link>.
9+ <gui>Chat</gui> from the <link xref="unity-appmenu-intro">Messaging menu</link>.
10 </p>
11
12 <note style="tip">
13 <p>
14 You can change your instant messaging status (Available, Away, Busy etc)
15- from the <link xref="unity-appmenu-intro">Me Menu</link>.
16+ from the <link xref="unity-appmenu-intro">Messaging menu</link>.
17 </p>
18 </note>
19
20
21=== modified file 'ubuntu-help/C/net-chat-social.page'
22--- ubuntu-help/C/net-chat-social.page 2011-08-16 10:01:09 +0000
23+++ ubuntu-help/C/net-chat-social.page 2011-11-24 09:32:41 +0000
24@@ -30,11 +30,11 @@
25 <steps>
26
27 <item><p>
28- Click the <link xref="unity-appmenu-intro">Me menu</link> on the right hand side of the top panel.
29+ Click the <link xref="unity-appmenu-intro">Messaging menu</link> on the right hand side of the top panel.
30 </p></item>
31
32 <item><p>
33- Choose <gui>Broadcast Accounts...</gui>
34+ Choose <gui>Set Up Broadcast Account...</gui>
35 </p></item>
36
37 <item><p>

Subscribers

People subscribed via source and target branches