Merge branch 'master' of git://factorcode.org/git/factor

diff --cc core/bootstrap/compiler/compiler.factor
index 035d95d3abe41db0167c44e7c09f84b165726637,ab09279a7b566f4a16340d5128d019998514068d..6b467caa5a2a97f06dbf73576a54ace6254143dc
--- 1/core/bootstrap/compiler/compiler.factor
--- 2/core/bootstrap/compiler/compiler.factor
+++ b/core/bootstrap/compiler/compiler.factor
@@@ -14,8 -14,14 +14,8 @@@ IN: bootstrap.compile
      "alien.remote-control" require
  ] unless
  
- "cpu." cpu append require
+ "cpu." cpu word-name append require
  
 -: enable-compiler ( -- )
 -    [ optimized-recompile-hook ] recompile-hook set-global ;
 -
 -: disable-compiler ( -- )
 -    [ default-recompile-hook ] recompile-hook set-global ;
 -
  enable-compiler
  
  nl

diff --cc core/bootstrap/syntax.factor
Simple merge

diff --cc core/classes/classes-docs.factor
Simple merge

diff --cc core/syntax/syntax.factor
Simple merge

diff --cc extra/io/sockets/impl/impl.factor
Simple merge

diff --cc extra/io/unix/linux/linux.factor
index 0c79ce970d68de1b54f66be3606bad467c6c7d99,a452878a4322272c24a6c3ad6cc98bac412d736a..78af0dd50db493552d69789fea7198ec2653fb16
--- 1/extra/io/unix/linux/linux.factor
--- 2/extra/io/unix/linux/linux.factor
+++ b/extra/io/unix/linux/linux.factor
@@@ -121,11 -112,11 +117,11 @@@ TUPLE: inotify-task 
  M: inotify-task do-io-task ( task -- )
      io-task-port read-notifications f ;
  
- M: linux-io init-io ( -- )
+ M: linux init-io ( -- )
      <select-mx>
      [ mx set-global ]
 -    [ [ init-inotify ] curry ignore-errors ] bi ;
 +    [ init-inotify ] bi ;
  
- T{ linux-io } set-io-backend
+ linux set-io-backend
  
  [ start-wait-thread ] "io.unix.linux" add-init-hook