3 files changed, 27 insertions, 0 deletions
diff --git a/doc/incoming_email/README.md b/doc/incoming_email/README.md
index c94e25bd4cc..01ab22321ed 100644
--- a/doc/incoming_email/README.md
+++ b/doc/incoming_email/README.md
@@ -88,6 +88,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password
@@ -161,6 +163,8 @@ In this example, we'll use the Gmail address `gitlab-incoming@gmail.com`.
         :port: 993
         # Whether the IMAP server uses SSL
         :ssl: true
+        # Whether the IMAP server uses StartTLS
+        :start_tls: false
         # Email account username. Usually the full email address.
         :email: "gitlab-incoming@gmail.com"
         # Email account password
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 5887891c1ab..039bb3c2561 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -518,3 +518,13 @@ You also need to change the corresponding options (e.g. `ssh_user`, `ssh_host`,
 ### Additional Markup Styles
 
 Apart from the always supported markdown style there are other rich text files that GitLab can display. But you might have to install a dependency to do so. Please see the [github-markup gem readme](https://github.com/gitlabhq/markup#markups) for more information.
+
+## Troubleshooting
+
+### "You appear to have cloned an empty repository."
+
+If you see this message when attempting to clone a repository hosted by GitLab,
+this is likely due to an outdated Nginx or Apache configuration, or a missing or
+misconfigured `gitlab-git-http-server` instance. Double-check that you've
+[installed Go](#3-go), [installed gitlab-git-http-server](#install-gitlab-git-http-server),
+and correctly [configured Nginx](#site-configuration).
diff --git a/doc/update/7.14-to-8.0.md b/doc/update/7.14-to-8.0.md
index 2c7003ed063..ed5c6c99e78 100644
--- a/doc/update/7.14-to-8.0.md
+++ b/doc/update/7.14-to-8.0.md
@@ -99,6 +99,7 @@ Don't store it in the same place as your database backups,
 otherwise your secrets are exposed if one of your backups is compromised.
 
 ```
+cd /home/git/gitlab
 sudo -u git -H cp config/secrets.yml.example config/secrets.yml
 sudo -u git -H chmod 0600 config/secrets.yml
 ```
@@ -153,6 +154,8 @@ git diff origin/7-14-stable:lib/support/nginx/gitlab-ssl origin/8-0-stable:lib/s
 git diff origin/7-14-stable:lib/support/nginx/gitlab origin/8-0-stable:lib/support/nginx/gitlab
 ```
 
+If you are using Apache instead of NGINX please see the updated [Apache templates](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server/apache).
+
 ### 9. Migrate GitLab CI to GitLab CE/EE
 
 Now, GitLab CE and EE has CI integrated. However, migrations don't happen automatically and you need to do it manually.
@@ -190,3 +193,13 @@ sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
 ```
 
 If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.
+
+## Troubleshooting
+
+### "You appear to have cloned an empty repository."
+
+If you see this message when attempting to clone a repository hosted by GitLab,
+this is likely due to an outdated Nginx or Apache configuration, or a missing or
+misconfigured `gitlab-git-http-server` instance. Double-check that you correctly
+completed [Step 5](#5-install-gitlab-git-http-server) to install the daemon and
+[Step 8](#new-nginx-configuration) to reconfigure Nginx.