Auto merge of #4916 - tari:doc-recovery, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 8 Jan 2018 16:37:05 +0000 (16:37 +0000)
committerbors <bors@rust-lang.org>
Mon, 8 Jan 2018 16:37:05 +0000 (16:37 +0000)
commit93bf2a3c9ab88984b72a612df6ff7c08a3e2f36e
treee9cf1fefb81492a7262dc9f86d0d2bf6107a193a
parentdaa20af7df6a024fc2fa10dc2cd06ac20cd48a2a
parentf235d7baefb8e11d7670b6c1d690042ed2eaeffa
Auto merge of #4916 - tari:doc-recovery, r=alexcrichton

Recover doc changes lost in #4904

Fixes #4906.
src/doc/src/reference/manifest.md