Merge "Fix documentation" into integration

author Paul Beesley <paul.beesley@arm.com>

Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)

committer TrustedFirmware Code Review <review@review.trustedfirmware.org>

Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)
author Paul Beesley <paul.beesley@arm.com>
Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)
committer TrustedFirmware Code Review <review@review.trustedfirmware.org>
Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)
diff --cc docs/getting_started/user-guide.rst
Simple merge
diff --cc docs/index.rst
Simple merge
author	Paul Beesley <paul.beesley@arm.com>
	Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)
committer	TrustedFirmware Code Review <review@review.trustedfirmware.org>
	Fri, 18 Oct 2019 08:38:23 +0000 (08:38 +0000)
		1	2
docs/getting_started/user-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/index.rst	patch \|	diff1 \|	diff2 \|	blob \| history