Merge 7215009f1c81b86eaa88b00e02df90379bd796c3 into 45014ce2897d90d4c449b6097a6e96d354cf2388

content/contents.lr

@@ -19,8 +19,10 @@ contents:
 	A flexible and powerful static content management system for building
 	complex and beautiful websites out of flat files — for people who do
         not want to make a compromise between a CMS and a static blog engine.
+      </p>
       <p>
         Getting your ideas implemented is as easy as making breakfast eggs.
+      </p>
     </div>
     <div class="col-md-4 visible-md-block visible-lg-block">
       <div class="download-btn"><a href="download/"

content/docs/api/db/expression/and/contents.lr

@@ -20,7 +20,7 @@ differs between Python and templates.  In templates you have to use the
 <ul>
 {% for item in this.children.filter(
     (F.type == 'hotel').and(F.stars >= 3)) %}
-  <li>{{ item.name }}: {{ item.stars }} stars
+  <li>{{ item.name }}: {{ item.stars }} stars</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/contains/contents.lr

@@ -19,7 +19,7 @@ contained in another string or a item can be contained within a list.
 <h3>Projects Tagged 'amazing'</h3>
 <ul>
 {% for item in this.children.filter(F.tags.contains('amazing')) %}
-  <li>{{ item.name }}
+  <li>{{ item.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/endswith-cs/contents.lr

@@ -18,7 +18,7 @@ see [endswith :ref](../endswith/).
 ```html+jinja
 <ul>
 {% for item in this.children.filter(F.name.endswith_cs('House')) %}
-  <li>{{ item.name }}
+  <li>{{ item.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/endswith/contents.lr

@@ -18,7 +18,7 @@ see [endswith_cs :ref](../endswith-cs/).
 ```html+jinja
 <ul>
 {% for item in this.children.filter(F.name.endswith('house')) %}
-  <li>{{ item.name }}
+  <li>{{ item.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/eq/contents.lr

@@ -15,7 +15,7 @@ Typically it compares if a value matches a specific value exactly:
 <h2>Our Houses</h2>
 <ul>
 {% for project in this.children.filter(F.type == 'house') %}
-  <li>{{ project.name }}
+  <li>{{ project.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/ge/contents.lr

@@ -16,7 +16,7 @@ or equal to it.  This behavior works best with [integers
 <h3>3 or more Stars</h3>
 <ul>
 {% for item in this.children.filter(F.stars >= 3) %}
-  <li>{{ item.name }}: {{ item.stars }} stars
+  <li>{{ item.name }}: {{ item.stars }} stars</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/gt/contents.lr

@@ -16,7 +16,7 @@ or [floats :ref](../../types/float/).
 <h3>Well Rated Items</h3>
 <ul>
 {% for item in this.children.filter(F.stars > 3) %}
-  <li>{{ item.name }}: {{ item.stars }} stars
+  <li>{{ item.name }}: {{ item.stars }} stars</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/le/contents.lr

@@ -16,7 +16,7 @@ or equal to it.  This behavior works best with [integers
 <h3>Projects From Before Including 2000</h3>
 <ul>
 {% for item in this.children.filter(F.year <= 2000) %}
-  <li>{{ item.name }} ({{ item.year }})
+  <li>{{ item.name }} ({{ item.year }})</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/lt/contents.lr

@@ -16,7 +16,7 @@ or equal to it.  This behavior works best with [integers
 <h3>Projects From Before 2000</h3>
 <ul>
 {% for item in this.children.filter(F.year < 2000) %}
-  <li>{{ item.name }} ({{ item.year }})
+  <li>{{ item.name }} ({{ item.year }})</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/ne/contents.lr

@@ -15,7 +15,7 @@ by doing a exact comparision:
 <h2>Everything Other Than Houses</h2>
 <ul>
 {% for project in this.children.filter(F.type != 'house') %}
-  <li>{{ project.name }}
+  <li>{{ project.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/or/contents.lr

@@ -20,7 +20,7 @@ differs between Python and templates.  In templates you have to use the
 <ul>
 {% for item in this.children.filter(
     (F.type == 'hotel').or(F.type == 'apartment')) %}
-  <li>{{ item.name }} ({{ item.type}})
+  <li>{{ item.name }} ({{ item.type}})</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/startswith-cs/contents.lr

@@ -19,7 +19,7 @@ see [startswith :ref](../startswith/).
 <h1>A</h1>
 <ul>
 {% for item in this.children.filter(F.name.startswith_cs('A')) %}
-  <li>{{ item.name }}
+  <li>{{ item.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/expression/startswith/contents.lr

@@ -19,7 +19,7 @@ see [startswith_cs :ref](../startswith-cs/).
 <h1>A</h1>
 <ul>
 {% for item in this.children.filter(F.name.startswith('a')) %}
-  <li>{{ item.name }}
+  <li>{{ item.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/f/contents.lr

@@ -22,7 +22,7 @@ Accessing an attributes creates an [Expression :ref](../expression/).
 ```html+jinja
 <ul>
 {% for item in this.children.filter(F.status == 'published') %}
-  <li>{{ item.title }}
+  <li>{{ item.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/obj/is-hidden/contents.lr

@@ -24,6 +24,6 @@ source objects is that they are always visible.
 ```html+jinja
 {% set downloads = site.get('/downloads') %}
 {% if downloads.is_hidden %}
-  <p>Downloads are currently unavailable
+  <p>Downloads are currently unavailable</p>
 {% endif %}
 ```

content/docs/api/db/obj/parent/contents.lr

@@ -14,5 +14,5 @@ where this property can be used to discover the associated parent object.
 ## Example
 
 ```html+jinja
-<p>My parent is: {{ this.parent.path }}
+<p>My parent is: {{ this.parent.path }}</p>
 ```

content/docs/api/db/pad/get/contents.lr

@@ -33,7 +33,7 @@ Here another example that loads the current page but in another language:
 
 ```html+jinja
 {% set other_lang = site.get(this._path, alt='ru') %}
-<p>This page in Russian: {{ other_lang.title }}
+<p>This page in Russian: {{ other_lang.title }}</p>
 ```
 
 ## Virtual Paths

content/docs/api/db/pad/query/contents.lr

@@ -18,7 +18,7 @@ and will also include hidden pages.
 ```html+jinja
 <ul>
 {% for project in site.query('/projects') %}
-  <li>{{ project.name }}: {{ project.year }}
+  <li>{{ project.name }}: {{ project.year }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/all/contents.lr

@@ -18,7 +18,7 @@ handy.
 {% if items %}
   <ul>
   {% for item in items %}
-    <li>{{ item.name }}
+    <li>{{ item.name }}</li>
   {% endfor %}
   </ul>
 {% endif %}

content/docs/api/db/query/contents.lr

@@ -22,7 +22,7 @@ Here a basic example of how to filter something in a template:
 ```html+jinja
 <ul>
 {% for item in this.children.filter(F.status == 'published') %}
-  <li>{{ item.title }}
+  <li>{{ item.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/count/contents.lr

@@ -12,5 +12,5 @@ This is a simple way to count the total number of items a query matches.
 
 ```html+jinja
 {% set project_count = site.query('/projects').count() %}
-<p>We built {{ project_count }} projects.
+<p>We built {{ project_count }} projects.</p>
 ```

content/docs/api/db/query/filter/contents.lr

@@ -22,7 +22,7 @@ Here a basic example of how to filter something in a template:
 ```html+jinja
 <ul>
 {% for item in this.children.filter(F.status == 'published') %}
-  <li>{{ item.title }}
+  <li>{{ item.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/first/contents.lr

@@ -15,6 +15,6 @@ query.  If no such record can be produced, `None` is returned.
 {% first_visible = this.children.first() %}
 {% if first_visible %}
   <h2>Explore More ...</h2>
-  <p>{{ first_visible.title }}
+  <p>{{ first_visible.title }}</p>
 {% endif %}
 ```

content/docs/api/db/query/get/contents.lr

@@ -18,5 +18,5 @@ requested page number from the query for pagination.
 ```html+jinja
 {% set p1 = this.children.get('project-1') %}
 <h2>{{ p1.name }}</h2>
-<p>Our favorite!
+<p>Our favorite!</p>
 ```

content/docs/api/db/query/include-hidden/contents.lr

@@ -24,7 +24,7 @@ Here a basic example of how to filter something in a template:
 ```html+jinja
 <ul>
 {% for item in this.children.include_hidden(true) %}
-  <li>{{ item.title }}{% if item.is_hidden %} (hidden){% endif %}
+  <li>{{ item.title }}{% if item.is_hidden %} (hidden){% endif %}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/include-undiscoverable/contents.lr

@@ -25,7 +25,7 @@ Here a basic example of how to filter something in a template:
 ```html+jinja
 <ul>
 {% for item in this.children.include_undiscoverable(true) %}
-  <li>{{ item.title }}
+  <li>{{ item.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/limit/contents.lr

@@ -17,7 +17,7 @@ of matching records.
 <h3>Our Top 3</h3>
 <ul>
 {% for item in this.children.order_by('-rating').limit(3) %}
-  <li>{{ item.title }}
+  <li>{{ item.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/query/order-by/contents.lr

@@ -23,7 +23,7 @@ order by year and within a year it will order by name.
 ```html+jinja
 <ul>
 {% for project in this.children.order_by('-year', 'name') %}
-  <li>{{ project.year }}: {{ project.name }}
+  <li>{{ project.year }}: {{ project.name }}</li>
 {% endif %}
 </ul>
 ```

content/docs/api/db/query/request-page/contents.lr

@@ -25,6 +25,7 @@ there is a good reason to use it.
   <li>
     Items on the first page of {{ child.title }}:
     {{ child.pagination.items.count() }}
+  </li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/record/children/contents.lr

@@ -27,7 +27,7 @@ via the [query :ref](../../pad/query/) method of the pad.
 ```html+jinja
 <ul>
 {% for child in this.children %}
-  <li>{{ child.title }}
+  <li>{{ child.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/record/contents.lr

@@ -25,6 +25,6 @@ attribute overlaps with your custom field, you need to access the fields
 with the subscript syntax (`[]`):
 
 ```html+jinja
-<p>Built-in Path: {{ obj.path }}
-<p>Path field: {{ obj['path'] }}
+<p>Built-in Path: {{ obj.path }}</p>
+<p>Path field: {{ obj['path'] }}</p>
 ```

content/docs/api/db/record/format/contents.lr

@@ -13,6 +13,6 @@ only implemented for attachments that are images.
 
 ```html+jinja
 {% for image in this.attachments.images %}
-  <p>{{ image._id }}: {{ image.format }}
+  <p>{{ image._id }}: {{ image.format }}</p>
 {% endfor %}
 ```

content/docs/api/db/record/pagination/contents.lr

@@ -42,7 +42,7 @@ page:
 ```html+jinja
 <ul>
 {% for child in this.pagination.items %}
-  <li>{{ child.title }}
+  <li>{{ child.title }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/system-fields/model/contents.lr

@@ -17,7 +17,7 @@ This field is most useful for filtering when operating on mixed collections.
 ```html+jinja
 <ul class="projects">
 {% for child in this.children.filter(F._model == 'project') %}
-  <li>{{ child.name }}
+  <li>{{ child.name }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/db/types/date/contents.lr

@@ -23,5 +23,5 @@ type = date
 ## Template Usage
 
 ```html+jinja
-<p>Published: {{ this.pub_date.strftime('%d/%m/%Y') }}
+<p>Published: {{ this.pub_date.strftime('%d/%m/%Y') }}</p>
 ```

content/docs/api/db/types/strings/contents.lr

@@ -28,7 +28,7 @@ description = A list of things that would be good to buy
 <h2>Shopping List</h2>
 <ul>
 {% for item in this.things_to_buy %}
-  <li>{{ item }}
+  <li>{{ item }}</li>
 {% endfor %}
 </ul>
 ```

content/docs/api/templates/filters/dateformat/contents.lr

@@ -31,11 +31,11 @@ more information see [CLDR Date/Time Symbols
 ## Examples
 
 ```html+jinja
-<p>Date: {{ this.pub_date|dateformat('full') }}
+<p>Date: {{ this.pub_date|dateformat('full') }}</p>
 ```
 
 Or with custom CLDR format strings:
 
 ```html+jinja
-<p>Date: {{ this.pub_date|dateformat('EEE, MMM d, ''yy') }}
+<p>Date: {{ this.pub_date|dateformat('EEE, MMM d, ''yy') }}</p>
 ```

content/docs/api/templates/filters/latformat/contents.lr

@@ -15,6 +15,6 @@ and [latlongformat :ref](../latlongformat/).
 ## Examples
 
 ```html+jinja
-<p>Lat: {{ image.exif.latitude|latformat }}
-<p>Long: {{ image.exif.longitude|longformat }}
+<p>Lat: {{ image.exif.latitude|latformat }}</p>
+<p>Long: {{ image.exif.longitude|longformat }}</p>
 ```

content/docs/api/templates/filters/latlongformat/contents.lr

@@ -15,5 +15,5 @@ in the format format degrees, minutes and seconds.  See also [latformat
 ## Examples
 
 ```html+jinja
-<p>Location: {{ image.exif.location|latlongformat }}
+<p>Location: {{ image.exif.location|latlongformat }}</p>
 ```

content/docs/api/templates/filters/longformat/contents.lr

@@ -15,6 +15,6 @@ and [latlongformat :ref](../latlongformat/).
 ## Examples
 
 ```html+jinja
-<p>Lat: {{ image.exif.latitude|latformat }}
-<p>Long: {{ image.exif.longitude|longformat }}
+<p>Lat: {{ image.exif.latitude|latformat }}</p>
+<p>Long: {{ image.exif.longitude|longformat }}</p>
 ```

content/docs/content/flow/contents.lr

@@ -99,7 +99,7 @@ using their templates:
 ```html+jinja
 {% for blk in this.demo_flow.blocks %}
   {% if blk._flowblock == 'text' %}
-    <p>{{ blk.text }}
+    <p>{{ blk.text }}</p>
   {% elif blk._flowblock == 'image' %}
     <img src="{{ blk.image }}" alt="{{ blk.alt }}">
   {% endif %}

content/docs/guides/blog/contents.lr

@@ -101,6 +101,7 @@ page.
       <a href="{{ post|url }}">{{ post.title }}</a> —
       by {{ post.author }}
       on {{ post.pub_date|dateformat }}
+    </li>
   {% endfor %}
   </ul>
 

content/docs/plugins/dev/contents.lr

@@ -152,7 +152,7 @@ template globals when the environment is initialized.  This means that we
 can access this function from templates then:
 
 ```html+jinja
-<p>Message of the page: {{ get_random_message() }}
+<p>Message of the page: {{ get_random_message() }}</p>
 ```
 
 There are many events that can be hooked and they can be found in the

templates/blog-archive/index.html

@@ -4,11 +4,13 @@
   <h1>The Transcript Archive</h1>
   <p>
     <a href="{{ '/blog'|url }}">&laquo; back to the blog</a>
+  </p>
   <p>
     There have been posts in the following years:
+  </p>
   <ul>
   {% for archive in this.year_archives %}
-    <li><a href="{{ archive|url }}">{{ archive.year }}</a>
+    <li><a href="{{ archive|url }}">{{ archive.year }}</a></li>
   {% endfor %}
   </ul>
 {% endblock %}

templates/blog-archive/month.html

@@ -2,7 +2,7 @@
 {% block title %}{{ this.date|dateformat('MMMM yyyy') }} Archive | The Transcript{% endblock %}
 {% block blog_body %}
   <h1>The Transcript, {{ this.date|dateformat('MMMM yyyy') }}</h1>
-  <p>
+  <p></p>
     <a href="{{ '..'|url }}">&laquo; Back to {{ this.year }}</a>
   <ul>
   {% for post in this.items %}

templates/blog-archive/year.html

@@ -4,6 +4,7 @@
   <h1>The Transcript in {{ this.year }}</h1>
   <p>
     <a href="{{ '..'|url }}">&laquo; Back to the archive</a>
+  </p>
   <ul>
   {% for archive, items in this.items_by_months %}
     <li><a href="{{ archive|url }}">{{ archive.date|dateformat('MMMM') }}</a>:
@@ -11,6 +12,7 @@
         {% for post in items %}
         <li><a href="{{ post|url }}">{{ post.title }}</a> by {{ post.author }}
           on {{ post.pub_date|dateformat }}
+        </li>
         {% endfor %}
       </ul>
   {% endfor %}

templates/blog-layout.html

@@ -20,9 +20,10 @@
       <p>
         Subscribe for the latest news about Lektor as well as content
         management and web development.
+      </p>
       <ul>
-        <li><a href="{{ '@atom/transcript'|url }}">RSS Feed</a>
-        <li><a href="https://twitter.com/getlektor">Follow us on Twitter</a>
+        <li><a href="{{ '@atom/transcript'|url }}">RSS Feed</a></li>
+        <li><a href="https://twitter.com/getlektor">Follow us on Twitter</a></li>
       </ul>
       <h3>Missed a Post?</h3>
       <ul>

templates/doc-page.html

@@ -35,11 +35,11 @@
 
       <ul class=page-meta>
       {% if this.type == 'method' %}
-        <li>Method of {{ get_doc_link(this.parent) }}
+        <li>Method of {{ get_doc_link(this.parent) }}</li>
       {% elif this.type == 'property' %}
-        <li>Property of {{ get_doc_link(this.parent) }}
+        <li>Property of {{ get_doc_link(this.parent) }}</li>
       {% elif this.type == 'operator' %}
-        <li>Operator of {{ get_doc_link(this.parent) }}
+        <li>Operator of {{ get_doc_link(this.parent) }}</li>
       {% endif %}
       {% if this.template_var %}
         <li>Template variable: <a href="{{ (

templates/showcase.html

@@ -13,8 +13,10 @@
     Want to see what Lektor is used for?  This should give you a brief overview
     of what projects are built on the basis of Lektor.  We take good care of
     ensuring this list stays up to date by carefully moderating it.
+  </p>
   <p>
     Click any of the showcases to learn a bit more about how it uses Lektor.
+  </p>
   <div class="showcase row">
     {% for project in this.children %}
       <div class="project col-md-6">
@@ -33,4 +35,5 @@
       href="https://github.com/lektor/lektor-website/tree/master/content/showcase">Fork
     the Lektor Website Repository on GitHub</a> to add your own project.  Make sure to
     add screenshots and a description about the project.</small>
+  </p>
 {% endblock %}