diff --git a/README.rst b/README.rst index c487184..0e3830b 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ It bakes configuration for Zope 5 Features ======== -- Creates basic file-system structure with ``zope.conf``, ``zope.ini``, ``site.zcml`` and inital user. +- Creates basic file-system structure with ``zope.conf``, ``zope.ini``, ``site.zcml`` and initial user. - Set Zope's main configuration options. - Configure different database backends such as local file-system storage, ``RelStorage`` or ``ZEO``. - Enable development options. @@ -68,7 +68,7 @@ Base Locations The target directory name of the cookiecutter generated configuration. This is also the so called *INSTANCEHOME*. - Attention, this is relative to current directory or to cookiecutters command line options if given (``-o PATH`` or ``--output-dir PATH``). + Attention, this is relative to current directory or to cookiecutter command line options if given (``-o PATH`` or ``--output-dir PATH``). Default: ``instance`` @@ -240,7 +240,7 @@ Zope/Plone offers different ZODB storage backends for different environments and - For development a simple local file based *direct* storage is all you need (aka filestorage). - As soon as you want multiple application processes of Zope/Plone (horizontal scaling) you need to run a separate database server process and connect to it. - - We recommend to use a Postgresql database using the *RelStorage* implementation for ZODB with *psycopg2* driver as database server in production environments. + - We recommend to use a PostgreSQL database using the *RelStorage* implementation for ZODB with *psycopg2* driver as database server in production environments. RelStorage supports very well MySQL (and derivatives), Oracle and SQLite 3 as database servers. - Zope and ZODB comes with *ZEO* (Zope Enterprise Objects). This more lightweight storage server is supported here too. It is widely used in production environment. @@ -526,14 +526,16 @@ The configuration for the scripts is generated as separate file: The file ``relstorage-pack.conf`` for the command line utility ``zobdpack`` is always generated for all RelStorage configurations. For usage information read `Packing Or Reference Checking A ZODB Storage: zodbpack `_. -The file ``relstorage-export.conf`` is generated if the two ``db_relstorage_export_*`` settings are given. -The file ``relstorage-import.conf`` is generated if the two ``db_relstorage_import_*`` settings are given. +The files +- ``relstorage-export.conf`` is generated if the two ``db_relstorage_export_*`` settings are given, and +- ``relstorage-import.conf`` is generated if the two ``db_relstorage_import_*`` settings are given. + Both are for the command line utility ``zobdconvert``. For usage information read `Copying Data Between ZODB Storages: zodbconvert `_ At the moment only the filestorage with blobs is supported. In future there may be more options, like converting from/to a ZEO-server or another RelStorage/Database. -Latter would be useful to upgrade a database or convert MyQL to Postgresql or vice versa. +Latter would be useful to upgrade a database or convert MySQL to PostgreSQL or vice versa. ``db_relstorage_import_filestorage_location`` The filename of the filestorage to import from. diff --git a/{{ cookiecutter.target }}/etc/cors.zcml b/{{ cookiecutter.target }}/etc/cors.zcml index 35bd384..58513ea 100644 --- a/{{ cookiecutter.target }}/etc/cors.zcml +++ b/{{ cookiecutter.target }}/etc/cors.zcml @@ -14,7 +14,7 @@ /> diff --git a/{{ cookiecutter.target }}/etc/relstorage-export.conf b/{{ cookiecutter.target }}/etc/relstorage-export.conf index 4a01d64..a854637 100644 --- a/{{ cookiecutter.target }}/etc/relstorage-export.conf +++ b/{{ cookiecutter.target }}/etc/relstorage-export.conf @@ -55,5 +55,5 @@ # !!! Missing db_relstorage_export_* settings! {%- endif %} -# This file is generated by cookiecutter-zope-instance {{ cookiecutter._version }}. +# This file was generated by cookiecutter-zope-instance {{ cookiecutter._version }}. # for details follow https://github.com/plone/cookiecutter-zope-instance diff --git a/{{ cookiecutter.target }}/etc/relstorage-import.conf b/{{ cookiecutter.target }}/etc/relstorage-import.conf index 492c442..4165d05 100644 --- a/{{ cookiecutter.target }}/etc/relstorage-import.conf +++ b/{{ cookiecutter.target }}/etc/relstorage-import.conf @@ -54,5 +54,5 @@ # !!! Missing db_relstorage_export_* settings! {%- endif %} -# This file is generated by cookiecutter-zope-instance {{ cookiecutter._version }}. +# This file was generated by cookiecutter-zope-instance {{ cookiecutter._version }}. # for details follow https://github.com/plone/cookiecutter-zope-instance diff --git a/{{ cookiecutter.target }}/etc/relstorage-pack.conf b/{{ cookiecutter.target }}/etc/relstorage-pack.conf index 9da4069..9190d47 100644 --- a/{{ cookiecutter.target }}/etc/relstorage-pack.conf +++ b/{{ cookiecutter.target }}/etc/relstorage-pack.conf @@ -48,5 +48,5 @@ # No RelStorage configured {%- endif %} -# This file is generated by cookiecutter-zope-instance {{ cookiecutter._version }}. +# This file was generated by cookiecutter-zope-instance {{ cookiecutter._version }}. # for details follow https://github.com/plone/cookiecutter-zope-instance diff --git a/{{ cookiecutter.target }}/etc/site.zcml b/{{ cookiecutter.target }}/etc/site.zcml index 35dd639..c505108 100644 --- a/{{ cookiecutter.target }}/etc/site.zcml +++ b/{{ cookiecutter.target }}/etc/site.zcml @@ -74,7 +74,7 @@ diff --git a/{{ cookiecutter.target }}/etc/zope.conf b/{{ cookiecutter.target }}/etc/zope.conf index b48a69b..b3b8cb7 100644 --- a/{{ cookiecutter.target }}/etc/zope.conf +++ b/{{ cookiecutter.target }}/etc/zope.conf @@ -118,5 +118,5 @@ default-zpublisher-encoding utf-8 {%- endif %} -# This file is generated by cookiecutter-zope-instance {{ cookiecutter._version }}. +# This file was generated by cookiecutter-zope-instance {{ cookiecutter._version }}. # for details follow https://github.com/plone/cookiecutter-zope-instance diff --git a/{{ cookiecutter.target }}/etc/zope.ini b/{{ cookiecutter.target }}/etc/zope.ini index 44cabb9..3ffca31 100644 --- a/{{ cookiecutter.target }}/etc/zope.ini +++ b/{{ cookiecutter.target }}/etc/zope.ini @@ -99,5 +99,5 @@ format = %(asctime)s %(levelname)-7.7s [%(name)s:%(lineno)s][%(threadName)s] %(m [formatter_message] format = %(message)s -# This file is generated by cookiecutter-zope-instance {{ cookiecutter._version }}. +# This file was generated by cookiecutter-zope-instance {{ cookiecutter._version }}. # for details follow https://github.com/plone/cookiecutter-zope-instance