Merge pull request #22 from contentauth/cleanup

Cleanup

Author: crandmck

_data/ManifestStore_schema_edited.json

@@ -74,7 +74,7 @@
       }
     },
     "ClaimGeneratorInfo": {
-      "description": "Description of the claim generator, or the software used in generating the claim.\n\nThis structure is also used for actions softwareAgent.",
+      "description": "Description of the claim generator, or the software used in generating the claim.\n\nThis structure is also used for actions softwareAgent",
       "type": "object",
       "required": [
         "name"
@@ -133,7 +133,7 @@
       ],
       "properties": {
         "actors": {
-          "description": "A list of [`Actor`](#actor)s associated with this source.",
+          "description": "A list of [`Actor`]s associated with this source.",
           "type": [
             "array",
             "null"
@@ -640,28 +640,28 @@
       "description": "The type of range for the region of interest.",
       "oneOf": [
         {
-          "description": "A spatial range, see [`Shape`](#Shape) for more details.\n\n",
+          "description": "A spatial range, see [`Shape`](#shape) for more details.\n\n",
           "type": "string",
           "enum": [
             "spatial"
           ]
         },
         {
-          "description": "A temporal range, see [`Time`](#Time) for more details.",
+          "description": "A temporal range, see [`Time`](#time) for more details.",
           "type": "string",
           "enum": [
             "temporal"
           ]
         },
         {
-          "description": "A spatial range, see [`Frame`](#Frame) for more details.",
+          "description": "A spatial range, see [`Frame`](#frame) for more details.",
           "type": "string",
           "enum": [
             "frame"
           ]
         },
         {
-          "description": "A textual range, see [`Text`](#Text) for more details.",
+          "description": "A textual range, see [`Text`](#text) for more details.",
           "type": "string",
           "enum": [
             "textual"
@@ -1116,7 +1116,7 @@
       }
     },
     "TextSelectorRange": {
-      "description": "One or two [`TextSelector`](#TextSelector) identifying the range to select.",
+      "description": "One or two [`TextSelector`](#textselector) objects identifying the range to select.",
       "type": "object",
       "required": [
         "selector"

_includes/simple-type.html

@@ -4,12 +4,12 @@
 {% elsif include.obj.type == "number" %}
   Number
   {% if include.obj.format %}
-    FORMAT = {{include.obj.format}}
+    / {{include.obj.format}}
   {%endif%}
 
 {% elsif include.obj.type == "integer" %}
   Integer
-  {% if include.obj.format %} <br/>Format: {{obj.format}} {% endif %}
+  {% if include.obj.format %} ({{obj.format}}) {% endif %}
   {% if include.obj.minimum %} <br/>Minimum: {{obj.minimum}} {% endif %}
 
 {% elsif include.obj.type == "boolean" %}

_includes/type.html

@@ -36,7 +36,7 @@
     {% else %}
       {% unless x=="null" %}
         {{x|capitalize}} <!-- {% comment %} Assumes that the type is not another array or object {% endcomment %} -->
-        <br/>{%if obj.format %} Format: {{obj.format}} <br/>Minimum: {{obj.minimum}} {%endif%}
+        {%if obj.format %} ({{obj.format}}) {%if obj.minimum %}<br/>Minimum: {{obj.minimum}} {%endif%} {%endif%}
       {% endunless %}
 
     {% endif %}

pages/reference.md

@@ -42,7 +42,7 @@
 </td>
 
 <!-- Description -->
-<td class="manifest-ref-table">{{property.last.description|markdownify }}
+<td class="manifest-ref-table">{{property.last.description|markdownify}}
 {% if property.last.additionalProperties %}
   {% assign href=property.last.additionalProperties.first[1] %}
   <br/>See {% include ref-to-link.html ref=href %}
@@ -69,9 +69,9 @@
 <tr>
 <td style="border: 0; vertical-align: top;">
 {%- for term in schema.definitions -%}
-{% assign i = forloop.index0|modulo: 7 %}
+{% assign i = forloop.index0|modulo: 5 %}
 <a href="{{term.first | slugify | prepend: "#"}}">{{term.first}}</a>  <br/>
-{% if i == 6 %}
+{% if i == 4 %}
 </td>
 {% unless forloop.last %}
 <td style="border: 0; vertical-align: top;">