[Marmotta Wiki] Update of "GSoC/Methodology" by SergioFernandez

[Apache Wiki <wi...@apache.org>]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Marmotta Wiki" for change notification.

The "GSoC/Methodology" page has been changed by SergioFernandez:
https://wiki.apache.org/marmotta/GSoC/Methodology?action=diff&rev1=6&rev2=7

Comment:
methodology updated

   * Create a branch from 'develop' for your project; according [[http://marmotta.apache.org/development#Source_code|our development guidelines]], we recommend to use the issue identifier (MARMOTTA-XXX) as name for the topic branch.
   * Your mentor will closely follow your development there, using the comments on the code committed to provide you early feedback.
   * Create issues there for internal issues of the project.
-  * But please use the dev mailing list for any further discussion. Periodic reports (weekly?) there are highly recommend.
+  * But please use the dev mailing list for any further discussion; periodic reports (weekly?) there are highly recommend.
   * Try to periodically [[https://help.github.com/articles/syncing-a-fork/|update your fork from upstream]].
-  * For intellectual property reasons, to pass the final review the student '''must''' attach to the Jira issue a patch with all his/her work. Github allows you to easily compare upstream develop branch with yours and create a patch ([[https://github.com/apache/marmotta/compare/develop...confidencesun:MARMOTTA-444.patch|for instance]]). 
+  * For intellectual property reasons, to pass the final review the student '''must''' submit the code to ASF, either attaching a patch to the Jira issue or doing a Pull Request to our github mirror. The then mentor would be able to [[Patches|merge and sign your contribution]].
  
  This methodology is inspired by [[http://markmail.org/message/ewgsux67p7rgiyaz|our experience]] on previous editions, and it's just a recommendation. In the end each mentor is free to decide how to do it.