Merge pull request #1099 from peterwwillis/master

Update ssh-keygen with secure password encryption

Author: ben

book/04-git-server/sections/generating-ssh-key.asc

@@ -23,7 +23,7 @@ If you don't have these files (or you don't even have a `.ssh` directory), you c
 
 [source,console]
 ----
-$ ssh-keygen
+$ ssh-keygen -o
 Generating public/private rsa key pair.
 Enter file in which to save the key (/home/schacon/.ssh/id_rsa):
 Created directory '/home/schacon/.ssh'.
@@ -36,6 +36,8 @@ d0:82:24:8e:d7:f1:bb:9b:33:53:96:93:49:da:9b:e3 [email protected]
 ----
 
 First it confirms where you want to save the key (`.ssh/id_rsa`), and then it asks twice for a passphrase, which you can leave empty if you don't want to type a password when you use the key.
+However, if you do use a password, make sure to add the `-o` option.
+You can also use the `ssh-agent` tool to prevent having to enter the password each time.
 
 Now, each user that does this has to send their public key to you or whoever is administrating the Git server (assuming you're using an SSH server setup that requires public keys).
 All they have to do is copy the contents of the `.pub` file and email it.