I replaced the old doc folder with the new doc folder from your branch. I did not see any other difference. Is that correct?
Massimo On May 7, 12:17 am, mdipierro <[email protected]> wrote: > Thank you Tim. I will do it tomorrow morning. > > On May 6, 5:57 pm, Tim Michelsen <[email protected]> wrote: > > > Hello, > > I have issued a merge proposal. Please merge now to get as less > > conflicts as possible. > > > I think thos subscribed have just received the message from LP. > > > I would like to add some small things: > > * Contrary to what I wrote earlier today, I just did some more wrok on > > this today. I did not want to leave the started work unfinshed. And > > web2py moves incredibly fast... > > * BUT, due to time constraints, I want to give this small contribution > > in the hands of the web2py developers. I cannot work on this on > > day-to-day basis like done in the last days. > > * I included / incorporated the ideas exchanged with Yarko today on this > > list. > > * I hope this is a valuable contribution to the project. > > > All the best and keep up the nice work with web2py. > > > Kind regards, > > Timmie > > > ### Message of the merge proposal: > > > From the commit message: > > > This is a 2nd setup and push of the Sphinx doc branch based on devel > > revision 750: > > * FAQ now optional > > * User Wiki now optional > > * still 36 warnings caused by the docstrings > > * the intro docs have been corrected and are free of errors and warnings > > Please provide feedback on the web2py mailing list > > The branch will be proposed for a merge with the devel branch. > > > Reasons for this merge proposal: > > * current web2py/doc contains many errors > > * this branch provides a neat basis for further development of the > > Sphinx doc > > * this branch enables developers to test and improve docstrings > > * now after the commit of 750 a merge will be painless --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "web2py Web Framework" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/web2py?hl=en -~----------~----~----~----~------~----~------~--~---
