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
diff --git a/lib/lp/app/doc/launchpadform.txt b/lib/lp/app/doc/launchpadform.txt
index 7b0f67b..0bc55bd 100644
--- a/lib/lp/app/doc/launchpadform.txt
+++ b/lib/lp/app/doc/launchpadform.txt
@@ -280,7 +280,8 @@ The base template used for LaunchpadFormView classes takes care of
280displaying these errors in the appropriate locations.280displaying these errors in the appropriate locations.
281281
282282
283== Widget Validation ===283Widget Validation
284-----------------
284285
285A form may contain multiple actions, and a widget used for action A286A form may contain multiple actions, and a widget used for action A
286might not be used for action B. The validate_widgets() method makes it287might not be used for action B. The validate_widgets() method makes it
diff --git a/lib/lp/services/doc/looptuner.txt b/lib/lp/services/doc/looptuner.txt
index 3d6ab2d..88f22c2 100644
--- a/lib/lp/services/doc/looptuner.txt
+++ b/lib/lp/services/doc/looptuner.txt
@@ -270,7 +270,8 @@ The model behind LoopTuner assumes that the cost of an iteration will tend to
270increase as a linear function of chunk size. Constant cost is a degenerate270increase as a linear function of chunk size. Constant cost is a degenerate
271case of that; here we look at more meaningful linear functions.271case of that; here we look at more meaningful linear functions.
272272
273==== Without Constant ====273Without Constant
274~~~~~~~~~~~~~~~~
274275
275If cost function is purely linear with zero overhead, we approach our time276If cost function is purely linear with zero overhead, we approach our time
276goal asymptotically. In principle we never quite get there.277goal asymptotically. In principle we never quite get there.
@@ -293,7 +294,8 @@ goal asymptotically. In principle we never quite get there.
293 True294 True
294295
295296
296==== With Constant ====297With Constant
298~~~~~~~~~~~~~
297299
298Here's a variant with a relatively flat linear cost function (25 units of work300Here's a variant with a relatively flat linear cost function (25 units of work
299per second), plus a large constant overhead of half the time goal. It does301per second), plus a large constant overhead of half the time goal. It does
@@ -325,7 +327,8 @@ What if the relationship between chunk size and iteration time is much more
325radical?327radical?
326328
327329
328==== Low Exponent ====330Low Exponent
331~~~~~~~~~~~~
329332
330Due to the way LoopTuner's approximation function works, an exponential cost333Due to the way LoopTuner's approximation function works, an exponential cost
331function will cause some oscillation where iteration time overshoots the goal,334function will cause some oscillation where iteration time overshoots the goal,
@@ -353,7 +356,8 @@ be a neat alternation of oversized and undersized chunks.
353 done356 done
354357
355358
356==== High Exponent ====359High Exponent
360~~~~~~~~~~~~~
357361
358With more extreme exponential behaviour, the overshoot increases but the362With more extreme exponential behaviour, the overshoot increases but the
359effect remains the same:363effect remains the same:
diff --git a/lib/lp/services/fields/doc/uri-field.txt b/lib/lp/services/fields/doc/uri-field.txt
index 0f980d5..55b93e2 100644
--- a/lib/lp/services/fields/doc/uri-field.txt
+++ b/lib/lp/services/fields/doc/uri-field.txt
@@ -119,7 +119,8 @@ The fragment component can also be disallowed:
119 lp.app.validators.LaunchpadValidationError: URIs with fragment identifiers are not allowed.119 lp.app.validators.LaunchpadValidationError: URIs with fragment identifiers are not allowed.
120120
121121
122== Requiring or Forbidding a Trailing Slash ===122Requiring or Forbidding a Trailing Slash
123----------------------------------------
123124
124For some URIs we want to require or forbid a trailing slash. This125For some URIs we want to require or forbid a trailing slash. This
125might be because a certain URI type only makes sense with (or without)126might be because a certain URI type only makes sense with (or without)
diff --git a/lib/lp/services/webapp/doc/timeout.txt b/lib/lp/services/webapp/doc/timeout.txt
index f3a55d2..23ac905 100644
--- a/lib/lp/services/webapp/doc/timeout.txt
+++ b/lib/lp/services/webapp/doc/timeout.txt
@@ -141,7 +141,8 @@ Now the request can take 20 seconds to complete.
141 >>> abs(adapter._get_request_timeout()-20000) < 0.001141 >>> abs(adapter._get_request_timeout()-20000) < 0.001
142 True142 True
143143
144== Clean up ===144Clean up
145========
145146
146 >>> ignored = config.pop('timeout')147 >>> ignored = config.pop('timeout')
147148
diff --git a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
index 65cccda..4af8ba7 100644
--- a/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
+++ b/lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt
@@ -223,7 +223,8 @@ In the three sample data PPAs, only one matches the search string "Celso".
223 1223 1
224224
225225
226=== Hand-hacked search URLs ==226Hand-hacked search URLs
227.......................
227228
228If the search term is specified more than once by someone hand-hacking the229If the search term is specified more than once by someone hand-hacking the
229URL, the page copes gracefully with this by searching for all the terms230URL, the page copes gracefully with this by searching for all the terms

Subscribers

People subscribed via source and target branches

to status/vote changes: