Merge branch 'master' into dependency-types

diff --combined doc/todo/dependency_types.mdwn
index ca0dbc920d2e93b8561e2b5c70290d7bab8e9a58,3bb1b5452822a5357144785ea2cedd754d12efd2..479cc95ccd404cb64c1d4b5dbb63917b16293872
--- 1/doc/todo/dependency_types.mdwn
--- 2/doc/todo/dependency_types.mdwn
+++ b/doc/todo/dependency_types.mdwn
@@@ -248,7 -248,6 +248,7 @@@ sigh
    that the page links to, which is just what link dependencies are
    triggered on.
  
 +[[done]]
  ----
  
  ### the removal problem
@@@ -379,6 -378,8 +379,8 @@@ Given that, the `backlink` will always 
  onto the influence list. If we combine the influences from each
  successful match, we get the right result.
  
+ > This is implemented, seems to work ok. --[[Joey]] 
+ 
  #### High-level Calculation and Storage
  
  Calculating the full influence list for a pagespec requires trying to match
@@@ -409,3 -410,14 +411,14 @@@ Where to store the influence list? Well
  regular list of simple dependencies. So, the data stored ends up looking
  just like what is stored today by the explicit dependency hacks. Except,
  it's calculated more smartly, and is added automatically.
+ 
+ > I've implemented influence calculation in `add_depends`. As expected,
+ > it means rather a lot more work, and makes some things much slower.
+ > Optimisation via `pagespec_match_depends` next.. --[[Joey]] 
+ 
+ #### Influence types
+ 
+ Note that influences can also have types, same as dependency types.
+ For example, "backlink(foo)" has an influence of foo, of type links.
+ "created_before(foo)" also is influenced by foo, but it's a presence
+ type. Etc.