Merge pull request #3179 from stevepiercy/1.9-branch

Steve Piercy

2017-10-19 8a199412ea3a5f1f9dd9f9eef278973c03b0a5d5

Merge pull request #3179 from stevepiercy/1.9-branch

csrf documentation change

 docs/narr/security.rst

@@ -874,8 +874,8 @@

.. code-block:: python

   from pyramid.csrf import get_csrf_token
   token = new_csrf_token()
   from pyramid.csrf import new_csrf_token
   token = new_csrf_token(request)

.. note::