Merge branch 'master' of github.com:nwf/dyna

Conflicts:
	docs/sphinx/spec/index.rst

diff --cc docs/sphinx/spec/index.rst
index 83d4d987607ba1dfdf7d2b0f29d3b9bad58c4989,f106425e73c34690d63de8ad69e9f19151ef2370..3454520141be6442f295754f57b31f3e2244d418
--- 1/docs/sphinx/spec/index.rst
--- 2/docs/sphinx/spec/index.rst
+++ b/docs/sphinx/spec/index.rst
@@@ -497,28 -391,10 +497,13 @@@ Non-ground term
  Types
  =====
  
- Type declarations
- -----------------
- 
- .. todo:: old design at http://www.dyna.org/wiki/index.php?title=Term#Union_types
- 
- Typed variables
- ---------------
- 
- Co-inductive types
- ------------------
- 
- .. todo:: how do we deal with types for varargs and keyword args?
- 
- Possible future extensions
- --------------------------
- Guarded types?  Nonlinear types?  Parametric types?
+ .. todo::
  
 -   Discussion moved to :doc:`/spec/type-system`
 +Dynamic (non-const) types, and relation to intern table implementations.
  
- 
 +Type coercion
 +=============
++   Discussion moved to :doc:`/spec/type-system`
  
  Unification
  ===========