Get final merges in to Ubuntu Docs

[Kevin Godby]

On Fri, Sep 13, 2013 at 11:50 AM, Benjamin Kerensa <bkerensa at ubuntu.com> wrote:
> So I spoke with Lyz this morning she agrees with you and Doug but I still
> think its a risk. The stats you shared likely reflect commits that had
> already been peer review in Gnome of which Jeremy was also a contributor so
> peer review downstream for merging from upstream did not make as much sense
> in those cases.

There's certainly a risk. But at this point the trade-off is between
whatever damage we may do by bypassing the MP process versus
publishing documentation that is 1.5 years out of date.

Currently, the majority of my commits are just merging upstream GNOME
docs with the Ubuntu docs. I haven't started any proofreading yet, and
I'm not creating any original content. (If I do create any original
content, I'll definitely run it past some others before it gets
committed.)

The only real snag we've encountered so far was when I tried to add in
the platform conditionals and broke the build for a bit. But we
recovered from that quickly and no lasting harm was done.

—Kevin