diff options
author | Hannes Rosenögger <123haynes@gmail.com> | 2016-01-05 12:28:11 +0000 |
---|---|---|
committer | Hannes Rosenögger <123haynes@gmail.com> | 2016-01-05 12:28:11 +0000 |
commit | 2459d516337dbc37d9e653b4991e00cb9097aeb4 (patch) | |
tree | 7f16642c1d13d419a4f6008b7c1c38231a13d8c7 | |
parent | a31d2f2a712ded89c24f16766f8255faff6ab8ee (diff) | |
parent | 766a59630f8e004fbd99549dc6d27f7b29fff62f (diff) | |
download | gitlab-ce-2459d516337dbc37d9e653b4991e00cb9097aeb4.tar.gz |
Merge branch 'ssh-doc-fixes' into 'master'
Help "SSH" fixes
A user was confused why ssh login did not work because he had used a nonstandard name during the key generation step. Maybe this will make it clearer.
See merge request !2296
-rw-r--r-- | doc/ssh/README.md | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doc/ssh/README.md b/doc/ssh/README.md index fe5b45dd432..77eb53427e2 100644 --- a/doc/ssh/README.md +++ b/doc/ssh/README.md @@ -9,7 +9,7 @@ already has one by running the following command: cat ~/.ssh/id_rsa.pub ``` -If you see a long string starting with `ssh-rsa` or `ssh-dsa`, you can skip the `ssh-keygen` step. +If you see a long string starting with `ssh-rsa`, you can skip the `ssh-keygen` step. Note: It is a best practice to use a password for an SSH key, but it is not required and you can skip creating a password by pressing enter. Note that @@ -20,8 +20,9 @@ To generate a new SSH key, use the following command: ssh-keygen -t rsa -C "$your_email" ``` This command will prompt you for a location and filename to store the key -pair and for a password. When prompted for the location and filename, you -can press enter to use the default. +pair and for a password. When prompted for the location and filename, just +press enter to use the default. If you use a different name, the key will not +be used automatically. Use the command below to show your public key: ```bash @@ -29,10 +30,10 @@ cat ~/.ssh/id_rsa.pub ``` Copy-paste the key to the 'My SSH Keys' section under the 'SSH' tab in your -user profile. Please copy the complete key starting with `ssh-` and ending +user profile. Please copy the complete key starting with `ssh-rsa` and ending with your username and host. -To copy your public key to the clipboard, use code below. Depending on your +To copy your public key to the clipboard, use the code below. Depending on your OS you'll need to use a different command: **Windows:** |