From ed8cd377c0be11570533be7c42e59b35bde66d2f Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Mon, 27 Oct 2008 15:14:44 -0700 Subject: [PATCH] cgi/{reg,edit}user.cgi: Massive rewording of user instructions --- cgi/edituser.cgi | 17 +++++++++++------ cgi/reguser.cgi | 16 ++++++++-------- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/cgi/edituser.cgi b/cgi/edituser.cgi index 54fed00..59230ce 100755 --- a/cgi/edituser.cgi +++ b/cgi/edituser.cgi @@ -64,7 +64,7 @@ if ($cgi->param('name')) { print MAIL <You should shortly receive an e-mail containing an authorization code. Please enter this code below to update your SSH keys. -The code will expire in 24 hours or after you have used it.

"; + print "

You should shortly receive an e-mail containing an authorization code. + Please enter this code below to update your SSH keys. + The code will expire in 24 hours or after you have used it.

"; _auth_form($name, "'Login'"); exit; } else { @@ -120,13 +121,17 @@ Paste each key including the ssh-whatever prefix and email-lik } print <Here you can update the public SSH keys associated with your user account. These keys are required for you to push to projects.

+

Here you can update the public SSH keys associated with your user account. +These keys are required for you to push to projects.

SSH is used for pushing (the ssh protocol), your SSH key authenticates you - -there is no password (though we recommend that your SSH key is password-protected; use ssh-agent to help your fingers). +there is no password (though we recommend that your SSH key is password-protected; +use ssh-agent to help your fingers). You can find your public key in ~/.ssh/id_rsa.pub or ~/.ssh/id_dsa.pub. If you do not have any yet, generate it using the ssh-keygen command.

-

Please enter your username below so we can send you an authorization code to the e-mail address you gave us when you registered the account.

+

Please enter your username below; +we will send you an email with an authorization code +and further instructions.

Login:

diff --git a/cgi/reguser.cgi b/cgi/reguser.cgi index 8c01c1f..fb27870 100755 --- a/cgi/reguser.cgi +++ b/cgi/reguser.cgi @@ -37,10 +37,7 @@ if ($cgi->param('name')) { $user->conjure; print <User $name successfuly registered.

-

Project administrators can now assign you to have a push access to their projects -(use project name as username, admin password as password). -(One user can have push access to multiple projects and multiple users can have push access to one project.) -

+

Project administrators can now give you push access to their projects.

Congratulations, and have a lot of fun!

EOT exit; @@ -49,15 +46,18 @@ EOT print <Here you can register a user. -You need to register a user so that it can be granted project(s) push access.

+You need to register a user so that you can push to the hosted projects.

SSH is used for pushing (the ssh protocol), your SSH key authenticates you - -there is no password (though we recommend that your SSH key is password-protected; use ssh-agent to help your fingers). +there is no password (though we recommend that your SSH key is password-protected; +use ssh-agent to help your fingers). You can find your public key in ~/.ssh/id_rsa.pub or ~/.ssh/id_dsa.pub. If you do not have any yet, generate it using the ssh-keygen command. -You can paste multiple keys in the box below, each on a separate line. Paste each key including the ssh-whatever prefix and email-like postfix.

+You can paste multiple keys in the box below, each on a separate line. +Paste each key including the ssh-whatever prefix and email-like postfix.

We won't bother to verify your email contact, but fill in something sensible in your own interest -so that we can contact you or confirm your identity shall the need arise. We also need to send you an e-mail if you want to update your SSH keys later.

+so that we can contact you or confirm your identity shall the need arise. +We also need to send you an e-mail if you want to update your SSH keys later.

$Girocco::Config::legalese

Login:

-- 2.11.4.GIT