When is Ubuntu-help used and when is GNOME-help used?

[Kevin Godby]

On Thu, Sep 12, 2013 at 11:00 AM, Doug Smythies <dsmythies at telus.net> wrote:
> On 2013.09.12 08:07 Jeremy [mailto:jeremy at bicha.net] wrote:
>> Those conditional platform:unity statements were because I attempted
>> to upstream many of the minor ubuntu-docs differences to GNOME. I only
>> pushed those changes to git:gnome-user-docs after asking first and
>> making sure there weren't objections. However, those changes were
>> reverted a bit later (without discussing it with me or even mentioning
>> it to me). I disagreed with that action.
>
>> On the other hand, the Mallard format currently doesn't allow for
>> conditionals for many elements (titles, pictures, etc.) so currently
>> it would be impossible to fully get rid of a separate ubuntu-docs but
>> many pages (like the Bluetooth pages) could have been fully merged.
>
>> You are right that unless those conditional statements are upstreamed,
>> they're just more of a pain and can be removed.
>
> O.K. My input is that we should remove them.
> Kevin's opinion needed,
> other opinions optional.
>
> Everyone: If we go ahead there will be some upheaval of the master
> source branch for a bit.

I will go ahead and remove the conditionals that aren't in the
upstream gnome-user-docs branch. (I could remove those, too, bit it
makes merging from upstream more difficult and they don't tend to
cause any harm.)

>> Ideally, when you guys get time, you can use the meld app to rebase
>> ubuntu-docs against gnome-user-docs. Except for sticking with
>> gnome-control-center 3.6, Ubuntu 13.10 uses GNOME 3.8 so you probably
>> want to use the gnome-3-8 branch.
>
> I don't follow that part, nor would I ever have the time.
> Somebody else will have to think about, and perhaps comment on,
> that paragraph.

I've been working on doing just that—syncing our repository with the
upstream GNOME docs where appropriate.  (That's what most of my recent
commits have been about.)

—Kevin