Switch to "serve" verb, and a minor clean up.

This is the documentation fix for change 133192.
Additionally, I have replaced a few errant tabs with spaces, per
Yolanda's request.

Change-Id: I1f8188eddd5012457cd0720fe3cea03e2f230fc5
Merge "Switch to "serve" verb, and a minor clean up."