From 92c3e502494714884b7a051721c9b322027369a1 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 18 Dec 2010 03:33:35 -0500
Subject: resource -> asset

---
 docs/api/config.rst    | 2 +-
 docs/api/request.rst   | 2 +-
 docs/api/traversal.rst | 6 +++---
 docs/api/url.rst       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'docs/api')

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 64dc4d0dd..4b23f3e8e 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -78,7 +78,7 @@
 
      .. automethod:: testing_securitypolicy
 
-     .. automethod:: testing_models
+     .. automethod:: testing_resources
 
      .. automethod:: testing_add_subscriber
 
diff --git a/docs/api/request.rst b/docs/api/request.rst
index acd66ccf8..13b434a51 100644
--- a/docs/api/request.rst
+++ b/docs/api/request.rst
@@ -26,7 +26,7 @@
    .. attribute:: root
 
       The :term:`root` object will be available as the ``root``
-      attribute of the :term:`request` object.  It will be the model
+      attribute of the :term:`request` object.  It will be the resource
       object at which traversal started (the root).  See
       :ref:`traversal_chapter` for information about root objects.
 
diff --git a/docs/api/traversal.rst b/docs/api/traversal.rst
index b89691847..cd4765e04 100644
--- a/docs/api/traversal.rst
+++ b/docs/api/traversal.rst
@@ -7,13 +7,13 @@
 
   .. autofunction:: find_interface
 
-  .. autofunction:: find_model
+  .. autofunction:: find_resource
 
   .. autofunction:: find_root
 
-  .. autofunction:: model_path
+  .. autofunction:: resource_path
 
-  .. autofunction:: model_path_tuple
+  .. autofunction:: resource_path_tuple
 
   .. autofunction:: quote_path_segment
 
diff --git a/docs/api/url.rst b/docs/api/url.rst
index 8c702a3fb..1aa3082b7 100644
--- a/docs/api/url.rst
+++ b/docs/api/url.rst
@@ -5,7 +5,7 @@
 
 .. automodule:: pyramid.url
 
-  .. autofunction:: pyramid.url.model_url(context, request, *elements, query=None, anchor=None)
+  .. autofunction:: pyramid.url.resource_url(context, request, *elements, query=None, anchor=None)
 
   .. autofunction:: route_url
 
-- 
cgit v1.2.3


From 3e2f12520381495aa64c24bdbe85d72b0746e16c Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 18 Dec 2010 04:00:31 -0500
Subject: resource -> asset

---
 docs/api/testing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/api')

diff --git a/docs/api/testing.rst b/docs/api/testing.rst
index fc4b76cc7..fdcdadee8 100644
--- a/docs/api/testing.rst
+++ b/docs/api/testing.rst
@@ -7,7 +7,7 @@
 
   .. autofunction:: registerDummySecurityPolicy
 
-  .. autofunction:: registerModels
+  .. autofunction:: registerResources
 
   .. autofunction:: registerEventListener
 
@@ -31,7 +31,7 @@
 
   .. autofunction:: cleanUp
 
-  .. autoclass:: DummyModel
+  .. autoclass:: DummyResource
      :members:
 
   .. autoclass:: DummyRequest
-- 
cgit v1.2.3


From 4c4f08969e64fe6878da0c0ce753d1e3fcdbbb56 Mon Sep 17 00:00:00 2001
From: Chris McDonough <chrism@plope.com>
Date: Sat, 18 Dec 2010 15:42:07 -0500
Subject: resource/asset normalization

---
 docs/api/config.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/api')

diff --git a/docs/api/config.rst b/docs/api/config.rst
index 4b23f3e8e..fd8e1042d 100644
--- a/docs/api/config.rst
+++ b/docs/api/config.rst
@@ -32,7 +32,7 @@
 
      .. automethod:: maybe_dotted
 
-     .. automethod:: absolute_resource_spec
+     .. automethod:: absolute_asset_spec
 
      .. automethod:: setup_registry(settings=None, root_factory=None, authentication_policy=None, renderers=DEFAULT_RENDERERS, debug_logger=None, locale_negotiator=None, request_factory=None, renderer_globals_factory=None)
 
@@ -58,7 +58,7 @@
 
      .. automethod:: make_wsgi_app()
 
-     .. automethod:: override_resource(to_override, override_with)
+     .. automethod:: override_asset(to_override, override_with)
 
      .. automethod:: scan(package=None, categories=None)
 
-- 
cgit v1.2.3