Skip to content

Commit 2a7d726

Browse files
author
Matt Brown
committed
Merge with upstream
2 parents 9a7573c + c37ae15 commit 2a7d726

71 files changed

Lines changed: 2904 additions & 2075 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎about-author.html‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -74,22 +74,21 @@
7474
</div>
7575
<div class="row">
7676
<div class="col-md-8">
77-
<h1>About</h1>
78-
<p>This website was written and built by
79-
<a class="reference external" href="http://www.mattmakai.com/">Matt Makai</a>, currently a
80-
<a class="reference external" href="http://thenextweb.com/dd/2012/06/03/a-day-in-the-life-of-a-developer-evangelist/">Developer Evangelist</a>
81-
at <a class="reference external" href="https://www.twilio.com/">Twilio</a>.</p>
82-
<p>Other projects by Matt include
83-
<a class="reference external" href="http://www.codingacrossamerica.com/">Coding Across America</a>
77+
<h1>About the Author</h1>
78+
<p>This website was written and built by
79+
<a href="http://www.mattmakai.com/">Matt Makai</a>, currently a
80+
<a href="http://thenextweb.com/dd/2012/06/03/a-day-in-the-life-of-a-developer-evangelist/">Developer Evangelist</a>
81+
at <a href="https://www.twilio.com/">Twilio</a>.</p>
82+
<p>Other projects by Matt include
83+
<a href="http://www.codingacrossamerica.com/">Coding Across America</a>
8484
and
85-
<a class="reference external" href="https://github.com/makaimc/underwear/">Underwear</a>. You can reach him by
86-
email at <a class="reference external" href="mailto:matthew.makai&#64;gmail.com">matthew.makai&#64;gmail.com</a> or send him a
87-
<a class="reference external" href="https://twitter.com/mattmakai">direct message on Twitter</a>.</p>
85+
<a href="https://github.com/makaimc/underwear/">Underwear</a>. You can reach him by
86+
email at matthew.makai@gmail.com or tweet at
87+
<a href="https://twitter.com/mattmakai">him on Twitter</a>. </p>
8888
<p>Typos, inaccurate statements, or general areas for improvement can be handled
8989
through a pull request on
90-
<a class="reference external" href="https://github.com/makaimc/fullstackpython.github.com/">GitHub</a>.</p>
91-
92-
<br/>
90+
<a href="https://github.com/makaimc/fullstackpython.github.com/">GitHub</a>.</p>
91+
<br/>
9392
Next read the
9493
<a href="/change-log.html">change log</a> section.
9594

@@ -104,19 +103,20 @@ <h1>About</h1>
104103
<a href="/databases.html" class="list-group-item ">Databases</a>
105104
<a href="/wsgi-servers.html" class="list-group-item ">WSGI Servers</a>
106105
<a href="/web-frameworks.html" class="list-group-item ">Web Frameworks</a>
107-
<a href="/task-queues.html" class="list-group-item ">Task Queues</a>
106+
<a href="/application-dependencies.html" class="list-group-item ">Application Dependencies</a>
108107
<a href="/static-content.html" class="list-group-item ">Static Content</a>
108+
<a href="/source-control.html" class="list-group-item ">Source Control</a>
109109
<a href="/caching.html" class="list-group-item ">Caching</a>
110-
<a href="/web-browsers.html" class="list-group-item ">Web Browsers</a>
111-
<a href="/web-application-security.html" class="list-group-item ">Web Application Security</a>
112-
<a href="/monitoring.html" class="list-group-item ">Monitoring</a>
113-
<a href="/web-analytics.html" class="list-group-item ">Web Analytics</a>
110+
<a href="/task-queues.html" class="list-group-item ">Task Queues</a>
114111
<a href="/api-integration.html" class="list-group-item ">API Integration</a>
115-
<a href="/source-control.html" class="list-group-item ">Source Control</a>
116-
<a href="/configuration-management.html" class="list-group-item ">Configuration Management</a>
117-
<a href="/dependency-management.html" class="list-group-item ">Application Dependencies</a>
118112
<a href="/no-sql-datastore.html" class="list-group-item ">NoSQL Data Stores</a>
119-
<a href="/about-author.html" class="list-group-item active">About</a>
113+
<a href="/web-application-security.html" class="list-group-item ">Web Security</a>
114+
<a href="/logging.html" class="list-group-item ">Logging</a>
115+
<a href="/monitoring.html" class="list-group-item ">Monitoring</a>
116+
<a href="/configuration-management.html" class="list-group-item ">Configuration Management</a>
117+
<a href="/web-analytics.html" class="list-group-item ">Web Analytics</a>
118+
<a href="/best-python-resources.html" class="list-group-item ">Best Python Resources</a>
119+
<a href="/about-author.html" class="list-group-item active">About the Author</a>
120120
<a href="/change-log.html" class="list-group-item ">Change Log</a>
121121
</div>
122122
</div></div>

‎api-integration.html‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,23 @@
7575
<div class="row">
7676
<div class="col-md-8">
7777
<h1>API Integration</h1>
78-
<p>The majority of production Python web applications rely on several
78+
<p>The majority of production Python web applications rely on several
7979
externally hosted application programming interfaces (APIs). APIs are also
80-
commonly referred to as third party services or external platforms.
81-
Examples include <a class="reference external" href="https://www.twilio.com/">Twilio</a> for messaging and voice
82-
services, <a class="reference external" href="https://stripe.com/">Stripe</a> for payment processing, and
83-
<a class="reference external" href="https://disqus.com/">Disqus</a> for embedded webpage comments.</p>
84-
<p>There are many articles about proper API design but best practices for
85-
integrating APIs is less commonly written about. However, this subject
80+
commonly referred to as third party services or external platforms.
81+
Examples include <a href="https://www.twilio.com/">Twilio</a> for messaging and voice
82+
services, <a href="https://stripe.com/">Stripe</a> for payment processing, and
83+
<a href="https://disqus.com/">Disqus</a> for embedded webpage comments.</p>
84+
<p>There are many articles about proper API design but best practices for
85+
integrating APIs is less commonly written about. However, this subject
8686
continuously grows in importance because APIs provide critical functionality
8787
across many implementation areas.</p>
88-
<div class="section" id="api-integration-resources">
8988
<h2>API Integration Resources</h2>
90-
<p><a class="reference external" href="http://www.youtube.com/watch?v=iGP8DQIqxXs">Making Django Play Nice With Third Party Services</a> (DjangoCon 2013 video)</p>
91-
</div>
92-
93-
<br/>
89+
<p>My DjangoCon 2013 talk dove into "<a href="http://www.youtube.com/watch?v=iGP8DQIqxXs">Making Django Play Nice With Third Party Services</a>."</p>
90+
<br/>
9491
Next read the
95-
<a href="/source-control.html">source control</a> section.
92+
<a href="/no-sql-datastore.html">nosql data stores</a> section.
9693

97-
</div>
94+
</div>
9895
<div class="col-md-offset-1 col-md-3" id="sidebar">
9996
<div class="list-group">
10097
<a href="/introduction.html" class="list-group-item ">Introduction</a>
@@ -105,19 +102,20 @@ <h2>API Integration Resources</h2>
105102
<a href="/databases.html" class="list-group-item ">Databases</a>
106103
<a href="/wsgi-servers.html" class="list-group-item ">WSGI Servers</a>
107104
<a href="/web-frameworks.html" class="list-group-item ">Web Frameworks</a>
108-
<a href="/task-queues.html" class="list-group-item ">Task Queues</a>
105+
<a href="/application-dependencies.html" class="list-group-item ">Application Dependencies</a>
109106
<a href="/static-content.html" class="list-group-item ">Static Content</a>
107+
<a href="/source-control.html" class="list-group-item ">Source Control</a>
110108
<a href="/caching.html" class="list-group-item ">Caching</a>
111-
<a href="/web-browsers.html" class="list-group-item ">Web Browsers</a>
112-
<a href="/web-application-security.html" class="list-group-item ">Web Application Security</a>
113-
<a href="/monitoring.html" class="list-group-item ">Monitoring</a>
114-
<a href="/web-analytics.html" class="list-group-item ">Web Analytics</a>
109+
<a href="/task-queues.html" class="list-group-item ">Task Queues</a>
115110
<a href="/api-integration.html" class="list-group-item active">API Integration</a>
116-
<a href="/source-control.html" class="list-group-item ">Source Control</a>
117-
<a href="/configuration-management.html" class="list-group-item ">Configuration Management</a>
118-
<a href="/dependency-management.html" class="list-group-item ">Application Dependencies</a>
119111
<a href="/no-sql-datastore.html" class="list-group-item ">NoSQL Data Stores</a>
120-
<a href="/about-author.html" class="list-group-item ">About</a>
112+
<a href="/web-application-security.html" class="list-group-item ">Web Security</a>
113+
<a href="/logging.html" class="list-group-item ">Logging</a>
114+
<a href="/monitoring.html" class="list-group-item ">Monitoring</a>
115+
<a href="/configuration-management.html" class="list-group-item ">Configuration Management</a>
116+
<a href="/web-analytics.html" class="list-group-item ">Web Analytics</a>
117+
<a href="/best-python-resources.html" class="list-group-item ">Best Python Resources</a>
118+
<a href="/about-author.html" class="list-group-item ">About the Author</a>
121119
<a href="/change-log.html" class="list-group-item ">Change Log</a>
122120
</div>
123121
</div></div>

0 commit comments

Comments
 (0)