Merge remote-tracking branch 'origin/gh-pages'

Author: bobbyshaw

.gitignore

@@ -1,2 +1,3 @@
 _site
 .idea
+.jekyll-metadata

adminhtml.md

@@ -305,6 +305,6 @@ As covered in [the basics](/basics.html), there are three code pools
     - Local customisations.
 
 <ul class="navigation">
-    <li class="prev"><a href="/eav.html">&larr; EAV</a>
-    <li class="next"><a href="/catalog.html">Catalog &rarr;</a>
+    <li class="prev"><a href="/eav.html">&larr; EAV</a></li>
+    <li class="next"><a href="/catalog.html">Catalog &rarr;</a></li>
 </ul>

advanced-features.md

@@ -81,14 +81,6 @@ Internally, the version 2 API handler uses the same API method configuration as
 section of the config, e.g. `catalogProduct` to find the method resource and then calls the `{resource}.{method_suffix}` API version 1 method.
 
 <ul class="navigation">
-    <li class="prev"><a href="/sales.html">&larr; Sales</a>
-    <li class="next"><a href="/">Home &rarr;</a>
+    <li class="prev"><a href="/sales.html">&larr; Sales</a></li>
+    <li class="next"><a href="/">Home &rarr;</a></li>
 </ul>
-
-
-
-
-
-
-
-

basics.md

@@ -374,6 +374,6 @@ With sub-directories, we strengthen name-recognition for the primary domain. And
 See even more info in [Belvg's post](http://blog.belvg.com/magento-certified-developer-exam-internationalization.html) on the subject.
 
 <ul class="navigation">
-    <li class="prev"><a href="/">&larr; Home</a>
-    <li class="next"><a href="/request-flow.html">Request Flow &rarr;</a>
+    <li class="prev"><a href="/">&larr; Home</a></li>
+    <li class="next"><a href="/request-flow.html">Request Flow &rarr;</a></li>
 </ul>

catalog.md

@@ -35,7 +35,7 @@ Downloadable and Bundle products have extra tables in the database, meanwhile th
 
 ### Custom Product Type
 
-To create a product type that extends one of the built-in product types, the corresponding product type model should be extended. Otherwise the new product type should extend the `Mage_Catalog_Model_Product_Type_Abstract` class. 
+To create a product type that extends one of the built-in product types, the corresponding product type model should be extended. Otherwise the new product type should extend the `Mage_Catalog_Model_Product_Type_Abstract` class.
 
 An entry in the module's `config.xml` is also required:
 
@@ -64,7 +64,7 @@ When dealing with a single product, the price is always calculated on the fly.
 
 Some product types deal with it differently.  In which case they extend this class and implement their own logic.  For example, the configurable product overwrites `getFinalPrice()` and adds additional logic.  This custom model can then be specified in `config.xml` with a `<price_model>` tag.
 
-Product collections, however, use the price index to retrieve pre-calculated prices, eliminating the need to calculate it for each product. 
+Product collections, however, use the price index to retrieve pre-calculated prices, eliminating the need to calculate it for each product.
 
 Final price can be adjusted by the observers of the `catalog_product_get_final_price` event.  By default, only the `Mage_CatalogRule` module observes this event.
 
@@ -128,7 +128,7 @@ N.B. If flat catalog is enabled, the only child categories returned will be ones
 
 ### Catalog Price Rules
 
-Catalog price rules apply discounts to products based on the date, product, website and customer group. 
+Catalog price rules apply discounts to products based on the date, product, website and customer group.
 
 When `getFinalPrice()` is called on a product, the event `catalog_product_get_final_price` is fired. This is observed by `Mage_CatalogRule_Model_Observer` which will then look for any catalog price rule that applies to the product.  If applicable, it then looks at the database price table and writes the price back to the product model as a Varien data field `final_price`.
 
@@ -154,11 +154,6 @@ The `Mage_Index` module provides the framework with which custom indexes can be
 
 
 <ul class="navigation">
-    <li class="prev"><a href="/eav.html">&larr; EAV</a>
-    <li class="next"><a href="/checkout.html">Checkout &rarr;</a>
+    <li class="prev"><a href="/eav.html">&larr; EAV</a></li>
+    <li class="next"><a href="/checkout.html">Checkout &rarr;</a></li>
 </ul>
-
-
-
-
-

checkout.md

@@ -89,7 +89,7 @@ The priority of a total model execution can be customised using the `<before>` a
 4. Tax
 5. Grand Total
 
-This process is managed by the `Mage_Sales_Model_Quote_Address_Total_Collector` model which is called from the Address using the `collectTotals()` method.  This method is called whenever the quote is updated, e.g. at each stage of the checkout. This method also dispatches the `_collect_totals_before` and `_collect_totals_after` events. 
+This process is managed by the `Mage_Sales_Model_Quote_Address_Total_Collector` model which is called from the Address using the `collectTotals()` method.  This method is called whenever the quote is updated, e.g. at each stage of the checkout. This method also dispatches the `_collect_totals_before` and `_collect_totals_after` events.
 
 ### Payment Authorisation and Capturing
 
@@ -184,23 +184,12 @@ Payment methods modules typically include a few blocks to display payment forms
 Billing agreements are built in to Magento.  Payment methods set the billing agreement ID on the payment object with:
 
 ```php
-<?php 
-    $order->getPayment()->setBillingAgreementData($data); 
+<?php
+    $order->getPayment()->setBillingAgreementData($data);
 ?>
 ```
 
 <ul class="navigation">
-    <li class="prev"><a href="/catalog.html">&larr; Catalog</a>
-    <li class="next"><a href="/sales.html">Sales &rarr;</a>
+    <li class="prev"><a href="/catalog.html">&larr; Catalog</a></li>
+    <li class="next"><a href="/sales.html">Sales &rarr;</a></li>
 </ul>
-
-
-
-
-
-
-
-
-
-
-

databases.md

@@ -237,6 +237,6 @@ Magento defines a module rollback procedure when the `config.xml` module version
 Magento abstracts database engine logic by using the `Varien_Db_Adapter_Interface`.  Database engine classes implement this interface, which makes it easy to replace one engine class with another without having to rewrite all models that use the database. The actual RDBMS used is defined in the connection configuration using the `<type>` field, e.g. `<type>pdo_mysql</type>`.
 
 <ul class="navigation">
-    <li class="prev"><a href="/rendering.html">&larr; Rendering</a>
+    <li class="prev"><a href="/rendering.html">&larr; Rendering</a></li>
     <li class="next"><a href="/eav.html">EAV &rarr;</a></li>
 </ul>

deploy.sh

@@ -214,7 +214,6 @@ There is a different flat table for each store, each one contains a different st
 
 
 <ul class="navigation">
-    <li class="prev"><a href="/databases.html">&larr; Databases</a>
-    <li class="next"><a href="/adminhtml.html">Adminhtml &rarr;</a>
+    <li class="prev"><a href="/databases.html">&larr; Databases</a></li>
+    <li class="next"><a href="/adminhtml.html">Adminhtml &rarr;</a></li>
 </ul>
-

eav.md

@@ -16,7 +16,7 @@ <h2>Chapters</h2>
         {% if page.chapter == chapter %}
           <li>
             <h3><a href="{{ page.url }}">{{ page.title }}</a></h3>
-            <p>{{ page.meta-description %}}
+            <p>{{ page.meta-description }}
           </li>
         {% endif %}
       {% endfor %}
@@ -25,4 +25,4 @@ <h3><a href="{{ page.url }}">{{ page.title }}</a></h3>
 
   <h2>Study Guide Questions</h2>
   <p>Alternatively, use the <a href="/questions.html">Study Guide Questions</a> index.</p>
-</div>
+</div>

index.html

@@ -133,6 +133,6 @@ JavaScript and CSS assets are handled in the `Mage_Page_Block_Html_head` block.
 When merging CSS, a callback function on `Mage_Core_Model_Design_Package` is called to update any `@import` or `url()` directives with the correct URLs.
 
 <ul class="navigation">
-    <li class="prev"><a href="/request-flow.html">&larr; Request Flow</a>
-    <li class="next"><a href="/databases.html">Databases &rarr;</a>
+    <li class="prev"><a href="/request-flow.html">&larr; Request Flow</a></li>
+    <li class="next"><a href="/databases.html">Databases &rarr;</a></li>
 </ul>

rendering.md

@@ -229,8 +229,6 @@ There are two types of redirects that can be used in a controller action.
 	- This redirects internally within the application to another controller and/or action.
 
 <ul class="navigation">
-    <li class="prev"><a href="/basics.html">&larr; Basics</a>
-    <li class="next"><a href="/rendering.html">Rendering &rarr;</a>
+    <li class="prev"><a href="/basics.html">&larr; Basics</a></li>
+    <li class="next"><a href="/rendering.html">Rendering &rarr;</a></li>
 </ul>
-
-

request-flow.md

@@ -62,7 +62,7 @@ This is the place where the admin form will fire its request to.  Its job is to
 
 This controller allows any items to be added to the order (not just saleable items).
 
-The main action within this controller is `loadBlockAction`.  It is hit via AJAX every time a field is blurred on the admin area. 
+The main action within this controller is `loadBlockAction`.  It is hit via AJAX every time a field is blurred on the admin area.
 
 ### `Mage_Adminhtml_Model_Sales_Order_Create`
 
@@ -132,11 +132,11 @@ This is the model which contains all of the order detail. It is the location whe
 Of interest here is:
 
 - **Item**
-	- Contains the logic for each individual item in the invoice. 
+	- Contains the logic for each individual item in the invoice.
 - **Comment**
 	- Can be applied to an invoice
 - **Totals/***
-	- A number of totals which are related to an invoice.  Things like subtotal, tax, grand total, etc. 
+	- A number of totals which are related to an invoice.  Things like subtotal, tax, grand total, etc.
 - **Api**
 	- Api Access to invoices, with the ability to create new invoices, capture invoices, cancel invoices etc.
 
@@ -188,7 +188,7 @@ Each of the partial operations has its own models and tables to store the data,
 
 Magento orders can be cancelled until all items have been invoiced, e.g. during the pending or processing state.  This automatically cancels payment and order items (which just set cancelled tax amounts on the item).  Invoices can be cancelled, returning order totals to pre-invoice state.  Same goes for credit memos. Only shipments cannot be cancelled.
 
-In most cases when operations are cancelled, tax amounts are returned to the way they were before the operation (just like other price data).  In case of an order, all the cancelled amounts are set to total invoices (whatever has not been invoiced yet is cancelled). 
+In most cases when operations are cancelled, tax amounts are returned to the way they were before the operation (just like other price data).  In case of an order, all the cancelled amounts are set to total invoices (whatever has not been invoiced yet is cancelled).
 
 Invoices and credit memos cannot be cancelled from the interface, even though the functionality was implemented.
 
@@ -218,6 +218,6 @@ Customers can only be in a single group at a time.
 
 
 <ul class="navigation">
-    <li class="prev"><a href="/checkout.html">&larr; Checkout</a>
-    <li class="next"><a href="/advanced-features.html">Advanced Features &rarr;</a>
+    <li class="prev"><a href="/checkout.html">&larr; Checkout</a></li>
+    <li class="next"><a href="/advanced-features.html">Advanced Features &rarr;</a></li>
 </ul>