Merge branch 'master' into zmi-bootstrap

* master:
  Use newer Version of chameleon
  Document min virtualenv version.
  fix spelling error
  fix link to download location of FieldedTextIndex
  fix spelling error
  fix link to TextIndexNG3 project
  fix spelling error
  fix spelling error
  fix spelling error
  complete abrupt ending sentence
  add missing single quotation mark
  Add entry which got lost during consolidation
  Create all scripts only once.

CHANGES.rst

@@ -196,6 +196,8 @@ Breaking changes
 
 - Remove proxy role support from DTML documents and methods.
 
+- Removed `AccessRule` and `SiteRoot` from `Products.SiteAccess`.
+
 - Remove `Products.ZReST` and the `reStructuredText` wrapper, you can use
   `docutils` directly to gain `reST` support.
 

buildout.cfg

@@ -8,9 +8,9 @@ extends =
 installed = .installed.cfg
 parts =
     test
-    zopescripts
+    scripts
     zserverscripts
-    zopepy
+    zopescripts
     alltests
     ztktests
     allpy
@@ -43,25 +43,22 @@ initialization =
 eggs = Zope
 
 
-[zopescripts]
+[scripts]
 recipe = zc.recipe.egg
 eggs =
-    Zope
     tox
     wheel
     zest.releaser
 
-
 [zserverscripts]
 recipe = zc.recipe.egg
 eggs = ZServer
 
 
-[zopepy]
+[zopescripts]
 recipe = zc.recipe.egg
 interpreter = zopepy
 eggs = Zope
-       wheel
 
 
 [alltests]
@@ -142,6 +139,7 @@ eggs =
 recipe = zc.recipe.egg
 eggs = ${alltests:eggs}
 interpreter = allpy
+scripts = allpy
 
 
 [sphinx]
@@ -161,6 +159,6 @@ eggs = z3c.checkversions [buildout]
 [requirements]
 recipe = plone.recipe.command
 command =
-    ${zopepy:bin-directory}/${zopepy:interpreter} util.py
+    ${zopescripts:bin-directory}/${zopescripts:interpreter} util.py
 update-command = ${:command}
 stop-on-error = yes

docs/INSTALL-virtualenv.rst

@@ -9,11 +9,17 @@ This document describes how to install Zope into a ``virtualenv`` using ``pip``.
 Create a Virtual Environment
 ----------------------------
 
+Python 3
+++++++++
+
 .. code-block:: sh
 
    $ python3.6 -m venv zope
    $ cd zope
 
+Python 2.7
+++++++++++
+
 If you are still using Python 2.7 install `virtualenv` onto your system then call:
 
 .. code-block:: sh
@@ -22,6 +28,11 @@ If you are still using Python 2.7 install `virtualenv` onto your system then cal
    New python executable in zope/bin/python2.7
    Installing setuptools, pip, wheel...done.
    $ cd zope
+   
+Make sure you use at least version ``12.0.1`` of `virtualenv`.
+(Calling ``virtualenv --version`` tells you the used version number.)
+Older versions install a `pip` version which is not compatible with the file format
+of ``requirements-full.txt`` used in `Zope`.
 
 
 Install the Zope Software Packages

docs/zope2book/Contributions.rst

@@ -5,7 +5,7 @@ Contributors to this book include Amos Latteier, Michel Pelletier,
 Chris McDonough, Evan Simpson, Tom Deprez, Paul Everitt, Bakhtiar
 A. Hamid, Geir Baekholt, Thomas Reulbach, Paul Winkler, Peter Sabaini,
 Andrew Veitch, Kevin Carlson, Joel Burton, John DeStefano, Tres Seaver,
-Hanno Schlicting, and the Zope Community.
+Hanno Schlichting, and the Zope Community.
 
 Amos and Michel wrote the entirety of the first edition of this
 book, and kept the online version of the book current up until Zope

docs/zope2book/SearchingZCatalog.rst

@@ -568,7 +568,7 @@ getURL()
   This can differ from getPath() if you are using virtual hosting.
 
 getObject()
-  Returns the actual zope object from the result object.  This
+  Returns the actual Zope object from the result object.  This
   is useful if you want to examine or show an attribute or
   method of the object that isn't in the metadata--once we have
   the actual object, we can get any normal attribute or method
@@ -1039,7 +1039,7 @@ KeywordIndex Record Attributes
 For example::
 
   # big or shiny
-  results=ZCatalog(categories=['big, 'shiny'])
+  results=ZCatalog(categories=['big', 'shiny'])
 
   # big and shiny
   results=ZCatalog(categories={'query':['big','shiny'], 
@@ -1314,12 +1314,12 @@ handle objects that change. As objects evolve and change, the
 index information is always current, even for rapidly changing
 information sources like message boards.
 
-On the other hand, cataloging a complex object when it changes
-(especially if the catalog index attempts to translate the
-information, as TextIndexNG, described below, can do with
-PDF files or Microsoft Office files). Some sites may benefit
-from mass cataloging, and having a cron job or other scheduled
-job initiate the mass cataloging every night.
+On the other hand, cataloging a complex object when it changes may be too time
+consuming during operation (especially if the catalog index attempts to
+translate the information, as TextIndexNG, described below, can do with PDF
+files or Microsoft Office files). Some sites may benefit from mass cataloging,
+and having a cron job or other scheduled job initiate the mass cataloging every
+night.
 
 In standard (non-CMF, non-Plone) Zope, none of the built-in
 object types attempt to automatically catalog themselves. In
@@ -1599,8 +1599,8 @@ purpose searching.  Traditionally, 'PrincipiaSearchSource'
 would include the text in an object's title, it's body, and
 anywhere else you'd want to be able to search. 
 
-For example, if you downloaded a zope product that managed
-our zoo, and it had an Animal type that you could add to your
+For example, if you downloaded a Zope product that managed
+our zoo, and it had an animal type that you could add to your
 site, this animal type would probably expose a 
 PrincipiaSearchSource that looked something like this::
 
@@ -1759,12 +1759,12 @@ especially if you have non-English language documents or expect to
 have users that will want to use a rich query syntax.
 
 Full information on TextIndexNG is available at
-http://pypi.python.org/pypi/textindexng.
+https://pypi.org/project/Products.TextIndexNG3/.
 
 FieldedTextIndex
 ~~~~~~~~~~~~~~~~
 
-FieldTextIndex is a new index type that is not (yet) a standard
+FieldedTextIndex is a new index type that is not (yet) a standard
 part of Zope, but is a separate product that can be installed
 and used with a standard catalog.
 
@@ -1867,7 +1867,7 @@ attribute or method result together, such as for 'SearchableText'
 or 'PrincipiaSearchSource'.
 
 FieldedTextIndex can be downloaded at
-http://zope.org/Members/Caseman/FieldedTextIndex.
+http://old.zope.org/Members/Caseman/FieldedTextIndex/folder_contents.
 Full documentation on how to create this type of index, and further
 information on how to search it, including how to search it from
 web forms, is available in the README file that comes with this

versions-prod.cfg

@@ -8,7 +8,7 @@ AccessControl = 4.0b4
 AuthEncoding = 4.0.0
 Acquisition = 4.4.4
 BTrees = 4.5.0
-Chameleon = 3.2
+Chameleon = 3.4
 DateTime = 4.2
 DocumentTemplate = 3.0b3
 ExtensionClass = 4.3.0