id -> $id

Author: mdboom

source/basics.rst

@@ -99,10 +99,15 @@ more information.
 Declaring a unique identifier
 -----------------------------
 
-It is also best practice to include an ``id`` property as a unique
+It is also best practice to include an ``$id`` property as a unique
 identifier for each schema.  For now, just set it to a URL at a domain
 you control, for example::
 
-   { "id": "http://yourdomain.com/schemas/myschema.json" }
+   { "$id": "http://yourdomain.com/schemas/myschema.json" }
 
 The details of `id` become more apparent when you start `structuring`.
+
+.. draft_specific::
+
+    --Draft 4
+    In Draft 4, ``$id`` is just ``id`` (without the dollar-sign).

source/structuring.rst

@@ -141,33 +141,44 @@ schema for a customer:
 
 .. _id:
 
-The id property
----------------
+The $id property
+----------------
 
-The ``id`` property serves two purposes:
+|draft6|
+
+The ``$id`` property serves two purposes:
 
 - It declares a unique identifier for the schema.
 
 - It declares a base URL against which ``$ref`` URLs are resolved.
 
-It is best practice that ``id`` is a URL, preferably in a domain that
+It is best practice that ``$id`` is a URL, preferably in a domain that
 you control.  For example, if you own the ``foo.bar`` domain, and you
-had a schema for addresses, you may set its ``id`` as follows::
+had a schema for addresses, you may set its ``$id`` as follows:
+
+.. schema_example::
 
-  "id": "http://foo.bar/schemas/address.json"
+  { "$id": "http://foo.bar/schemas/address.json" }
 
 This provides a unique identifier for the schema, as well as, in most
 cases, indicating where it may be downloaded.
 
-But be aware of the second purpose of the ``id`` property: that it
+But be aware of the second purpose of the ``$id`` property: that it
 declares a base URL for relative ``$ref`` URLs elsewhere in the file.
-For example, if you had::
+For example, if you had:
+
+.. schema_example::
 
   { "$ref": "person.json" }
 
-in the same file, a JSON schema validation library would fetch
-``person.json`` from ``http://foo.bar/schemas/person.json``, even if
-``address.json`` was loaded from the local filesystem.
+in the same file, a JSON schema validation library would fetch ``person.json``
+from ``http://foo.bar/schemas/person.json``, even if ``address.json`` was loaded
+from somewhere else, such as the local filesystem.
+
+.. draft_specific::
+
+    --Draft 4
+    In Draft 4, ``$id`` is just ``id`` (without the dollar sign).
 
 Extending
 ---------