Clarify process for merging master into stable about civicrm-user-guide HOT 3 CLOSED

I think it's important the we address this issue. There are currently 45 commits spanning the past 10 months which have not made it into the version of the User Guide which is most prominently featured on civicrm.org/documentation. Can other people who have been more involved in the User Guide like @joannechester @stevekessler @nganivet and @michaelmcandrew chime in with recommendations for how to proceed?

@michaelmcandrew said:

we should probably call master stable

I'm wondering what exactly we should do next and who should do it. I'm happy to help, but cautious to run with this one since I have not been involved with the User Guide directly. Help??

Here's how the versions are currently defined.

langs:
  en:
    repo: 'https://github.com/civicrm/civicrm-user-guide'
    latest: master
    stable: 4.7
    history:
      - 4.6

@michaelmcandrew are you suggesting we change it to the following?

langs:
  en:
    repo: 'https://github.com/civicrm/civicrm-user-guide'
    latest: master
    stable: master
    history:
      - 4.7
      - 4.6

If so, then I wonder what the usefulness is of having a 4.7 branch at all. But if we delete it, then we'll break links to https://docs.civicrm.org/user/en/4.7/ which is currently live. If we keep the 4.7 branch then we still need a process for merging commits from master into 4.7.

from civicrm-user-guide.

This was a problem again for someone today.

from civicrm-user-guide.

@seanmadsen - yes - I think that would be a good first step. I'm not aware of many / any links to https://docs.civicrm.org/user/en/4.7/ but we could just leave that hanging around for now since I don't think it is doing anyone any harm.

from civicrm-user-guide.