Docs: Merge changes from #640 into new structure

django-oscar · Apr 16, 2013 · d9e4881 · d9e4881
1 parent ecaf94f
commit d9e4881
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/docs/source/howto/how_to_customise_a_view.rst b/docs/source/howto/how_to_customise_a_view.rst
@@ -24,10 +24,22 @@ Oscar's view if you like::
 In this example, we set a new template location but it's possible to customise the view
 in any imaginable way.
 
+If you want to change the template, create the alternative template
+``new-homeview.html``.  This could either be
+in a project-level ``templates`` folder that is added to your ``TEMPLATE_DIRS``
+settings, or a app-level ``templates`` folder within your 'promotions' app.  For
+now, put something simple in there, such as::
+
+    <html>
+        <body>
+            <p>You have successfully overridden the homepage template.</p>
+        </body>
+    </html>
+
 Now you can hook it up in your local ``app.py``::
 
     # myproject/promotions/app.py
-    from oscar.apps.promotions import PromotionsApplication as CorePromotionsApplication
+    from oscar.apps.promotions.app import PromotionsApplication as CorePromotionsApplication
 
     from myproject.promotions.views import HomeView
 

diff --git a/docs/source/topics/customisation.rst b/docs/source/topics/customisation.rst
@@ -132,8 +132,8 @@ of the app with yours.  You can do that by supplying an extra argument to
         # all your non-Oscar apps
     ] + get_core_apps(['yourproject.order'])
 
-``get_core_apps([])`` will return a list of Oscar core apps. If you supply
-additional apps, they will be used to replace the Oscar core apps.
+``get_core_apps([])`` will return a list of Oscar core apps. If you supply a
+list of additional apps, they will be used to replace the Oscar core apps.
 In the above example, ``yourproject.order`` will be returned instead of
 ``oscar.apps.order``.