[ckan-dev] Documentation merges

[Sean Hammond]

> How do you want to deal with these?  Should we merge into master and then
> email Adriá to merge into 2.0?  Or is sean going to look a t the stuff in
> master and backport to 2.0?

Email me, I'm merging docs changes into 2.0.

With the docs, it's fairly easy, once all is done I'll do a diff between
docs/ on master and docs/ on 2.0 to make sure we didn't miss anything.