[user-guide/f17: 3/4] Merge branch 'f17' of ssh://git.fedorahosted.org/git/docs/user-guide into f17