From 69e27533894bdd579b2c995bb611075477468f5f Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Mon, 05 Sep 2011 06:42:41 +0200
Subject: [PATCH] Merge branch 'master' of github.com:Pylons/pyramid

---
 pyramid/traversal.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyramid/traversal.py b/pyramid/traversal.py
index bab5389..2004fca 100644
--- a/pyramid/traversal.py
+++ b/pyramid/traversal.py
@@ -43,8 +43,8 @@
     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

--
Gitblit v1.9.3