diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-18 15:53:49 -0500 |
| commit | 738a2b5f3eb44da7036a31005144e5252827ac38 (patch) | |
| tree | 80e10d2ae215b2e0e1f248354b6c9a5e11406cd5 /docs/zcml.rst | |
| parent | aa6c4267b330a5665dcb7c98d75fe21f8eeececb (diff) | |
| parent | 70119302324e5bf5627344f90c62ef31b6e43005 (diff) | |
| download | pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.gz pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.tar.bz2 pyramid-738a2b5f3eb44da7036a31005144e5252827ac38.zip | |
Merge branch 'model2resource'
Conflicts:
docs/narr/views.rst
Diffstat (limited to 'docs/zcml.rst')
| -rw-r--r-- | docs/zcml.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/zcml.rst b/docs/zcml.rst index 5913f9460..e5bbe5d4b 100644 --- a/docs/zcml.rst +++ b/docs/zcml.rst @@ -13,6 +13,7 @@ documentation is organized alphabetically by directive name. zcml/aclauthorizationpolicy zcml/adapter zcml/authtktauthenticationpolicy + zcml/asset zcml/configure zcml/default_permission zcml/forbidden @@ -23,7 +24,6 @@ documentation is organized alphabetically by directive name. zcml/remoteuserauthenticationpolicy zcml/renderer zcml/repozewho1authenticationpolicy - zcml/resource zcml/route zcml/scan zcml/static |