[FIX] Typos in "Page templates" and "Theme pages" example.

X-original-commit: 70a230b

Author: bram-odoo

content/developer/howtos/website_themes/pages.rst

@@ -124,6 +124,7 @@ page object.
 .. code-block:: xml
    :caption: ``/website_airproof/data/pages/about_us.xml``
 
+<<<<<<< 23326f11955fceaede14c2bfdc0d5d601d5d1f5f
    <odoo noupdate="1">
         <record id="page_about_us" model="website.page">
             <field name="name">About us</field>
@@ -142,6 +143,48 @@ page object.
                 </t>
             </field>
         </record>
+||||||| 0e78db48c1590e44f6a9d2818d6c3fa9534f11da
+   <odoo>
+      <data noupdate="1">
+         <record id="page_about_us" model="website.page">
+               <field name="name">About us</field>
+               <field name="is_published" eval="True"/>
+               <field name="key">website_airproof.page_about_us</field>
+               <field name="url">/about-us</field>
+               <field name="website_id" eval="1" />
+               <field name="type">qweb</field>
+               <field name="arch" type="xml">
+                  <t t-name="website_airproof.page_about_us">
+                     <t t-call="website.layout">
+                        <div id="wrap" class="oe_structure">
+                           <!-- Content -->
+                        </div>
+                     </t>
+                  </t>
+               </field>
+         </record>
+      </data>
+=======
+   <?xml version="1.0" encoding="utf-8"?>
+   <odoo noupdate="1">
+      <record id="page_about_us" model="website.page">
+         <field name="name">About us</field>
+         <field name="is_published" eval="True"/>
+         <field name="key">website_airproof.page_about_us</field>
+         <field name="url">/about-us</field>
+         <field name="website_id" eval="1" />
+         <field name="type">qweb</field>
+         <field name="arch" type="xml">
+            <t t-name="website_airproof.page_about_us">
+               <t t-call="website.layout">
+                  <div id="wrap" class="oe_structure">
+                     <!-- Content -->
+                  </div>
+               </t>
+            </t>
+         </field>
+      </record>
+>>>>>>> fce78c2967971d52e54a966d5d534c58b2898e7f
    </odoo>
 
 .. admonition:: Multiwebsite and `website_id`
@@ -325,8 +368,10 @@ Instantiate each building block (modified or not) for the page template:
 .. code-block:: xml
    :caption: `/website_airproof/views/new_page_template_templates.xml`
 
-   <template id="new_page_template_s_airproof_text_block_h1" inherit_id="website_airproof.s_airproof_text_block_h1" primary="True"/>
+   <template id="new_page_template_airproof_faq_s_text_block_h1" inherit_id="website_airproof.s_airproof_text_block_h1" primary="True"/>
    <template id="new_page_template_airproof_faq_s_title" inherit_id="website.s_title" primary="True"/>
+   <template id="new_page_template_airproof_faq_s_faq_collapse" inherit_id="website.s_faq_collapse" primary="True"/>
+   <template id="new_page_template_airproof_faq_s_call_to_action" inherit_id="website.s_call_to_action" primary="True"/>
 
 Then, create your page template with some `t-snippet-call` within an `#wrap` as explained above: