Skip to content

Commit c39e863

Browse files
committed
fixing typo in django intro
1 parent 2118971 commit c39e863

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

django.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ <h1>Django</h1>
5454
<a href="https://docs.djangoproject.com/en/dev/topics/auth/">authentication</a>,
5555
<a href="https://docs.djangoproject.com/en/dev/topics/http/urls/">URL routing</a>, a
5656
<a href="https://docs.djangoproject.com/en/dev/topics/templates/">templating system</a>,
57-
<a href="https://docs.djangoproject.com/en/dev/topics/db/">object-relational mapper</a>,
57+
an <a href="https://docs.djangoproject.com/en/dev/topics/db/">object-relational mapper</a>,
5858
and <a href="https://docs.djangoproject.com/en/dev/topics/migrations/">database schema migrations</a>
5959
(as of version 1.7) are all included with the <a href="https://pypi.python.org/pypi/Django/1.6.2">Django framework</a>.
6060
Compare that functionality to the Flask framework which requires a separate

feeds/all.atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<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-05-02T17:05:08Z</updated></feed>
2+
<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-05-02T17:07:54Z</updated></feed>

source/content/pages/02-web-frameworks/0203-django.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ For example,
2727
[authentication](https://docs.djangoproject.com/en/dev/topics/auth/),
2828
[URL routing](https://docs.djangoproject.com/en/dev/topics/http/urls/), a
2929
[templating system](https://docs.djangoproject.com/en/dev/topics/templates/),
30-
[object-relational mapper](https://docs.djangoproject.com/en/dev/topics/db/),
30+
an [object-relational mapper](https://docs.djangoproject.com/en/dev/topics/db/),
3131
and [database schema migrations](https://docs.djangoproject.com/en/dev/topics/migrations/)
3232
(as of version 1.7) are all included with the [Django framework](https://pypi.python.org/pypi/Django/1.6.2).
3333
Compare that functionality to the Flask framework which requires a separate

0 commit comments

Comments
 (0)