[pypy-svn] rev 1430 - pypy/trunk/doc/funding

[hpk at codespeak.net]

Author: hpk
Date: Mon Sep 29 13:07:21 2003
New Revision: 1430

Modified:
   pypy/trunk/doc/funding/B5.0_management.txt
   pypy/trunk/doc/funding/B6.0_detailed_implementation.txt
   pypy/trunk/doc/funding/B6.1_plan_introduction.txt
   pypy/trunk/doc/funding/B6.4_workpackage_list.txt
   pypy/trunk/doc/funding/STREP-template.txt
Log:
- fixed a couple of ReST problems

- small enhancements to a couple of paragraphs
  (see the diff in detail)



Modified: pypy/trunk/doc/funding/B5.0_management.txt
==============================================================================
--- pypy/trunk/doc/funding/B5.0_management.txt	(original)
+++ pypy/trunk/doc/funding/B5.0_management.txt	Mon Sep 29 13:07:21 2003
@@ -6,3 +6,5 @@
 arising in the project.
 
 (Recommended length ­ three pages)
+
+

Modified: pypy/trunk/doc/funding/B6.0_detailed_implementation.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.0_detailed_implementation.txt	(original)
+++ pypy/trunk/doc/funding/B6.0_detailed_implementation.txt	Mon Sep 29 13:07:21 2003
@@ -42,4 +42,3 @@
 more detailed plan.
 
 (recommended length, excluding the forms specified above,- up to 15 pages)
-

Modified: pypy/trunk/doc/funding/B6.1_plan_introduction.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.1_plan_introduction.txt	(original)
+++ pypy/trunk/doc/funding/B6.1_plan_introduction.txt	Mon Sep 29 13:07:21 2003
@@ -24,9 +24,8 @@
   Generating down-sized code for embedded systems, load balancing
   in a distributed network, code generators optimized for number crunching
   on some processor architectures and re-writing numerical Python
-  packages should be able to prove that PyPy is more than an
-  academical exercise but very appropriate for industrial strength
-  applications.
+  packages should be able to prove that PyPy is very appropriate 
+  for industrial strength applications.
 
   - Supporting Embedded Devices
   
@@ -40,7 +39,7 @@
 
   - Project Documentation and Dissemination
 
-  - Maintenance of Tools
+  - Maintenance of the development environment
     
   - Synchronisation with Standard Python
   
@@ -71,9 +70,9 @@
   and how to hook in the bytecode compiler.
 
 
-WP22_: Translation of CPython into regular Python
+WP22_: Porting CPython C-sourcecode to regular Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  Translate all other parts of CPython which we don't want to
+  Port all parts of CPython which we don't want to
   implement in WP21_ into regular Python libraries.
   These ones should also work without PyPy, being just plain-Python
   replacements for existing CPython functionality.

Modified: pypy/trunk/doc/funding/B6.4_workpackage_list.txt
==============================================================================
--- pypy/trunk/doc/funding/B6.4_workpackage_list.txt	(original)
+++ pypy/trunk/doc/funding/B6.4_workpackage_list.txt	Mon Sep 29 13:07:21 2003
@@ -19,7 +19,7 @@
 ----- ----------------------------------------------------- ----- ---- ---- ---- ----
 WP21_ Development and Completion of the PyPy Interpreter          12
 ----- ----------------------------------------------------- ----- ---- ---- ---- ----
-WP22_ Translation of CPython into regular Python                  12
+WP22_ Porting CPython C-sourcecode to regular Python              12
 ----- ----------------------------------------------------- ----- ---- ---- ---- ----
 WP30_ The PyPy Compiler
 ----- ----------------------------------------------------- ----- ---- ---- ---- ----

Modified: pypy/trunk/doc/funding/STREP-template.txt
==============================================================================
--- pypy/trunk/doc/funding/STREP-template.txt	(original)
+++ pypy/trunk/doc/funding/STREP-template.txt	Mon Sep 29 13:07:21 2003
@@ -775,16 +775,16 @@
 have been simplified and a larger flexibility is granted to the
 participants:
       
-      ·  rules are identical for all participants;
-      ·  rules concentrate on the principles and provisions considered 
-         necessary for an efficient cooperation and the appropriate use and 
-         dissemination of the results; 
-      ·  participants may define among themselves the arrangements that 
-         fit them the best within the framework provided in the model 
-         contract.  
+-  rules are identical for all participants;
 
+-  rules concentrate on the principles and provisions considered 
+   necessary for an efficient cooperation and the appropriate use and 
+   dissemination of the results; 
+-  participants may define among themselves the arrangements that 
+   fit them the best within the framework provided in the model 
+   contract.  
 
-      See also comments under B.3.3.1 and B.3.3.2 and address here.  
+See also comments under B.3.3.1 and B.3.3.2 and address here.  
 
 B.6     Detailed Implementation Plan  
       
@@ -812,8 +812,9 @@
 progress and results.
 
 Essential elements of the plan are:  
-a)  Detailed Implementation plan introduction ­ explaining the structure 
-    of this plan and the overall methodology used to achieve the objectives.   
+
+a) Detailed Implementation plan introduction ­ explaining the structure 
+   of this plan and the overall methodology used to achieve the objectives.   
               
 b)  Work planning,  showing the timing  of  the different  WPs and  their 
     components (Gantt  chart  or similar). Ensure that the workplan is 
@@ -1067,7 +1068,8 @@
 
         Further information on ethics requirements and rules are given
         at the science and ethics website at
-      http://europa.eu.int/comm/research/science-society/ethics/ethics_en.html.
+
+        http://europa.eu.int/comm/research/science-society/ethics/ethics_en.html.