Re: [O] Upstream synchronization documentation

2017-07-04 Thread Rasmus
Hi, Thanks for the comments. > -- lisp/org doc/misc/org.texi etc/refcards/orgcard.tex etc/ORG-NEWS etc/org > \ > etc/schema/od-manifest-schema-v1.2-os.rnc etc/schema/od-schema-v1.2-os.rnc That's better. >> +- =org.texi= :: Copy to =emacs/doc/misc=. It may be necessary to replace, >> +

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Neil Jerram
rg Subject: Re: [O] Upstream synchronization documentation Kyle Meyer writes: >> Whereas in your text I think it is the other way round, isn't it? >> (I.e. the Emacs branch is more stable, and you are talking about >> porting a fix that someone has made in that branch

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Kyle Meyer
Rasmus writes: > The documentation in README_maintainer is a bit outdated > wrt. synchronizing with upstream Emacs. Thanks for taking the time to update this. > +** Backporting changes from upstream Emacs > +To check for backports from the Emacs upstream repository, one can use > +the following

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Rasmus Pank Roulund
Kyle Meyer writes: >> Whereas in your text I think it is the other way round, isn't it? >> (I.e. the Emacs branch is more stable, and you are talking about >> porting a fix that someone has made in that branch to the Org master.) >> So perhaps 'forward port' would be clearer? > > I suspect that O

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Kyle Meyer
Neil Jerram writes: > I just noticed that your text talks about 'backporting', and wondered if > that is the clearest term to use. To me, a 'backport' usually means > porting a change or fix from the master or development branch to some > older or more stable branch. Right. Thanks for bring

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Eric S Fraga
And "propagate" would arguably be better than "forward port"? -- : Eric S Fraga via Emacs 26.0.50, Org release_9.0.9-551-g92e8c8 signature.asc Description: PGP signature

Re: [O] Upstream synchronization documentation

2017-07-03 Thread Neil Jerram
Hi Rasmus, On 03/07/17 11:35, Rasmus wrote: Hi, The documentation in README_maintainer is a bit outdated wrt. synchronizing with upstream Emacs. I have updated the to best of my knowledge in the attached patch. I would be happy to push it, if there are no objections. It would also be great i