On Mon, Nov 07, 2011 at 06:51:52PM -0600, John Thornton wrote: > Francis, > > If you intended your work to be in the next release you need to push to > the 2.5 branch. I see you have been pushing to master... git is push up > not trickle down. Just a little heads up my friend. > > John
I believe I cleaned this up. There were some unresolved doc merge conflicts after the merge of remap, and after fixing those I cherry-picked the French doc updates onto v2.5_branch, and then merged 2.5 into master again. As John says above, please be sure to put doc fixes in v2.5_branch if they are appropriate for 2.5. The only changes that should be made to docs directly in master right now are those changes that document master-only features. Thanks Francis, Kim, Michael, John, for your hard work on docs! Chris ------------------------------------------------------------------------------ RSA(R) Conference 2012 Save $700 by Nov 18 Register now http://p.sf.net/sfu/rsa-sfdev2dev1 _______________________________________________ Emc-developers mailing list Emc-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/emc-developers
