Merge branch 'master' into move_LockItem_with_zodbupdate

zopefoundation · Apr 16, 2019 · c458c3d · c458c3d
2 parents a80a634 + 196bd65
commit c458c3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/zdgbook/ObjectPublishing.rst b/docs/zdgbook/ObjectPublishing.rst
@@ -650,8 +650,8 @@ since this argument will be marshalled from the CGI environment first,
 before the form data.
 
 The publisher provides a number of additional special variables such
-as ``URL``, ``URLn``, ``URLPATHn``, ``BASEPATHn`` and others, which are
-derived from the request.
+as ``URL``, ``URLn``, ``BASEn`` and others, which are derived from the
+request.
 
 Unfortunately, there is no current documentation for those variables.
 

diff --git a/src/ZPublisher/HTTPRequest.py b/src/ZPublisher/HTTPRequest.py
@@ -1195,7 +1195,7 @@ def resolve_url(self, url):
         # or raise the same HTTP error that would be raised in
         # the case of a real web request. If the passed in url
         # does not appear to describe an object in the system
-        # namespace (e.g. the host, port or script name dont
+        # namespace (e.g. the host, port or script name don't
         # match that of the current request), a ValueError will
         # be raised.
         if url.find(self.script) != 0: