Ubuntu Documentation

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

  1. lp1268834-fix
  2. Merge into trusty
Proposed by Greg Beam
Status: Merged
Merged at revision: 332
Proposed branch: lp:~ki7mt/ubuntu-docs/lp1268834-fix
Merge into: lp:ubuntu-docs/trusty
Diff against target: 66 lines (+14/-15)
4 files modified
ubuntu-help/C/files-copy.page (+3/-4)
ubuntu-help/C/keyboard-nav.page (+4/-4)
ubuntu-help/C/shell-keyboard-shortcuts.page (+4/-4)
ubuntu-help/C/unity-menubar-intro.page (+3/-3)
To merge this branch: bzr merge lp:~ki7mt/ubuntu-docs/lp1268834-fix
Reviewer Review Type Date Requested Status
Kevin Godby (community) Approve
Review via email: mp+201539@code.launchpad.net

Description of the change

lp:1268834

One line change in the following files:
.. keyboard-nav.page
.. unity-menubar-intro.page
.. shell-keyboard-shortcuts.page
.. files-copy.page

If ui:expanded is used in the file:

Change or add:
.. xmlns:ui="http://projectmallard.org/experimental/ui/"

To:
.. xmlns:ui="http://projectmallard.org/ui/1.0/"

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/files-copy.page'
2--- ubuntu-help/C/files-copy.page 2013-09-16 06:00:43 +0000
3+++ ubuntu-help/C/files-copy.page 2014-01-14 05:18:13 +0000
4@@ -1,7 +1,6 @@
5-<page xmlns="http://projectmallard.org/1.0/"
6- xmlns:ui="http://projectmallard.org/ui/1.0/"
7- type="topic" style="task"
8- id="files-copy">
9+<page xmlns="http://projectmallard.org/1.0/"
10+ xmlns:ui="http://projectmallard.org/ui/1.0/"
11+ type="topic" style="task" id="files-copy">
12
13 <info>
14 <link type="guide" xref="files"/>
15
16=== modified file 'ubuntu-help/C/keyboard-nav.page'
17--- ubuntu-help/C/keyboard-nav.page 2013-09-13 03:54:54 +0000
18+++ ubuntu-help/C/keyboard-nav.page 2014-01-14 05:18:13 +0000
19@@ -1,6 +1,6 @@
20-<page xmlns="http://projectmallard.org/1.0/"
21- type="topic" style="tip"
22- id="keyboard-nav">
23+<page xmlns="http://projectmallard.org/1.0/"
24+ xmlns:ui="http://projectmallard.org/ui/1.0/"
25+ type="topic" style="tip" id="keyboard-nav">
26 <info>
27 <link type="guide" xref="keyboard" group="a11y"/>
28 <link type="guide" xref="a11y#mobility" group="keyboard"/>
29@@ -180,4 +180,4 @@
30 </tr>
31 </table>
32
33-</page>
34\ No newline at end of file
35+</page>
36
37=== modified file 'ubuntu-help/C/shell-keyboard-shortcuts.page'
38--- ubuntu-help/C/shell-keyboard-shortcuts.page 2013-10-24 03:06:39 +0000
39+++ ubuntu-help/C/shell-keyboard-shortcuts.page 2014-01-14 05:18:13 +0000
40@@ -1,7 +1,7 @@
41-<page xmlns="http://projectmallard.org/1.0/"
42- xmlns:ui="http://projectmallard.org/experimental/ui/"
43- type="topic" style="tip"
44- id="shell-keyboard-shortcuts">
45+<page xmlns="http://projectmallard.org/1.0/"
46+ xmlns:ui="http://projectmallard.org/ui/1.0/"
47+ type="topic" style="tip" id="shell-keyboard-shortcuts">
48+
49 <info>
50 <link type="guide" xref="tips"/>
51 <link type="guide" xref="keyboard"/>
52
53=== modified file 'ubuntu-help/C/unity-menubar-intro.page'
54--- ubuntu-help/C/unity-menubar-intro.page 2013-10-24 03:06:39 +0000
55+++ ubuntu-help/C/unity-menubar-intro.page 2014-01-14 05:18:13 +0000
56@@ -1,7 +1,7 @@
57 <page xmlns="http://projectmallard.org/1.0/"
58- xmlns:ui="http://projectmallard.org/experimental/ui/"
59- type="topic" style="task"
60- id="unity-menubar-intro">
61+ xmlns:ui="http://projectmallard.org/ui/1.0/"
62+ type="topic" style="task" id="unity-menubar-intro">
63+
64 <info>
65 <link type="guide" xref="index" group="unity-menubar-intro"/>
66 <link type="guide" xref="shell-overview#desktop"/>

Subscribers

People subscribed via source and target branches