From 6f6d3649b280d3585d4c48541cac14e3959f9776 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 22 Dec 2010 16:57:23 -0500
Subject: change flash API as per email convo with Ben and Mike

---
 docs/api/interfaces.rst | 1 -
 1 file changed, 1 deletion(-)

(limited to 'docs/api')

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
-- 
cgit v1.2.3


From 319793d9b3d127ba2a9245713ef4f01b32918e95 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Wed, 22 Dec 2010 18:27:07 -0500
Subject: - Added CSRF token generation, as described in the narrative chapter
 entitled   "Preventing Cross-Site Request Forgery Attacks".

---
 docs/api/flash.rst | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 docs/api/flash.rst

(limited to 'docs/api')

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.
-- 
cgit v1.2.3


From b33dcac47dc0e759cd77a1548d8b38663a977df0 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Fri, 24 Dec 2010 16:22:55 -0500
Subject: - Fix API documentation rendering for ``pyramid.view.static``

---
 docs/api/view.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'docs/api')

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)
 
-- 
cgit v1.2.3