~ chicken-core (chicken-5) 3b99cb28f4c7f149b67530d4e556f3875f055c0b

commit 3b99cb28f4c7f149b67530d4e556f3875f055c0b
Merge: 3c7f2984 1e61f4aa
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Thu Feb 23 18:06:28 2017 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Thu Feb 23 18:06:28 2017 +0100

    Merge branch 'chicken-5-new-egg-install' of ssh://call-cc.org/usr/local/repos/chicken-core into chicken-5-new-egg-install
    
    Conflicts:
            manual/Extensions

diff --cc manual/Extensions
index 8e93e926,a9942e72..1b70fdfe
--- a/manual/Extensions
+++ b/manual/Extensions
@@@ -135,10 -136,10 +135,10 @@@ Names the maintainer of this code, if d
  
  ===== category
  
 -[extension property] (category NAME)
 +[egg property] (category NAME)
  
  Gives the category under which this egg should be contained.
- See [[/chicken-projects/egg-index-4.html|the egg index]]
+ See [[/chicken-projects/egg-index-5.html|the egg index]]
  for a list of currently used categories.
  
  ===== license
@@@ -178,9 -179,9 +178,9 @@@ Lists eggs that are build-time dependen
  i.e. there are required to build, but not to run the contained
  code. Currently this is treated identical to {{dependencies}}.
  
- ====== foreign-depdencies
+ ====== foreign-dependencies
  
 -[extension property] (foreign-dependencies NAME ...)
 +[egg property] (foreign-dependencies NAME ...)
  
  Lists external dependencies like native code libraries
  or system-specific packages and is currently only used for
@@@ -305,10 -306,10 +305,10 @@@ extension libraries
  
  ====== inline-file
  
 -[extension property] (inline-file NAME)
 +[egg property] (inline-file NAME)
  
  Specifies that an "inline" file should be generated and installed
- for this component. Ths property is only used for extension
+ for this component. This property is only used for extension
  libraries.
  
  ====== custom-build