8000 Merge branch 'master' into develop · michaelhelmick/twilio-python@30ae47e · GitHub
[go: up one dir, main page]
Skip to content

Commit 30ae47e

Browse files
kyleconroykyleconroy
committed
Merge branch 'master' into develop
2 parents ab2f5d7 + 40e41ed commit 30ae47e

File tree

4 files changed

+12
-44
lines changed

4 files changed

+12
-44
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ To control phone calls, your application need to output TwiML. Use :class:`twili
4444

4545
### Digging Deeper
4646

47-
The full power of the Twilio API is at your finger tips. The [full documentation](http://readthedocs.org) explains all the awesome features available to use.
47+
The full power of the Twilio API is at your finger tips. The [full documentation](http://readthedocs.org/docs/twilio-python/en/latest/) explains all the awesome features available to use.

‎docs/_themes/kr/layout.html

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,5 @@
1515
<a href="https://github.com/twilio/twilio-python">
1616
<img style="position: absolute; top: 0; right: 0; border: 0;" src="http://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub" />
1717
</a>
18-
<script type="text/javascript">
1918

20-
var _gaq = _gaq || [];
21-
_gaq.push(['_setAccount', 'UA-8742933-11']);
22-
_gaq.push(['_setDomainName', 'none']);
23-
_gaq.push(['_setAllowLinker', true]);
24-
_gaq.push(['_trackPageview']);
25-
26-
(function() {
27-
var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
28-
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
29-
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
30-
})();
31-
32-
</script>
33-
34-
<script type="text/javascript">
35-
(function() {
36-
var t = document.createElement('script');
37-
t.type = 'text/javascript';< 8000 /div>
38-
t.async = true;
39-
t.id = 'gauges-tracker';
40-
t.setAttribute('data-site-id',
41-
'4ddc27f6613f5d186d000007');
42-
t.src = '//secure.gaug.es/track.js';
43-
var s = document.getElementsByTagName('script')[0];
44-
s.parentNode.insertBefore(t, s);
45-
})();
46-
</script>
4719
{%- endblock %}

‎docs/conf.py

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@
2727
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
2828
extensions = [
2929
'sphinx.ext.autodoc',
30-
'sphinxtogithub',
3130
]
3231

3332
# Load the source for autodoc
3433
sys.path.insert(0, os.path.abspath(os.path.join(os.getcwd(), '..')))
3534

3635

37-
3836
# Add any paths that contain templates here, relative to this directory.
3937
templates_path = ['_templates']
4038

@@ -48,8 +46,8 @@
4846
master_doc = 'index'
4947

5048
# General information about the project.
51-
project = u'twilio-python2'
52-
copyright = u'2011, Kyle Conroy'
49+
project = u'twilio-python'
50+
copyright = u'2011, Twilio Inc.'
5351

5452
# The version info for the project you're documenting, acts as replacement for
5553
# |version| and |release|, also used in various other places throughout the
@@ -175,7 +173,7 @@
175173
#html_file_suffix = None
176174

177175
# Output file base name for HTML help builder.
178-
htmlhelp_basename = 'twilio-python2doc'
176+
htmlhelp_basename = 'twilio-pythondoc'
179177

180178

181179
# -- Options for LaTeX output --------------------------------------------------
@@ -189,8 +187,8 @@
189187
# Grouping the document tree into LaTeX files. List of tuples
190188
# (source start file, target name, title, author, documentclass [howto/manual]).
191189
latex_documents = [
192-
('index', 'twilio-python2.tex', u'twilio-python2 Documentation',
193-
u'Kyle Conroy', 'manual'),
190+
('index', 'twilio-python.tex', u'twilio-python Documentation',
191+
u'Twilio Inc.', 'manual'),
194192
]
195193

196194
# The name of an image file (relative to this directory) to place at the top of
@@ -222,18 +220,18 @@
222220
# One entry per manual page. List of tuples
223221
# (source start file, name, description, authors, manual section).
224222
man_pages = [
225-
('index', 'twilio-python2', u'twilio-python2 Documentation',
226-
[u'Kyle Conroy'], 1)
223+
('index', 'twilio-python', u'twilio-python Documentation',
224+
[u'Twilio Inc.'], 1)
227225
]
228226

229227

230228
# -- Options for Epub output ---------------------------------------------------
231229

232230
# Bibliographic Dublin Core info.
233-
epub_title = u'twilio-python2'
234-
epub_author = u'Kyle Conroy'
235-
epub_publisher = u'Kyle Conroy'
236-
epub_copyright = u'2010, Kyle Conroy'
231+
epub_title = u'twilio-python'
232+
epub_author = u'kyle@twilio.com'
233+
epub_publisher = u'Twilio Inc.'
234+
epub_copyright = u'2010, Twilio Inc.'
237235

238236
# The language of the text. It defaults to the language option
239237
# or en if the language is not set.

‎docs/index.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ Make requests to Twilio's `REST API <http://www.twilio.com/docs/api/twiml/>`_ an
99
Installation
1010
================
1111

12-
Latest version: `3.0`_
13-
1412
.. code-block:: bash
1513
1614
pip install twilio

0 commit comments

Comments
 (0)
0