diff options
| author | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-12-28 21:02:36 -0500 |
| commit | fcfc5aebc259fa34d8d2313adde7c2f57bab2e53 (patch) | |
| tree | c52e454f30ca7453da814e57635accc302d61b2b /docs/api | |
| parent | e8f26928bf5c8fb8490a72436718cedf8fe19281 (diff) | |
| parent | 02c43fe07f1ffe0cc27e539618ed8d96014cddee (diff) | |
| download | pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.gz pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.tar.bz2 pyramid-fcfc5aebc259fa34d8d2313adde7c2f57bab2e53.zip | |
Merge branch 'master' into viewderiver
Diffstat (limited to 'docs/api')
| -rw-r--r-- | docs/api/flash.rst | 36 | ||||
| -rw-r--r-- | docs/api/interfaces.rst | 1 | ||||
| -rw-r--r-- | docs/api/view.rst | 1 |
3 files changed, 1 insertions, 37 deletions
diff --git a/docs/api/flash.rst b/docs/api/flash.rst deleted file mode 100644 index 94907958d..000000000 --- a/docs/api/flash.rst +++ /dev/null @@ -1,36 +0,0 @@ -.. _flash_module: - -:mod:`pyramid.flash` --------------------- - -Flash Category Constants -~~~~~~~~~~~~~~~~~~~~~~~~ - -The following attributes represent constants for use as flash messaging -category values (see :ref:`flash_chapter`). - -.. attribute:: DEBUG - - An alternate spelling for the string ``debug``. Represents development - debug messages. - -.. attribute:: INFO - - An alternate spelling for the string ``info``. Represents messages that - are informational for user consumption. - -.. attribute:: SUCCESS - - An alternate spelling for the string ``success``. Represents messages that - tell the user about a successful action. - -.. attribute:: WARNING - - An alternate spelling for the string ``warning``. Represents messages - that tell the user about a condition that is not a success, but is neither - an error. - -.. attribute:: ERROR - - An alternate spelling for the string ``success``. Represents messages - that tell the user about an unsuccessful action. diff --git a/docs/api/interfaces.rst b/docs/api/interfaces.rst index dab64ba15..b3c14e5f7 100644 --- a/docs/api/interfaces.rst +++ b/docs/api/interfaces.rst @@ -35,4 +35,3 @@ Other Interfaces .. autointerface:: ITemplateRenderer - .. autointerface:: IFlashMessages diff --git a/docs/api/view.rst b/docs/api/view.rst index 0057cca4a..4dddea25f 100644 --- a/docs/api/view.rst +++ b/docs/api/view.rst @@ -18,6 +18,7 @@ .. autoclass:: static :members: + :inherited-members: .. autofunction:: append_slash_notfound_view(context, request) |