Closed kaitlin closed 10 years ago
thanks for this, a few merge conflicts preventing automatic merge i'll get to merging in a bit
On Fri, Apr 18, 2014 at 11:57 AM, Kaitlin Devine notifications@github.comwrote:
Added a page to the doc that explicitly lays out the basics of adopting
the OCD standard. Linked to it from the main docs index.
You can merge this Pull Request by running
git pull https://github.com/kaitlin/docs.opencivicdata.org master
Or view, comment on, or merge it at:
https://github.com/opencivicdata/docs.opencivicdata.org/pull/13 Commit Summary
- updated init.py diff
- Merge branch 'master' of https://github.com/opencivicdata/docs.opencivicdata.org
- changes to conf so the RTD theme shows up
- Merge branch 'master' of https://github.com/opencivicdata/docs.opencivicdata.org
- moving some docs around
- added adopting the standard page
File Changes
- M conf.pyhttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-0(4)
- R data/datatypes.rsthttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-1(6)
- A data/introduction.rsthttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-2(208)
- M includes/init.py.diffhttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-3(4)
- M index.rsthttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-4(9)
- M ocdids.rsthttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13/files#diff-5(2)
Patch Links:
- https://github.com/opencivicdata/docs.opencivicdata.org/pull/13.patch
- https://github.com/opencivicdata/docs.opencivicdata.org/pull/13.diff
— Reply to this email directly or view it on GitHubhttps://github.com/opencivicdata/docs.opencivicdata.org/pull/13 .
Added a page to the doc that explicitly lays out the basics of adopting the OCD standard. Linked to it from the main docs index.