[deployment-guide/comm-rel: 23/23] Merge branch 'master' into comm2

dsilas dsilas at fedoraproject.org
Sun Jul 18 15:54:15 UTC 2010


commit bc5bc0f957d2d40d97ae1b736c3259323855ada7
Merge: 3f32fb3... a48823c...
Author: Douglas Silas <dhensley at redhat.com>
Date:   Sun Jul 18 17:46:24 2010 +0200

    Merge branch 'master' into comm2
    
    Conflicts:
    	en-US/RPM.xml
    	en-US/Yum.xml

 en-US/OpenSSH.xml                               |  361 ++++++++++++++---------
 en-US/RPM.xml                                   |    3 +-
 en-US/Users_and_Groups.xml                      |   18 +-
 en-US/Yum.xml                                   |   17 +-
 en-US/images/printconf-main.png                 |  Bin 15742 -> 19412 bytes
 en-US/images/ssh-passphrase-prompt.png          |  Bin 0 -> 13186 bytes
 en-US/images/ssh-startup-applications-add.png   |  Bin 0 -> 14508 bytes
 en-US/images/ssh-startup-applications-check.png |  Bin 0 -> 148890 bytes
 en-US/images/ssh-startup-applications.png       |  Bin 0 -> 146484 bytes
 9 files changed, 231 insertions(+), 168 deletions(-)
---


More information about the docs-commits mailing list