Merge pull request #1598 from soby-mathew/sm/docs_update_deprecate_1

author Soby Mathew <soby.mathew@arm.com>

Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)

committer GitHub <noreply@github.com>

Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)
author Soby Mathew <soby.mathew@arm.com>
Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)
committer GitHub <noreply@github.com>
Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)
diff --cc docs/firmware-design.rst
Simple merge
diff --cc docs/porting-guide.rst
Simple merge
diff --cc docs/user-guide.rst
Simple merge
author	Soby Mathew <soby.mathew@arm.com>
	Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)
committer	GitHub <noreply@github.com>
	Tue, 2 Oct 2018 10:09:30 +0000 (11:09 +0100)
		1	2
docs/firmware-design.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/porting-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history
docs/user-guide.rst	patch \|	diff1 \|	diff2 \|	blob \| history