diff options
author | Ask Solem <ask@celeryproject.org> | 2014-01-16 15:01:19 +0000 |
---|---|---|
committer | Ask Solem <ask@celeryproject.org> | 2014-01-16 15:01:19 +0000 |
commit | 97abf06e054398f22b7bf77aa6349d8a2ccd860b (patch) | |
tree | d4cabb26972ef44dbd836d3f7d43470654a50bd2 /docs | |
parent | bff6ddb0ea116e7c3b06f6cf2509c6411b3e4803 (diff) | |
parent | 07a312582d90b1303ff5d675613935392f6a6283 (diff) | |
download | py-amqp-readwrite.tar.gz |
Merge branch 'master' into readwritereadwrite
Conflicts:
amqp/transport.py
Diffstat (limited to 'docs')
-rw-r--r-- | docs/_ext/applyxrefs.py | 4 | ||||
-rw-r--r-- | docs/_ext/literals_to_xrefs.py | 4 | ||||
-rw-r--r-- | docs/conf.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/docs/_ext/applyxrefs.py b/docs/_ext/applyxrefs.py index 027490b..deed5d9 100644 --- a/docs/_ext/applyxrefs.py +++ b/docs/_ext/applyxrefs.py @@ -6,8 +6,8 @@ import os testing = False DONT_TOUCH = ( - './index.txt', - ) + './index.txt', +) def target_name(fn): diff --git a/docs/_ext/literals_to_xrefs.py b/docs/_ext/literals_to_xrefs.py index e9dc7ca..41aa616 100644 --- a/docs/_ext/literals_to_xrefs.py +++ b/docs/_ext/literals_to_xrefs.py @@ -95,8 +95,8 @@ def fixliterals(fname): replace_type in ("class", "func", "meth"): default = default[:-2] replace_value = raw_input( - colorize("Text <target> [", fg="yellow") + default + \ - colorize("]: ", fg="yellow")).strip() + colorize("Text <target> [", fg="yellow") + default + + colorize("]: ", fg="yellow")).strip() if not replace_value: replace_value = default new.append(":%s:`%s`" % (replace_type, replace_value)) diff --git a/docs/conf.py b/docs/conf.py index 3b6f524..1191395 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -70,8 +70,8 @@ html_use_modindex = True html_use_index = True latex_documents = [ - ('index', 'py-amqp.tex', ur'py-amqp Documentation', - ur'Ask Solem & Contributors', 'manual'), + ('index', 'py-amqp.tex', ur'py-amqp Documentation', + ur'Ask Solem & Contributors', 'manual'), ] html_theme = "celery" @@ -89,7 +89,7 @@ if False: issuetracker_project = "celery/py-amqp" issuetracker_issue_pattern = r'[Ii]ssue #(\d+)' -# -- Options for Epub output --------------------------------------------------- +# -- Options for Epub output ------------------------------------------------ # Bibliographic Dublin Core info. epub_title = 'py-amqp Manual, Version 1.0' |