Re: Documentation Question

2017-01-19 Thread Richard Heck
On 01/19/2017 12:28 PM, Scott Kostyshak wrote:
> On Thu, Jan 19, 2017 at 11:41:34AM -0500, Richard Heck wrote:
>> I've added some info to the User Guide in master about defining
>> formatted references. If I want to backport this to stable, what is the
>> procedure? I presumably should not use change tracking there, right?
>> What about translations?
> I believe Uwe prefers for you to make changes first to branch (unless
> the feature you're documenting is specific to master). In
> Development.lyx Uwe has contributed some documentation policies. One of
> them is:
>
> 5. All fixes (typos, compilation fixes, updates info etc.) go at first
> into the current GIT branch because the user should benefit from all
> fixes with every minor release. Feel free to commit directly to branch
> as long as you follow rule [enu:If-you-are]. You can immediately commit
> to master as well.

OK, I've done that.

rh



Re: Documentation Question

2017-01-19 Thread Scott Kostyshak
On Thu, Jan 19, 2017 at 11:41:34AM -0500, Richard Heck wrote:
> I've added some info to the User Guide in master about defining
> formatted references. If I want to backport this to stable, what is the
> procedure? I presumably should not use change tracking there, right?
> What about translations?

I believe Uwe prefers for you to make changes first to branch (unless
the feature you're documenting is specific to master). In
Development.lyx Uwe has contributed some documentation policies. One of
them is:

5. All fixes (typos, compilation fixes, updates info etc.) go at first
into the current GIT branch because the user should benefit from all
fixes with every minor release. Feel free to commit directly to branch
as long as you follow ruleĀ [enu:If-you-are]. You can immediately commit
to master as well.

Uwe, the only thing that is unclear to me is the part "You can
immediately commit to master". Is the following correct and if so can I
add it?

 You can immediately commit to master as well. If you do not commit to
 master, the maintainer will eventually port your changes to master.

Or should we just say that "You *should* immediately commit to master as
well", just to keep things in sync?

Scott


signature.asc
Description: PGP signature


Documentation Question

2017-01-19 Thread Richard Heck
I've added some info to the User Guide in master about defining
formatted references. If I want to backport this to stable, what is the
procedure? I presumably should not use change tracking there, right?
What about translations?

Richard