Editorial improvements requested in r7 review https://review.opendev.org/c/starlingx/docs/+/861840
Fix conflict
Add abbrev to fix build error
Change-Id: Ie5a2d8223e302703402a934a10051bd7dea6a914
Signed-off-by: Elisamara Aoki Goncalves <elisamaraaoki.goncalves@windriver.com>
(cherry picked from commit 3f715b1148)