Merge change I736c525a into eclair-mr2

* changes:
  update dox to account for different behavior between AVOID and TARGET modes