Launchpad itself

Merge ~cjwatson/launchpad:fix-doctest-reformat-headers into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. fix-doctest-reformat-headers
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 7d09d2dde939d894bc5ebd9869bac23230206408
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:fix-doctest-reformat-headers
Merge into: launchpad:master
Diff against target: 58 lines (+6/-12)
4 files modified
lib/lp/registry/codesofconduct/1.0.1.txt (+1/-2)
lib/lp/registry/codesofconduct/1.0.txt (+1/-2)
lib/lp/registry/codesofconduct/1.1.txt (+1/-2)
lib/lp/registry/codesofconduct/2.0.txt (+3/-6)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+406177@code.launchpad.net

Commit message

Revert formatting changes to codes of conduct

Description of the change

These aren't doctests.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving trivial test fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/registry/codesofconduct/1.0.1.txt b/lib/lp/registry/codesofconduct/1.0.1.txt
2index 46ad260..636573f 100644
3--- a/lib/lp/registry/codesofconduct/1.0.1.txt
4+++ b/lib/lp/registry/codesofconduct/1.0.1.txt
5@@ -1,5 +1,4 @@
6-Ubuntu Code of Conduct
7-======================
8+= Ubuntu Code of Conduct =
9
10 This Code of Conduct covers your behaviour as a member of the Ubuntu
11 Community, in any forum, mailing list, wiki, web site, IRC channel,
12diff --git a/lib/lp/registry/codesofconduct/1.0.txt b/lib/lp/registry/codesofconduct/1.0.txt
13index 36f2ef7..03a6066 100644
14--- a/lib/lp/registry/codesofconduct/1.0.txt
15+++ b/lib/lp/registry/codesofconduct/1.0.txt
16@@ -1,5 +1,4 @@
17-Ubuntu Code of Conduct
18-======================
19+= Ubuntu Code of Conduct =
20
21 This Code of Conduct covers your behaviour as a member of the Ubuntu
22 Community, in any forum, mailing list, wiki, web site, IRC channel,
23diff --git a/lib/lp/registry/codesofconduct/1.1.txt b/lib/lp/registry/codesofconduct/1.1.txt
24index 79927ef..18b3cf7 100644
25--- a/lib/lp/registry/codesofconduct/1.1.txt
26+++ b/lib/lp/registry/codesofconduct/1.1.txt
27@@ -1,5 +1,4 @@
28-Ubuntu Code of Conduct v1.1
29-===========================
30+= Ubuntu Code of Conduct v1.1 =
31
32 This Code of Conduct covers our behaviour as members of the Ubuntu
33 Community, in any forum, mailing list, wiki, web site, IRC channel,
34diff --git a/lib/lp/registry/codesofconduct/2.0.txt b/lib/lp/registry/codesofconduct/2.0.txt
35index 82acc05..b8c1160 100644
36--- a/lib/lp/registry/codesofconduct/2.0.txt
37+++ b/lib/lp/registry/codesofconduct/2.0.txt
38@@ -1,8 +1,6 @@
39-Ubuntu Code of Conduct v2.0
40-===========================
41+= Ubuntu Code of Conduct v2.0 =
42
43-Community
44----------
45+== Community ==
46
47 Ubuntu is about showing humanity to one another: the word itself
48 captures the spirit of being human.
49@@ -87,8 +85,7 @@ We strive to:
50 ensure that others can pick up where they left off.
51
52
53-Leadership, Authority and Responsibility
54-----------------------------------------
55+== Leadership, Authority and Responsibility ==
56
57 We all lead by example, in debate and in action. We encourage new
58 participants to feel empowered to lead, to take action, and to

Subscribers

People subscribed via source and target branches

to status/vote changes: