Fixing some fallout in the workspace documentation additions

This reuses most of @phildawson's work in !644 (closed) but additionally addresses the comment: !644 (comment 96820478)

Fixes #553 (closed)