Devguide wordsmith for trunk - take 2

I fixed my merge of portlet-info content and fixed some formatting issues.

All set to merge into master. Thanks.

@rbohl