summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-09-05 00:42:41 -0400
committerChris McDonough <chrism@plope.com>2011-09-05 00:42:41 -0400
commit69e27533894bdd579b2c995bb611075477468f5f (patch)
treecb5bd3bfef8610ec0a7cf84d751436ae74614116
parent2a968254bbaa36333aa8ea6fd80787a7e2ac850d (diff)
parenteaf1b42b1b10fcadf5eed8a3bc71dc81307d081e (diff)
downloadpyramid-69e27533894bdd579b2c995bb611075477468f5f.tar.gz
pyramid-69e27533894bdd579b2c995bb611075477468f5f.tar.bz2
pyramid-69e27533894bdd579b2c995bb611075477468f5f.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/traversal.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/traversal.py b/pyramid/traversal.py
index bab5389a4..2004fcad2 100644
--- a/pyramid/traversal.py
+++ b/pyramid/traversal.py
@@ -43,8 +43,8 @@ def find_resource(resource, path):
path string or tuple generated by either of those functions.
Rules for passing a *string* as the ``path`` argument: if the
- first character in the path string is the with the ``/``
- character, the path will considered absolute and the resource tree
+ first character in the path string is the ``/``
+ character, the path is considered absolute and the resource tree
traversal will start at the root resource. If the first character
of the path string is *not* the ``/`` character, the path is
considered relative and resource tree traversal will begin at the resource