summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-24 20:16:50 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-24 20:16:50 +0000
commit83ba37e54489268a8c52e158734c13b5976c7dc3 (patch)
tree395c225bd999c5435178158be5894a0452c05cc8
parent8fecb47c073a4190de564df93c9f205295dc0497 (diff)
parent81ab172a25a29bdc2907fdd0d681e6cddb7c31a1 (diff)
downloadgitlab-ce-83ba37e54489268a8c52e158734c13b5976c7dc3.tar.gz
Merge branch 'fix_git_tag_in_architecture' into 'master'
Fixed ~git beeing displayed as link to issues tagged with git in architecture.md The architecture documentation explains `~git` from the picture below which is replaced by a [link to issues tagged with `git`](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=git). I believe that this was unintended and should be fixed by using backticks. ![Screenshot_from_2016-02-13_21-36-30](/uploads/5ea1a60e8b230952874e58eab0abe1ac/Screenshot_from_2016-02-13_21-36-30.png) See merge request !2814
-rw-r--r--doc/development/architecture.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/development/architecture.md b/doc/development/architecture.md
index 6101a71a8de..12e33406cb6 100644
--- a/doc/development/architecture.md
+++ b/doc/development/architecture.md
@@ -42,7 +42,7 @@ Gitlab-shell communicates with Sidekiq via the “communication board” (Redis)
## System Layout
-When referring to ~git in the pictures it means the home directory of the git user which is typically /home/git.
+When referring to `~git` in the pictures it means the home directory of the git user which is typically /home/git.
GitLab is primarily installed within the `/home/git` user home directory as `git` user. Within the home directory is where the gitlabhq server software resides as well as the repositories (though the repository location is configurable).