Merge pull request #2253 from jpetazzo/infrastructure-docs

Try a different presentation of infrastructure documentation.