Permalink
Browse files

Resolve conflict.

  • Loading branch information...
2 parents 35eab48 + 647205c commit e1cafc9aa6a9a555280a955d7877e549f84d9f49 @tseaver tseaver committed Mar 16, 2013
Showing with 4 additions and 4 deletions.
  1. +4 −4 single_file_tasks/single_file_tasks.rst
View
8 single_file_tasks/single_file_tasks.rst
@@ -1,11 +1,11 @@
-Pyramid Single File Tasks Tutorial
+Todo List Application in One File
===================================
This tutorial is intended to provide you with a feel of how a Pyramid web
application is created. The tutorial is very short, and focuses on the
-creation of a minimal application using common idioms. For brevity, the
-tutorial uses a "single-file" application development approach instead of the
-more complex (but more common) "scaffolds" approach described in
+creation of a minimal todo list application using common idioms. For brevity,
+the tutorial uses a "single-file" application development approach
+instead of the more complex (but more common) "scaffolds" described in
`the main Pyramid documentation
<http://docs.pylonsproject.org/projects/pyramid/en/latest/>`_.

0 comments on commit e1cafc9

Please sign in to comment.