Merge change I75bb4c98 into eclair

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