From 92b4b77a2af8fdeefcf1d7c44fcba16d62cd158f Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@dosire.com>
Date: Wed, 10 Apr 2013 09:19:08 +0200
Subject: [PATCH] Hat tip to Jan Mauritz Faber for his suggestions.
---
app/views/admin/groups/new.html.haml | 2 +-
app/views/deploy_keys/index.html.haml | 2 +-
app/views/groups/new.html.haml | 2 +-
app/views/notify/new_ssh_key_email.html.haml | 2 +-
app/views/notify/new_ssh_key_email.text.erb | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/app/views/admin/groups/new.html.haml b/app/views/admin/groups/new.html.haml
index 3fa63e1ba25..6f76ee648ae 100644
--- a/app/views/admin/groups/new.html.haml
+++ b/app/views/admin/groups/new.html.haml
@@ -23,5 +23,5 @@
%li Group is kind of directory for several projects
%li All created groups are private
%li People within a group see only projects they have access to
- %li All projects of group will be stored in group directory
+ %li All projects of group will be stored in a group directory
%li You will be able to move existing projects into group
diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml
index 80d30e1c2dc..66a8d3b7b7b 100644
--- a/app/views/deploy_keys/index.html.haml
+++ b/app/views/deploy_keys/index.html.haml
@@ -1,7 +1,7 @@
= render "projects/settings_nav"
%p.slead
- Deploy keys allow read-only access to repository. It matches perfectly for CI, staging or production servers.
+ Deploy keys allow read-only access to repository. They can be used for for CI, staging or production servers. A deploy key can be added to only one project. If you need to add the same key to multiple projects you can create a deploy user and add that user to multiple projects.
- if can? current_user, :admin_project, @project
= link_to new_project_deploy_key_path(@project), class: "btn btn-small", title: "New Deploy Key" do
diff --git a/app/views/groups/new.html.haml b/app/views/groups/new.html.haml
index 36ee4922731..b395a8bc6a3 100644
--- a/app/views/groups/new.html.haml
+++ b/app/views/groups/new.html.haml
@@ -24,5 +24,5 @@
%li Group is kind of directory for several projects
%li All created groups are private
%li People within a group see only projects they have access to
- %li All projects of group will be stored in group directory
+ %li All projects of group will be stored in a group directory
%li You will be able to move existing projects into group
diff --git a/app/views/notify/new_ssh_key_email.html.haml b/app/views/notify/new_ssh_key_email.html.haml
index 57f4297e6cb..eff197ce0f4 100644
--- a/app/views/notify/new_ssh_key_email.html.haml
+++ b/app/views/notify/new_ssh_key_email.html.haml
@@ -6,5 +6,5 @@
title:
%code= @key.title
%p
- If this key was added in error, you can remove here:
+ If this key was added in error, you can remove it here:
= link_to "SSH Keys", keys_url
diff --git a/app/views/notify/new_ssh_key_email.text.erb b/app/views/notify/new_ssh_key_email.text.erb
index 71974eab975..2b1f8a06858 100644
--- a/app/views/notify/new_ssh_key_email.text.erb
+++ b/app/views/notify/new_ssh_key_email.text.erb
@@ -4,4 +4,4 @@ A new public key was added to your account:
title.................. <%= @key.title %>
-If this key was added in error, you can remove here: <%= keys_url %>
+If this key was added in error, you can remove it here: <%= keys_url %>
--
GitLab