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/index.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/index.rst')
| -rw-r--r-- | docs/index.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/index.rst b/docs/index.rst index 073a562ca..3add95117 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -48,7 +48,7 @@ Narrative documentation in chapter form explaining how to use narr/webob narr/sessions narr/templates - narr/models + narr/resources narr/security narr/i18n narr/vhosting @@ -58,7 +58,7 @@ Narrative documentation in chapter form explaining how to use narr/hooks narr/declarative narr/extending - narr/resources + narr/assets narr/router narr/threadlocals narr/zca |