If it applies to both master and 2.4 you put it in 2.4 and when Chris or Jeff does a merge it makes it to master. And yes you pushed it to master. Also you have to use Ubuntu 8.04's version of LyX, I think your version was close to that. Go to the EMC2 web sit Documents tab and about in the middle of the page you will see the link for master. The PDF cover page for all documents have the version on them. The wiki link is for the current version.
Now, to get your addition into the 2.4 docs you do a cherry pick. Unfortunately I've never done one so someone else will have to chime in on that procedure or do it for you. The easiest way to get documents changed is to bug me... I think I've made all the mistakes one could make updating the documents. John Jon Elson wrote: > John Thornton wrote: > >> I see your changes, are you looking at 2.5? >> >> >> > I have no idea! I usually go to the Wiki, and just below the first page > is a link > to all the manuals in pdf, and in French pdf also. The link there is : > http://www.linuxcnc.org/docs/EMC2_Integrator_Manual.pdf > > which doesn't indicate any particular version. But, the last one I > pulled up > was compiled on 1/11/2011. > > Now, if you mean where I committed the update, I again don't really know. > I thought I was committing it to the development head. If I need to commit > this to a different branch, or merge to a particular branch, you will > have to tell > me how to do that, I am really just able to do the most basic stuff on git. > > Thanks, > > Jon > > ------------------------------------------------------------------------------ > Protect Your Site and Customers from Malware Attacks > Learn about various malware tactics and how to avoid them. Understand > malware threats, the impact they can have on your business, and how you > can protect your company and customers by using code signing. > http://p.sf.net/sfu/oracle-sfdevnl > _______________________________________________ > Emc-developers mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/emc-developers > ------------------------------------------------------------------------------ Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
