diff options
| author | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-02-05 14:42:34 -0500 |
| commit | 88fba8dbd201118241965d6a056ae09372b0630c (patch) | |
| tree | e0c30696df5827037048eb0cdd6c0731653a1734 /docs/narr/muchadoabouttraversal.rst | |
| parent | ce0e371e067f3628620a7db5a50056c9a045979f (diff) | |
| parent | 291995fa17ae55adfda09c4eda095fd5e8cb21d8 (diff) | |
| download | pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.gz pyramid-88fba8dbd201118241965d6a056ae09372b0630c.tar.bz2 pyramid-88fba8dbd201118241965d6a056ae09372b0630c.zip | |
fix conflicts
Diffstat (limited to 'docs/narr/muchadoabouttraversal.rst')
| -rw-r--r-- | docs/narr/muchadoabouttraversal.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/muchadoabouttraversal.rst b/docs/narr/muchadoabouttraversal.rst index 364dad97f..a4709ef18 100644 --- a/docs/narr/muchadoabouttraversal.rst +++ b/docs/narr/muchadoabouttraversal.rst @@ -107,7 +107,7 @@ Traversal (aka Resource Location) single: traversal overview Believe it or not, if you understand how serving files from a file system -works,you understand traversal. And if you understand that a server might do +works, you understand traversal. And if you understand that a server might do something different based on what type of file a given request specifies, then you understand view lookup. |