Merge branch 'master' into patch-7

docs/zope2book/SearchingZCatalog.rst

@@ -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,7 +1599,7 @@ 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
+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::