Skip to content

Merged two lines about the Django subreddit #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattmakai merged 5 commits into from
Jul 29, 2014
Merged

Merged two lines about the Django subreddit #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c750a3c
Merged two lines about the Django subreddit
jllorencetti Jul 28, 2014
a7a54e9
Add cookiecutter-flask to the example projects list
jllorencetti Jul 28, 2014
0010b6e
Add cookiecutter-django from pydanny to the example projects list
jllorencetti Jul 28, 2014
626afc2
Fixing a typo in the name of pydanny
jllorencetti Jul 28, 2014
c3c6992
Merge databases change
jllorencetti Jul 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions django.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h2>Django tutorials</h2>
</li>
<li>
<p><a href="http://twoscoopspress.com/products/two-scoops-of-django-1-6">2 Scoops of Django</a>
by Daniel Greenfield and Audrey Roy is well worth the price of admission if
by Daniel Greenfeld and Audrey Roy is well worth the price of admission if
you're serious about learning how to correctly develop Django websites.</p>
</li>
<li>
Expand All @@ -96,7 +96,8 @@ <h2>Django tutorials</h2>
</li>
<li>
<p>The <a href="http://www.reddit.com/r/django">Django subreddit</a> often has links to
the latest resources for learning Django.</p>
the latest resources for learning Django and is also a good spot to ask
questions about it.</p>
</li>
<li>
<p>Lincoln Loop wrote a
Expand All @@ -116,10 +117,6 @@ <h2>Django tutorials</h2>
explains the architecture of the resulting set up and includes Chef scripts
to automate the deployment.</p>
</li>
<li>
<p>The <a href="http://www.reddit.com/r/django">Django subreddit</a> is a good spot to
learn about Django and ask questions.</p>
</li>
</ul>
<h2>Django videos</h2>
<ul>
Expand Down Expand Up @@ -209,6 +206,10 @@ <h2>Open source Django example projects</h2>
<a href="https://www.twilio.com/blog/2014/07/build-an-ivr-system-with-twilio-and-django.html">blog post</a>
with detailed explanations of each step.</p>
</li>
<li>
<p><a href="https://github.com/pydanny/cookiecutter-django">Cookiecutter Django</a> is a
project template from Daniel Greenfeld, for use with Audrey Roy's <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>. Cool features and Heroku-ready.</p>
</li>
</ul>
<h2>Django learning checklist</h2>
<p><i class="fa fa-check-square-o"></i>
Expand Down
2 changes: 1 addition & 1 deletion feeds/all.atom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T05:26:08Z</updated></feed>
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-07-29T07:30:14Z</updated></feed>
4 changes: 4 additions & 0 deletions flask.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,10 @@ <h2>Open source Flask example projects</h2>
starting point for new Flask projects.</p>
</li>
<li>
<p><a href="https://github.com/sloria/cookiecutter-flask">Cookiecutter Flask</a> is a project
template for use with <a href="https://github.com/audreyr/cookiecutter">Cookiecutter</a>.</p>
</li>
<li>
<p><a href="https://github.com/mjhea0/flaskr-tdd">Flaskr TDD</a> takes the official Flask
tutorial and adds test driven development and JQuery to the project. </p>
</li>
Expand Down
11 changes: 6 additions & 5 deletions source/content/pages/02-web-frameworks/0203-django.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,15 @@ syntax and language semantics first before diving into web development.
framework learning curve.

* [2 Scoops of Django](http://twoscoopspress.com/products/two-scoops-of-django-1-6)
by Daniel Greenfield and Audrey Roy is well worth the price of admission if
by Daniel Greenfeld and Audrey Roy is well worth the price of admission if
you're serious about learning how to correctly develop Django websites.

* [Effective Django](http://effectivedjango.com/) is another free introduction
to the web framework.

* The [Django subreddit](http://www.reddit.com/r/django) often has links to
the latest resources for learning Django.
the latest resources for learning Django and is also a good spot to ask
questions about it.

* Lincoln Loop wrote a
[Django Best Practices guide](http://lincolnloop.com/django-best-practices/)
Expand All @@ -96,9 +97,6 @@ syntax and language semantics first before diving into web development.
explains the architecture of the resulting set up and includes Chef scripts
to automate the deployment.

* The [Django subreddit](http://www.reddit.com/r/django) is a good spot to
learn about Django and ask questions.


## Django videos
* [GoDjango](https://godjango.com/) screencasts and tutorials are free short
Expand Down Expand Up @@ -175,6 +173,9 @@ existing framework.
[blog post](https://www.twilio.com/blog/2014/07/build-an-ivr-system-with-twilio-and-django.html)
with detailed explanations of each step.

* [Cookiecutter Django](https://github.com/pydanny/cookiecutter-django) is a
project template from Daniel Greenfeld, for use with Audrey Roy's [Cookiecutter](https://github.com/audreyr/cookiecutter). Cool features and Heroku-ready.


## Django learning checklist
<i class="fa fa-check-square-o"></i>
Expand Down
3 changes: 3 additions & 0 deletions source/content/pages/02-web-frameworks/0205-flask.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,9 @@ book which is an excellent learning resource.
* [Flask Foundation](https://github.com/JackStouffer/Flask-Foundation) is a
starting point for new Flask projects.

* [Cookiecutter Flask](https://github.com/sloria/cookiecutter-flask) is a project
template for use with [Cookiecutter](https://github.com/audreyr/cookiecutter).

* [Flaskr TDD](https://github.com/mjhea0/flaskr-tdd) takes the official Flask
tutorial and adds test driven development and JQuery to the project.

Expand Down