Merge branch 'webdav' of github.com:zopefoundation/Zope into webdav

zopefoundation · Feb 1, 2020 · 41a4ee6 · 41a4ee6
2 parents 9b70124 + 4e66ac9
commit 41a4ee6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/constraints.txt b/constraints.txt
@@ -4,7 +4,7 @@ AuthEncoding==4.1
 BTrees==4.6.1
 Chameleon==3.6.2
 DateTime==4.3
-DocumentTemplate==3.1b2
+DocumentTemplate==3.1
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1

diff --git a/requirements-full.txt b/requirements-full.txt
@@ -5,7 +5,7 @@ AuthEncoding==4.1
 BTrees==4.6.1
 Chameleon==3.6.2
 DateTime==4.3
-DocumentTemplate==3.1b2
+DocumentTemplate==3.1
 ExtensionClass==4.4
 Missing==4.1
 MultiMapping==4.1

diff --git a/src/ZPublisher/interfaces.py b/src/ZPublisher/interfaces.py
@@ -36,7 +36,7 @@ class IPubFailure(IPubEnd):
     '''A failed request processing.
 
     Note: If a subscriber to 'IPubSuccess' raises an exception,
-    then 'IPubFailure' may be notified in addtion to 'IPubSuccess'.
+    then 'IPubFailure' may be notified in addition to 'IPubSuccess'.
     '''
     exc_info = Attribute(
         '''The exception info as returned by 'sys.exc_info()'.''')

diff --git a/versions-prod.cfg b/versions-prod.cfg
@@ -10,7 +10,7 @@ AuthEncoding = 4.1
 BTrees = 4.6.1
 Chameleon = 3.6.2
 DateTime = 4.3
-DocumentTemplate = 3.1b2
+DocumentTemplate = 3.1
 ExtensionClass = 4.4
 Missing = 4.1
 MultiMapping = 4.1