Merged c119450 from 2.13 branch

765d68a8 · Hanno Schlichting · 4f27bec6 · 765d68a8 · 765d68a8
Commit 765d68a8 authored Jan 07, 2011 by Hanno Schlichting
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

doc/CHANGES.rst doc/CHANGES.rst +3 -0

setup.py setup.py +1 -0

No files found.
--- a/doc/CHANGES.rst
+++ b/doc/CHANGES.rst
@@ -31,6 +31,9 @@ Features Added

 - Updated to Zope Toolkit 1.1dev.

+- Added `addzope2user` script, suitable for adding an admin user directly to
+  the root acl_users folder.
+
 - Updated distributions:

  - Products.ZCatalog = 2.13.3

--- a/setup.py
+++ b/setup.py
@@ -118,6 +118,7 @@ setup(name='Zope2',
          'runzope=Zope2.Startup.run:run',
          'zopectl=Zope2.Startup.zopectl:run',
          'zpasswd=Zope2.utilities.zpasswd:main',
+          'addzope2user=Zope2.utilities.adduser:main',
      ],
    },
 )