Merge branch 'gh-pages' of https://github.com/tomjohnson1492/documentation-theme-jekyll into gh-pages

_includes/image.html

@@ -1 +1 @@
-<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" href="{{include.url}}">{% endif %}<img class="docimage" src="images/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption></figure>{% endif %}
+<figure>{% if {{include.url}} %}<a class="no_icon" target="_blank" href="{{include.url}}">{% endif %}<img class="docimage" src="images/{{include.file}}" alt="{{include.alt}}" {% if {{include.max-width}} %}style="max-width: {{include.max-width}}px"{% endif %} />{% if {{include.url}} %}</a>{% endif %}{% if {{include.caption}} %}<figcaption>{{include.caption}}</figcaption>{% endif %}</figure>

pages/mydoc/mydoc_icons.md

@@ -199,13 +199,13 @@ And here's the shortcode:
 
 {% raw %}
 ```
-{{site.data.alerts.callout_info}This is a special callout information message.
+{{site.data.alerts.callout_info}This is a special callout information message.{{site.data.alerts.end}}
 {% endraw %}
 ```
 
 Here's the result:
 
-{{site.data.alerts.callout_info}}This is a special callout information message.
+{{site.data.alerts.callout_info}}This is a special callout information message.{{site.data.alerts.end}}
 
 You can use any of the following:
 {% raw %}

pages/mydoc/mydoc_search_configuration.md

@@ -35,7 +35,7 @@ I've found that include the `body` field in the search creates too many problems
 
 {% raw %}
 ```json
-      "body": "{{ page.content | strip_html | strip_newlines | replace: '\', '\\\\' | replace: '"', '\\"' | replace: '^t', '    '  }}",
+      "body": "{{ page.content | strip_html | strip_newlines | replace: '\', '\\\\' | replace: '"', '\\"' | replace: '	', '    '  }}",
 ```
 {% endraw %}
 

search.json

@@ -13,7 +13,8 @@ search: exclude
 "keywords": "{{page.keywords}}",
 "url": "{{ page.url | remove: "/"}}",
 "summary": "{{page.summary | strip }}"
-},
+}
+{% unless forloop.last and site.posts.size < 1 %},{% endunless %}
 {% endunless %}
 {% endfor %}
 
@@ -29,4 +30,4 @@ search: exclude
 {% unless forloop.last %},{% endunless %}
 {% endfor %}
 
-]
+]