[Gzz-commits] journals/plans SA_2003.rst

[Hermanni Hyytiälä]

CVSROOT:        /cvsroot/fenfire
Module name:    journals
Changes by:     Hermanni Hyytiälä <address@hidden>      03/05/14 03:08:38

Modified files:
        plans          : SA_2003.rst 

Log message:
        Researcher training, ethics

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/fenfire/journals/plans/SA_2003.rst.diff?tr1=1.107&tr2=1.108&r1=text&r2=text

Patches:
Index: journals/plans/SA_2003.rst
diff -u journals/plans/SA_2003.rst:1.107 journals/plans/SA_2003.rst:1.108
--- journals/plans/SA_2003.rst:1.107    Tue May 13 23:39:33 2003
+++ journals/plans/SA_2003.rst  Wed May 14 03:08:38 2003
@@ -494,34 +494,32 @@
 
 JVK, HH
 
-- schedule and intermediate objectives for the research
+.. - schedule and intermediate objectives for the research
    
   - Peer-to-Peer networking
   - Perform more usability tests
   - Fenfire prototype
 
-- objectives in researcher training
+.. - objectives in researcher training
 
 The primarary objective in researcher training is to get doctor's degree for 
 all three postgraduate students. The secondary objective is to provide 
 foundations for performing high quality research work and skills for efficient 
-team work inside/across the research group/groups.
+team work inside/across the research group/groups. Additional skills which
+are developed in researcher training include good presentation and 
communication 
+skills.
 
   
-- ethical questions or data protection problems of the research
-   
-  All source code is available from the nongnu.org's CVS
+.. - ethical questions or data protection problems of the research   
   
-  Free software.
-
-    - mostly LGPL, most valuable innovations GPL.
-    - if we ever acquire patents, we shall make a worldwide
-      irrevocable license grant for use in GPL software
+  
+The Fenfire project is a free software effort. Mostly the source
+code is licensed under LGPL, but most valuable innovations are
+licenced under GPL license. If we ever acquire patents, we shall 
+make a worldwide irrevocable license grant for use in GPL software.
+All source code is available from the Savannah's CVS server
+(http://www.nongnu.org).
 
-       - we are funded by companies who will either own 
-         or license these patents; we have an understanding
-         that they will grant the GPL rights: this does not
-         undermine their business interests.
          
 .. raw:: latex