Merge "configuration guide review"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 26 Aug 2016 13:41:17 +0000 (13:41 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 26 Aug 2016 13:41:17 +0000 (13:41 +0000)

Trivial merge