[software-management-guide/f20: 2/2] Merge branch 'f20' of ssh://git.fedorahosted.org/git/docs/software-management-guide into f20