diff options
| author | Steve Piercy <web@stevepiercy.com> | 2018-12-31 23:31:17 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2018-12-31 23:31:17 -0800 |
| commit | c52a261e56fd10ccc979a687dc2249d1b06f1a9d (patch) | |
| tree | 620a74035e6dfa1edd9fabc827b82f2b83ca3693 /docs/whatsnew-1.1.rst | |
| parent | f3d6b2206f523697a028d07dc0aca9381b595e40 (diff) | |
| parent | b488f6671800f99299a239fa07e06f221c127b3e (diff) | |
| download | pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.gz pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.tar.bz2 pyramid-c52a261e56fd10ccc979a687dc2249d1b06f1a9d.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'docs/whatsnew-1.1.rst')
| -rw-r--r-- | docs/whatsnew-1.1.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/whatsnew-1.1.rst b/docs/whatsnew-1.1.rst index 2427a0074..705cec784 100644 --- a/docs/whatsnew-1.1.rst +++ b/docs/whatsnew-1.1.rst @@ -201,7 +201,7 @@ Minor Feature Additions JSON-decoded variant of the request body. If the request body is not well-formed JSON, this property will raise an exception. -- A `JSONP <http://en.wikipedia.org/wiki/JSONP>`_ renderer. See +- A `JSONP <https://en.wikipedia.org/wiki/JSONP>`_ renderer. See :ref:`jsonp_renderer` for more details. - New authentication policy: |