Skip to content

Commit

Permalink
Merge pull request #68 from mdboom/include-yaml-schema
Browse files Browse the repository at this point in the history
Minor fixes
  • Loading branch information
mdboom committed Mar 10, 2015
2 parents aad3fb1 + b32e5c0 commit bafc36f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
2 changes: 2 additions & 0 deletions schemas/stsci.edu/yaml-schema/draft-01.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
---
$schema: "http://stsci.edu/schemas/yaml-schema/draft-01"
id: "http://stsci.edu/schemas/yaml-schema/draft-01"
title:
YAML Schema
description: |
A metaschema extending JSON Schema's metaschema to add support for
some YAML-specific constructions.
Expand Down
12 changes: 9 additions & 3 deletions source/extending.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ don't understand those conventions.
YAML Schema
-----------

YAML Schema is a small extension to `JSON Schema Draft 4
.. toctree::
:hidden:

schemas/stsci.edu/yaml-schema/draft-01.rst

:ref:`YAML Schema <http://stsci.edu/schemas/yaml-schema/draft-01>` is
a small extension to `JSON Schema Draft 4
<http://json-schema.org/latest/json-schema-validation.html>`__ created
specifically for ASDF. `Understanding JSON Schema
<http://spacetelescope.github.io/understanding-json-schema/>`__
Expand All @@ -37,8 +43,8 @@ For example, the root :ref:`ASDF schema
the ``data`` property must be an :ref:`ndarray
<http://stsci.edu/schemas/asdf/0.1.0/core/ndarray>`. It does
this not by using the ``tag`` keyword directly, but by referencing the
``ndarray`` schema, which in turn has the ``tag`` keyword. The `ASDF
schema` includes::
``ndarray`` schema, which in turn has the ``tag`` keyword. The ASDF
schema includes::

properties:
data:
Expand Down
3 changes: 2 additions & 1 deletion source/schemas/transform.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Basics
stsci.edu/asdf/0.1.0/transform/transform.rst
stsci.edu/asdf/0.1.0/transform/generic.rst
stsci.edu/asdf/0.1.0/transform/identity.rst
stsci.edu/asdf/0.1.0/transform/constant.rst
stsci.edu/asdf/0.1.0/transform/domain.rst

Compound transformations
------------------------
Expand Down Expand Up @@ -68,4 +70,3 @@ Polynomials
:maxdepth: 1

stsci.edu/asdf/0.1.0/transform/polynomial.rst

0 comments on commit bafc36f

Please sign in to comment.