Redoing some changes. My bad ;)

5 files changed, 11 insertions, 11 deletions

diff --git a/BFG_HISTORY.rst b/BFG_HISTORY.rst
index 685196059..8a2d40920 100644
--- a/BFG_HISTORY.rst
+++ b/BFG_HISTORY.rst
@@ -4281,7 +4281,7 @@ Deprecations
 
 - The name ``repoze.bfg.registry.registry_manager`` was never an API,
   but scripts in the wild were using it to set up an environment for
-  use under a debug shell.  A backwards compatibility shiv has been
+  use under a debug shell.  A backwards compatibility shim has been
   added for this purpose, but the feature is deprecated.
 
 0.9a1 (2009-5-27)
diff --git a/HISTORY.rst b/HISTORY.rst
index 25dd38488..8a92eadcc 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4136,7 +4136,7 @@ Bug fixes
 Bug Fixes
 ---------
 
-- 1.1a1 broke Akhet by not providing a backwards compatibility import shiv
+- 1.1a1 broke Akhet by not providing a backwards compatibility import shim
   for ``pyramid.paster.PyramidTemplate``.  Now one has been added, although a
   deprecation warning is emitted when Akhet imports it.
 
@@ -4738,7 +4738,7 @@ Deprecations
 -------------
 
 - Using the ``pyramid.view.bfg_view`` alias for ``pyramid.view.view_config``
-  (a backwards compatibility shiv) now issues a deprecation warning.
+  (a backwards compatibility shim) now issues a deprecation warning.
 
 Backwards Incompatibilities
 ---------------------------
@@ -5178,7 +5178,7 @@ Terminology Changes
   - Positional argument names of various APIs have been changed from
     ``model`` to ``resource``.
 
-  Backwards compatibility shivs have been left in place in all cases.  They
+  Backwards compatibility shims have been left in place in all cases.  They
   will continue to work "forever".
 
 - The Pyramid concept previously known as "resource" is now known as "asset".
@@ -5205,7 +5205,7 @@ Terminology Changes
     ``reload_resources`` (config file) is now known, respectively, as
     ``PYRAMID_RELOAD_ASSETS`` and ``reload_assets``.
 
-  Backwards compatibility shivs have been left in place in all cases.  They
+  Backwards compatibility shims have been left in place in all cases.  They
   will continue to work "forever".
 
 Bug Fixes
@@ -5560,7 +5560,7 @@ Deprecations
 - 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.
 
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.
 
diff --git a/pyramid/httpexceptions.py b/pyramid/httpexceptions.py
index d36884811..bef8420b1 100644
--- a/pyramid/httpexceptions.py
+++ b/pyramid/httpexceptions.py
@@ -186,7 +186,7 @@ class HTTPException(Response, Exception):
     #   2.6.5+ access of Exception.message
     #
     # - its base class of HTTPException is no longer a Python 2.4 compatibility
-    #   shiv; it's purely a base class that inherits from Exception.  This
+    #   shim; it's purely a base class that inherits from Exception.  This
     #   implies that this class' ``exception`` property always returns
     #   ``self`` (it exists only for bw compat at this point).
     #
diff --git a/pyramid/resource.py b/pyramid/resource.py
index 58306c590..986c75e37 100644
--- a/pyramid/resource.py
+++ b/pyramid/resource.py
@@ -1,4 +1,4 @@
-""" Backwards compatibility shiv module (forever). """
+""" Backwards compatibility shim module (forever). """
 from pyramid.asset import * # b/w compat
 resolve_resource_spec = resolve_asset_spec
 resource_spec_from_abspath = asset_spec_from_abspath