Merge ~cjwatson/launchpad:doctest-narrative-moin-header into launchpad:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: f9d35e5e9eea78a040bdbd1c204717d5307c05ef
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:doctest-narrative-moin-header
Merge into: launchpad:master
Diff against target: 100 lines (+16/-8)
5 files modified
lib/lp/app/doc/launchpadform.txt (+2/-1)
lib/lp/services/doc/looptuner.txt (+8/-4)
lib/lp/services/fields/doc/uri-field.txt (+2/-1)
lib/lp/services/webapp/doc/timeout.txt (+2/-1)
lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+2/-1)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+407456@code.launchpad.net

Commit message

Reformat more doctest headers in reStructuredText style

Description of the change

I missed these in my previous pass because they either were very deeply-nested headers or had unbalanced Moin-style headers.

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

Self-approving as trivial, since this is purely formatting and doesn't touch any actual test code.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/app/doc/launchpadform.txt b/lib/lp/app/doc/launchpadform.txt
2index 7b0f67b..0bc55bd 100644
3--- a/lib/lp/app/doc/launchpadform.txt
4+++ b/lib/lp/app/doc/launchpadform.txt
5@@ -280,7 +280,8 @@ The base template used for LaunchpadFormView classes takes care of
6 displaying these errors in the appropriate locations.
7
8
9-== Widget Validation ===
10+Widget Validation
11+-----------------
12
13 A form may contain multiple actions, and a widget used for action A
14 might not be used for action B. The validate_widgets() method makes it
15diff --git a/lib/lp/services/doc/looptuner.txt b/lib/lp/services/doc/looptuner.txt
16index 3d6ab2d..88f22c2 100644
17--- a/lib/lp/services/doc/looptuner.txt
18+++ b/lib/lp/services/doc/looptuner.txt
19@@ -270,7 +270,8 @@ The model behind LoopTuner assumes that the cost of an iteration will tend to
20 increase as a linear function of chunk size. Constant cost is a degenerate
21 case of that; here we look at more meaningful linear functions.
22
23-==== Without Constant ====
24+Without Constant
25+~~~~~~~~~~~~~~~~
26
27 If cost function is purely linear with zero overhead, we approach our time
28 goal asymptotically. In principle we never quite get there.
29@@ -293,7 +294,8 @@ goal asymptotically. In principle we never quite get there.
30 True
31
32
33-==== With Constant ====
34+With Constant
35+~~~~~~~~~~~~~
36
37 Here's a variant with a relatively flat linear cost function (25 units of work
38 per second), plus a large constant overhead of half the time goal. It does
39@@ -325,7 +327,8 @@ What if the relationship between chunk size and iteration time is much more
40 radical?
41
42
43-==== Low Exponent ====
44+Low Exponent
45+~~~~~~~~~~~~
46
47 Due to the way LoopTuner's approximation function works, an exponential cost
48 function will cause some oscillation where iteration time overshoots the goal,
49@@ -353,7 +356,8 @@ be a neat alternation of oversized and undersized chunks.
50 done
51
52
53-==== High Exponent ====
54+High Exponent
55+~~~~~~~~~~~~~
56
57 With more extreme exponential behaviour, the overshoot increases but the
58 effect remains the same:
59diff --git a/lib/lp/services/fields/doc/uri-field.txt b/lib/lp/services/fields/doc/uri-field.txt
60index 0f980d5..55b93e2 100644
61--- a/lib/lp/services/fields/doc/uri-field.txt
62+++ b/lib/lp/services/fields/doc/uri-field.txt
63@@ -119,7 +119,8 @@ The fragment component can also be disallowed:
64 lp.app.validators.LaunchpadValidationError: URIs with fragment identifiers are not allowed.
65
66
67-== Requiring or Forbidding a Trailing Slash ===
68+Requiring or Forbidding a Trailing Slash
69+----------------------------------------
70
71 For some URIs we want to require or forbid a trailing slash. This
72 might be because a certain URI type only makes sense with (or without)
73diff --git a/lib/lp/services/webapp/doc/timeout.txt b/lib/lp/services/webapp/doc/timeout.txt
74index f3a55d2..23ac905 100644
75--- a/lib/lp/services/webapp/doc/timeout.txt
76+++ b/lib/lp/services/webapp/doc/timeout.txt
77@@ -141,7 +141,8 @@ Now the request can take 20 seconds to complete.
78 >>> abs(adapter._get_request_timeout()-20000) < 0.001
79 True
80
81-== Clean up ===
82+Clean up
83+========
84
85 >>> ignored = config.pop('timeout')
86
87diff --git a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
88index 65cccda..4af8ba7 100644
89--- a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
90+++ b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
91@@ -223,7 +223,8 @@ In the three sample data PPAs, only one matches the search string "Celso".
92 1
93
94
95-=== Hand-hacked search URLs ==
96+Hand-hacked search URLs
97+.......................
98
99 If the search term is specified more than once by someone hand-hacking the
100 URL, the page copes gracefully with this by searching for all the terms

Subscribers

People subscribed via source and target branches

to status/vote changes: