# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1309439780 14400
# Node ID a15f1a3cf6916e32ed7eb171c206215b53f38ccc
# Parent  c830c178d33a2a548cff98f4362205818b4bfe4b# Parent  2060e7f9bdfcd228b687ccc24bc133e3c64467c6
Merge.

diff -r c830c178d33a -r a15f1a3cf691 content/blog/2011/06/django-advice.html
--- a/content/blog/2011/06/django-advice.html	Thu Jun 30 09:12:43 2011 -0400
+++ b/content/blog/2011/06/django-advice.html	Thu Jun 30 09:16:20 2011 -0400
@@ -707,7 +707,7 @@
 worry about than new projects.
 
 I wrote a few scripts to automate updating apps and such, but they're extremely hacky
-so I don't want ot post them here.  Take half a day and write your own set -- it's
+so I don't want to post them here.  Take half a day and write your own set -- it's
 definitely worth it to have your own mirror of your specific dependencies.
 
 [hg-git]: http://hg-git.github.com/
@@ -1024,7 +1024,7 @@
 I *rarely* work with raw HTML files any more.  Whenever I open a file ending in
 `.html` it's almost always a Django template (or a [Jinja][] template, which has
 a very similar syntax).  I've added an autocommand to automatically set the correct
-filetyle whenever I open a `.html` file:
+filetype whenever I open a `.html` file:
 
 [Jinja]: http://jinja.pocoo.org/