Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-docs.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Norris <cnorris@gitlab.com>2020-12-28 17:34:25 +0300
committerCraig Norris <cnorris@gitlab.com>2020-12-28 17:34:25 +0300
commit884b94c6eb806b202d89837c25ca4046a5ee5153 (patch)
tree044245c215a1d94ded6b7eba14ac805e7f5216db /layouts
parent920cb1f0b967ddaad87aede8fcf5fe960fb401db (diff)
Update free trial wording
Update wording for free trial.
Diffstat (limited to 'layouts')
-rw-r--r--layouts/feedback.html21
1 files changed, 10 insertions, 11 deletions
diff --git a/layouts/feedback.html b/layouts/feedback.html
index 6a706982..f6fc76c6 100644
--- a/layouts/feedback.html
+++ b/layouts/feedback.html
@@ -12,12 +12,12 @@
<div class="col-md-8">
<div>
<h5 class="help-and-feedback-heading">Docs</h5>
- <a class="help-and-feedback-link" href="<%= edit_on_gitlab(@item) %>" target="_blank" rel="noopener noreferrer">Edit this page</a> to fix an error or add an improvement in a merge request<br>
- <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue[description]=Link%20the%20doc%20and%20describe%20what%20is%20wrong%20with%20it.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~Documentation%20~%22docs%5C-comments%22%20&issue[title]=Docs%20feedback:%20Write%20your%20title" target="_blank" rel="noopener noreferrer">Create an issue</a> to suggest an improvement to this doc<br>
+ <a class="help-and-feedback-link" href="<%= edit_on_gitlab(@item) %>" target="_blank" rel="noopener noreferrer">Edit this page</a> to fix an error or add an improvement in a merge request.<br>
+ <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue[description]=Link%20the%20doc%20and%20describe%20what%20is%20wrong%20with%20it.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~Documentation%20~%22docs%5C-comments%22%20&issue[title]=Docs%20feedback:%20Write%20your%20title" target="_blank" rel="noopener noreferrer">Create an issue</a> to suggest an improvement to this page.<br>
<%# Show comments only in production and on the default branch (hide archives) %>
<% if @item[:comments].nil? && production? && ENV['CI_COMMIT_REF_NAME'] == ENV['CI_DEFAULT_BRANCH'] %>
<% unless @item.identifier.to_s.split('/')[1] == 'ce' %>
- <a class="help-and-feedback-link" href="#" onclick="loadDisqus();return false;">Show and post comments</a> to review and give feedback on this doc
+ <a class="help-and-feedback-link" href="#" onclick="loadDisqus();return false;">Show and post comments</a> to review and give feedback about this page.
<% end %>
<% end %>
<br>
@@ -25,16 +25,15 @@
<div class="mt-3">
<h5 class="help-and-feedback-heading">Product</h5>
- <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue[description]=Describe%20what%20you%20would%20like%20to%20see%20improved.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20&issue[title]=Docs%20-%20product%20feedback:%20Write%20your%20title" target="_blank">Create an issue</a> if there's something you don't like about this feature<br>
- <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20proposal&issue[title]=Docs%20feedback%20-%20feature%20proposal:%20Write%20your%20title" target="_blank">Propose functionality</a> by submitting a feature request<br>
- <a class="help-and-feedback-link" href="https://about.gitlab.com/community/gitlab-first-look/" target="_blank">Join beta testing</a> to help shape new features
+ <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issue[description]=Describe%20what%20you%20would%20like%20to%20see%20improved.%0A%0A%3C!--%20Don%27t%20edit%20below%20this%20line%20--%3E%0A%0A%2Flabel%20~%22docs%5C-comments%22%20&issue[title]=Docs%20-%20product%20feedback:%20Write%20your%20title" target="_blank">Create an issue</a> if there's something you don't like about this feature.<br>
+ <a class="help-and-feedback-link" href="https://gitlab.com/gitlab-org/gitlab/-/issues/new?issuable_template=Feature%20proposal&issue[title]=Docs%20feedback%20-%20feature%20proposal:%20Write%20your%20title" target="_blank">Propose functionality</a> by submitting a feature request.<br>
+ <a class="help-and-feedback-link" href="https://about.gitlab.com/community/gitlab-first-look/" target="_blank">Join beta testing</a> to help shape new features.
</div>
<div class="mt-3">
<h5 class="help-and-feedback-heading">Feature availability and product trials</h5>
- <a class="help-and-feedback-link" href="https://about.gitlab.com/pricing/" target="_blank">View pricing</a> to see all GitLab tiers and features, or to upgrade<br>
- <a class="help-and-feedback-link" href="https://customers.gitlab.com/trials/new?gl_com=true" target="_blank">GitLab Gold Free-trial</a> to try all features in GitLab.com<br>
- <a class="help-and-feedback-link" href="https://about.gitlab.com/free-trial/" target="_blank">GitLab Ultimate Free-trial</a> to try all features in GitLab self-managed<br>
+ <a class="help-and-feedback-link" href="https://about.gitlab.com/pricing/" target="_blank">View pricing</a> to see all GitLab tiers and features, or to upgrade.<br>
+ <a class="help-and-feedback-link" href="https://about.gitlab.com/free-trial/" target="_blank">Try GitLab for free</a> with access to all features for 30 days.<br>
</div>
</div>
@@ -42,10 +41,10 @@
<div class="help-subsection">
<h5 class="help-and-feedback-heading">Get Help</h5>
<p>
- If you didn't find what you were looking for, <a class="help-and-feedback-link" href="/search/" target="_blank">search the docs.</a><br>
+ If you didn't find what you were looking for, <a class="help-and-feedback-link" href="/search/" target="_blank">search the docs</a>.<br>
</p>
<p class="mt-3">
- If you want help with something specific, and could use community support, <a class="help-and-feedback-link" href="https://forum.gitlab.com/" target="_blank">post on the GitLab forum.</a><br>
+ If you want help with something specific and could use community support, <a class="help-and-feedback-link" href="https://forum.gitlab.com/" target="_blank">post on the GitLab forum</a>.<br>
</p>
<p class="mt-3">
For problems setting up or using this feature (depending on your GitLab subscription).<br>