[documentation-guide: 2/2] Merge branch 'master' of git+ssh://git.fedorahosted.org/git/docs/documentation-guide

[Eric Christensen]

commit 74ab8f3eb0c14d4f2f7fba3ed9655765f2914023
Merge: 7c3acef 8b97717
Author: Eric Christensen <echriste at redhat.com>
Date:   Sat Mar 22 00:39:45 2014 -0400

    Merge branch 'master' of git+ssh://git.fedorahosted.org/git/docs/documentation-guide

 en-US/Documentation_Guide.ent |    4 +-
 en-US/publican.xml            |  237 ++++++++++++-----------------------------
 2 files changed, 70 insertions(+), 171 deletions(-)
---