am fe3ad191: am 24780ea6: Merge change I75bb4c98 into eclair

Merge commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95'

* commit 'fe3ad1913f20a591b4b0fdf8d6848839d3f8ee95':
  doc change: Move commit 4075b4ced from guide/appendix/faq to resources/faq.