Merge lp:~bkerensa/ubuntu-docs/help.ubuntu.com into lp:~ubuntu-core-doc/help.ubuntu.com/help.ubuntu.com2017-07-21

Proposed by Benjamin Kerensa
Status: Merged
Merged at revision: 99
Proposed branch: lp:~bkerensa/ubuntu-docs/help.ubuntu.com
Merge into: lp:~ubuntu-core-doc/help.ubuntu.com/help.ubuntu.com2017-07-21
Diff against target: 70 lines (+25/-4)
2 files modified
contributors.html (+24/-3)
legal.html (+1/-1)
To merge this branch: bzr merge lp:~bkerensa/ubuntu-docs/help.ubuntu.com
Reviewer Review Type Date Requested Status
Benjamin Kerensa (community) Approve
Elizabeth K. Joseph Pending
Review via email: mp+160480@code.launchpad.net

Description of the change

Update: contributors.html
Fix Casing: legal.html

To post a comment you must log in.
99. By Benjamin Kerensa

Moved ul tag

Revision history for this message
Benjamin Kerensa (bkerensa) wrote :

I approve :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contributors.html'
2--- contributors.html 2012-10-22 14:13:47 +0000
3+++ contributors.html 2013-04-23 19:55:40 +0000
4@@ -2,7 +2,7 @@
5 <html>
6 <head>
7 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
8-<title>Documentation for Ubuntu 12.04 LTS</title>
9+<title>Contributors to Ubuntu Documentation</title>
10 <link rel="stylesheet" type="text/css" href="libs/C.css">
11 </head>
12 <body id="home">
13@@ -55,13 +55,19 @@
14
15 <p>The following members of the Ubuntu Documentation Team maintain this documentation:</p>
16 <div class="itemizedlist">
17- <ul type="disc">
18+ <ul type="disc">
19 <li>
20 <p>Matthew East (Ubuntu documentation)</p>
21 </li>
22 <li>
23 <p>Phil Bull (Ubuntu documentation)</p>
24 </li>
25+ <li>
26+ <p>Jeremy Bicha (Ubuntu documentation)</p>
27+ </li>
28+ <li>
29+ <p>Benjamin Kerensa(Ubuntu documentation)</p>
30+ </li>
31 <li>
32 <p>Jonathan Jesse (Kubuntu documentation)</p>
33 </li>
34@@ -83,7 +89,22 @@
35 <li>
36 <p>Dougie Richardson (Ubuntu Documentation)</p>
37 </li>
38- </ul>
39+ <li>
40+ <p>Sean Davis (Xubuntu documentation)</p>
41+ </li>
42+ <li>
43+ <p>Jack Fromm (Xbuntu Documentation)</p>
44+ </li>
45+ <li>
46+ <p>Elizabeth Krumbach (Xubuntu documentation)</p>
47+ </li>
48+ <li>
49+ <p>Pasi Lallinaho (Xubuntu documentation)</p>
50+ </li>
51+ <li>
52+ <p>Jay van Cooten (Xubuntu documentation)</p>
53+ </li>
54+ </ul>
55 </div>
56 <p>The following people have contributed to this documentation:</p>
57 <div class="itemizedlist">
58
59=== modified file 'legal.html'
60--- legal.html 2012-10-22 14:13:47 +0000
61+++ legal.html 2013-04-23 19:55:40 +0000
62@@ -52,7 +52,7 @@
63
64 <h1>Credits and License</h1>
65
66- <p>The documents on this website are maintained by the <a href="https://wiki.ubuntu.com/DocumentationTeam">Ubuntu documentation team</a>. For a list of contributors, see the <a class="ulink" href="contributors.html" target="_top">contributors page</a></p>
67+ <p>The documents on this website are maintained by the <a href="https://wiki.ubuntu.com/DocumentationTeam">Ubuntu Documentation Team</a>. For a list of contributors, see the <a class="ulink" href="contributors.html" target="_top">contributors page</a></p>
68 <p>Unless stated otherwise on the front page of the document, the documents are made available under the Creative Commons ShareAlike 3.0 License (CC-BY-SA).</p>
69 <p>You are free to modify, extend, and improve the Ubuntu documentation source code under the
70 terms of this license. All derivative works must be released under this license.</p>

Subscribers

People subscribed via source and target branches