summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorGerard <gerwis1998@gmail.com>2018-06-29 00:02:25 +0200
committerGerard <gerwis1998@gmail.com>2018-06-29 00:02:25 +0200
commit3b7ed44fc0d90575019a8c6d6078063c0425f175 (patch)
tree57498768d48ce74a753dec8f359b5646acf30655 /docs
parenteab50da2b27b74cd9f64f26f1f6c80935db242c8 (diff)
downloadpyramid-3b7ed44fc0d90575019a8c6d6078063c0425f175.tar.gz
pyramid-3b7ed44fc0d90575019a8c6d6078063c0425f175.tar.bz2
pyramid-3b7ed44fc0d90575019a8c6d6078063c0425f175.zip
Redoing some changes. My bad ;)
Diffstat (limited to 'docs')
-rw-r--r--docs/whatsnew-1.0.rst6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/whatsnew-1.0.rst b/docs/whatsnew-1.0.rst
index 7c507e099..0ed6e21fc 100644
--- a/docs/whatsnew-1.0.rst
+++ b/docs/whatsnew-1.0.rst
@@ -125,7 +125,7 @@ Terminology Changes
- The Pyramid concept previously known as "model" is now known as "resource".
As a result, the following API renames have been made. Backwards
- compatibility shivs for the old names have been left in place in all cases::
+ compatibility shims for the old names have been left in place in all cases::
pyramid.url.model_url ->
pyramid.url.resource_url
@@ -162,7 +162,7 @@ Terminology Changes
- The Pyramid concept previously known as "resource" is now known as "asset".
As a result, the following API changes were made. Backwards compatibility
- shivs have been left in place as necessary::
+ shims have been left in place as necessary::
pyramid.config.Configurator.absolute_resource_spec ->
pyramid.config.Configurator.absolute_asset_spec
@@ -516,7 +516,7 @@ Deprecations and Behavior Differences
- Obtaining the ``settings`` object via
``registry.{get|query}Utility(ISettings)`` is now deprecated. Instead,
obtain the ``settings`` object via the ``registry.settings`` attribute. A
- backwards compatibility shiv was added to the registry object to register
+ backwards compatibility shim was added to the registry object to register
the settings object as an ISettings utility when ``setattr(registry,
'settings', foo)`` is called, but it will be removed in a later release.