Merge "octopus: change the document format to satisfy the sphinx"
authorMatthewLi <matthew.lijun@huawei.com>
Thu, 21 Jan 2016 07:42:05 +0000 (07:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 21 Jan 2016 07:42:05 +0000 (07:42 +0000)

Trivial merge