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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-11-29 15:12:59 +0300
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-11-29 15:12:59 +0300
commit2e3b5e1476af42464dc9425a8317f772f0367e5e (patch)
tree362305e61a23b31c6a73754f3d8279a0990058dd /doc
parentd8eee8ed73de13a5af42a5cf6de8ec1194e45483 (diff)
parent8b3ab222c3370303e39aad9574c59b960fbfc299 (diff)
Merge branch 'docs/fix-bitbucket-integration-typos' into 'master'
Fix typos in Bitbucket integration docs [ci skip] See merge request !7823
Diffstat (limited to 'doc')
-rw-r--r--doc/integration/bitbucket.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/integration/bitbucket.md b/doc/integration/bitbucket.md
index 556d71b8b76..9122dc62e39 100644
--- a/doc/integration/bitbucket.md
+++ b/doc/integration/bitbucket.md
@@ -123,7 +123,7 @@ To be able to access repositories on Bitbucket, GitLab will automatically
register your public key with Bitbucket as a deploy key for the repositories to
be imported. Your public key needs to be at `~/.ssh/bitbucket_rsa` which
translates to `/var/opt/gitlab/.ssh/bitbucket_rsa` for Omnibus packages and to
-`/home/git/.ssh/bitbucket_rsa.pub` for installations from source.
+`/home/git/.ssh/bitbucket_rsa` for installations from source.
---
@@ -199,7 +199,7 @@ Your GitLab server is now able to connect to Bitbucket over SSH. You should be
able to see the "Import projects from Bitbucket" option on the New Project page
enabled.
-## Acknowledgemts
+## Acknowledgements
Special thanks to the writer behind the following article: