Conflicts pushed

CHANGES.txt

@@ -1,5 +1,3 @@
-20130515 - merged pull request from sgillies which promotes the practice of long, lat coords using the default CRS (which is the same as with KML) over the practice of using projected coordinates or, worst of all, lat/lng coordinates and added T. Schaub to authors as requsted per mailing list, merged pul request from mpdaly with message "Interior rings must fall within the geometry of the exterior ring, not just the convex hull of the exterior ring.".
-20130511 - added note to discuss naming for new optional profile/namespace member and enhanced section security considerations by motivating and pointing to the relevant section in the JSON RFC
 20130402 - reduced crsRef to single label with domain RFC 5165 like URN, thus renamed it to crsURN
 20130430 - moved repo to GeoJSONWG organization at https://github.com/GeoJSONWG/draft-geojson
 20130428 - typos corrected, editorial changes throughout the document and several notes partly explaining thes or requesting further changes or additions. Correction of inconsistent may in GeoJSON Object first list item into MUST, merge with second listitem and provision of js and bib folders

README.md

@@ -1,22 +1,17 @@
-geojson
-=======
+# GeoJSON
 
 Incubator for geojson spec rewrite and subsequent IETF RFC submission.
 
-status
-------
+## Status
 
 Test and development. The idnits tool from IETF already reports 0 errors.
 
-todo
-----
+## TODO
 
 Some issues are to be resolved, others are not yet known:
 
 * Is the migration from the crs object to a crs reference ok?
 
-* Namespace or profile - howto enable optional hints (for consumers of GeoJSON objects) in a natrual way
-
 * Are the formal changes applied to the existing community spec at <http://geojson.org/geojson-spec.html> ok?
 
 * Is there consensus, that the mostly editorial changes apllied are also an enhancement or where these have to be reversed or completed?
@@ -31,11 +26,17 @@ Some issues are to be resolved, others are not yet known:
 
 * There is also an Acknowledgments section possible in addition to (or replacing) a contributor section, where the former is mor for lengthy thanks, which might not fit so well with the approx 15 pages total of the to be submitted paginated text RFC draft ...
 
-hints on synch'ing the derived formats
---------------------------------------
+## Generating Docs
 
-Inside the working copy of the repo perform (current practice):
+### Dependencies
 
-$> bash pandoc2rfc -R -t template.xml -x transform.xsl back.mkd middle.mkd && mv draft.txt draft-unpaginated.txt && for i in H N T X; do bash pandoc2rfc -$i -t template.xml -x transform.xsl back.mkd middle.mkd; done
+ * [`xml2rfc`](https://pypi.python.org/pypi/xml2rfc/)
+ * [`pandoc2rcf`](https://raw.github.com/miekg/pandoc2rfc/master/pandoc2rfc)
 
+### Transform Markdown to XML etc.
+
+Inside the working copy of the repo perform (current practice):
 
+```bash
+bash pandoc2rfc -R -t template.xml -x transform.xsl back.mkd middle.mkd && mv draft.txt draft-unpaginated.txt && for i in H N T X; do bash pandoc2rfc -$i -t template.xml -x transform.xsl back.mkd middle.mkd; done
+```