Merge branch 'wip2'

Conflicts:
	tests/nitdoc.args

diff --cc lib/standard/exec.nit
index 8a255b9,a9f59da..2cde874
--- 1/lib/standard/exec.nit
--- 2/lib/standard/exec.nit
+++ b/lib/standard/exec.nit
@@@ -19,12 -19,11 +19,11 @@@ import strea
  
  # Simple sub-processus
  class Process
- 
        # The pid of the processus
 -      fun id: Int do return _data.id
 +      fun id: Int do return data.id
  
        # Is the processus finished?
 -      fun is_finished: Bool do return _data.is_finished
 +      fun is_finished: Bool do return data.is_finished
  
        # wait the terminaison of the process
        fun wait

diff --cc lib/standard/file.nit
Simple merge

diff --cc lib/standard/stream.nit
index 9846ced,88a73ac..dce2a89
--- 1/lib/standard/stream.nit
--- 2/lib/standard/stream.nit
+++ b/lib/standard/stream.nit
@@@ -210,12 -210,12 +210,12 @@@ en
  
  ##############################################################"
  
- class FDStream
+ abstract class FDStream
        super IOS
        # File description
 -      var _fd: Int
 +      var fd: Int
  
 -      redef fun close do native_close(_fd)
 +      redef fun close do native_close(fd)
  
        private fun native_close(i: Int): Int is extern "stream_FDStream_FDStream_native_close_1"
        private fun native_read_char(i: Int): Int is extern "stream_FDStream_FDStream_native_read_char_1"

diff --cc lib/standard/string.nit
Simple merge

diff --cc tests/nitdoc.args
index 5be4437,dbbddd3..ecb729f
--- 1/tests/nitdoc.args
--- 2/tests/nitdoc.args
+++ b/tests/nitdoc.args
@@@ -1,1 -1,1 +1,1 @@@
- module_1 -d nitdoc_args1.write
 -../lib/*.nit -d out/nitdoc_args1.write
++module_1 -d out/nitdoc_args1.write