Merge branch 'key-generation' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 1ab91d88 16617775
Showing 1 changed file with 1 additions and 6 deletions Show diff stats
app/views/help/ssh.html.haml
@@ -5,18 +5,13 @@
     SSH key allows you to establish a secure connection between your computer and GitLab
  
   %p.slead
-    To generate a new SSH key just open your terminal and use code below.
+    To generate a new SSH key just open your terminal and use code below. Press enter to accept the defaults when generating the key.
  
   %pre.dark
     ssh-keygen -t rsa -C "#{current_user.email}"
  
-    \# Creates a new ssh key using the provided email
-    \# Generating public/private rsa key pair...
-
   %p.slead
     Next just use code below to dump your public key and add to GitLab SSH Keys
  
   %pre.dark
     cat ~/.ssh/id_rsa.pub
-
-    \# ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6eNtGpNGwstc....
...	...	@@ -5,18 +5,13 @@
5	5	SSH key allows you to establish a secure connection between your computer and GitLab
6	6
7	7	%p.slead
8		- To generate a new SSH key just open your terminal and use code below.
	8	+ To generate a new SSH key just open your terminal and use code below. Press enter to accept the defaults when generating the key.
9	9
10	10	%pre.dark
11	11	ssh-keygen -t rsa -C "#{current_user.email}"
12	12
13		- \# Creates a new ssh key using the provided email
14		- \# Generating public/private rsa key pair...
15		-
16	13	%p.slead
17	14	Next just use code below to dump your public key and add to GitLab SSH Keys
18	15
19	16	%pre.dark
20	17	cat ~/.ssh/id_rsa.pub
21		-
22		- \# ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6eNtGpNGwstc....
...	...