update heat flags and tables

Change-Id: Ib32ecfab49a6de3dabda207ba2919a0c6ff63bba
update ceilometer flags and tables

Change-Id: Ia25386391ffc1f626c958fce110f8c8042ffab7d
Deleting duplicate paras from training guides

Identity Service (Keystone) section has a sentence repeating twice.
Image Service (Glance) section has a sentence repeating twice.

Closes-Bug: #1293858, #1293859
Change-Id: Id4ef3c692478d6a86aeb2f0abbb1d666f775d712
Edits for TB/GB/MB/KB usage

Improve some wording and introduce non-breaking spaces.

Change-Id: I315968c155f6707b4ae57b00cf96a26b453e1d23
Co-Authored-By: Diane Fleming <diane.fleming@rackspace.com>
Merge "Deleting duplicate paras from training guides"
Merge "update ceilometer flags and tables"
Fix tox.ini for both tox 1.6 and 1.7

The current way fails to work with tox 1.6 when building the translated
manuals.
Fix so that it now really works with both tox 1.6 and 1.7.

Note that this is a workaround for a bug in tox 1.7.

Change-Id: Ib1cf8ccfc162fe313b9f2be35b78f5004634f97b
Merge "Edits for TB/GB/MB/KB usage"
Merge "update heat flags and tables"