From 71b49becc06acee4a0184b61ff7ce12e3b4b35cb Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 15 Mar 2016 12:11:05 +0200
Subject: [PATCH] Refactor FAQ section on cloning an empty repo

[ci skip]
---
 docs/faq/README.md | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/docs/faq/README.md b/docs/faq/README.md
index b62727d21..0c8e13908 100644
--- a/docs/faq/README.md
+++ b/docs/faq/README.md
@@ -92,9 +92,10 @@ If you're program is doing the above, then you need to disable that conversion f
 
 See issue [#332](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/332) for more information.
 
-## 10. While cloning the repository by HTTP(S) (with GitLab Runner or manually for tests) I get an error: "warning: You appear to have cloned an empty repository."
+## 10. "warning: You appear to have cloned an empty repository."
 
-When running `git clone` by the HTTP(s) you have received an output:
+When running `git clone` using HTTP(s) (with GitLab Runner or manually for
+tests) you have received an output:
 
 ```bash
 $ git clone https://git.example.com/user/repo.git
@@ -103,18 +104,26 @@ Cloning into 'repo'...
 warning: You appear to have cloned an empty repository.
 ```
 
-Make sure, that configuration of the HTTP Proxy in your GitLab server installation is done properly. Aspecially, if
-You are using some HTTP Proxy with own configuration, make sure that GitLab requests are proxied to the **GitLab
-Workhorse socket**, not to the **GitLab unicorn socket**.
+Make sure, that configuration of the HTTP Proxy in your GitLab server
+installation is done properly. Especially if you are using some HTTP Proxy with
+its own configuration, make sure that GitLab requests are proxied to the
+**GitLab Workhorse socket**, not to the **GitLab unicorn socket**.
 
-Git protocol via HTTP(S) is resolved by the GitLab Workhorse, so this is the **main entrypoint** of GitLab.
+Git protocol via HTTP(S) is resolved by the GitLab Workhorse, so this is the
+**main entrypoint** of GitLab.
 
-If you are using GitLab installed from omnibus package, but you don't want to use Nginx server bundled within it,
-please read [omnibus settings - using a non-bundled web-server](http://doc.gitlab.com/omnibus/settings/nginx.html#using-a-non-bundled-web-server).
-Please also look at [gitlab-recipe repository - web-servers configuration examples](https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server),
-for examples of configurations files for Apache, Lighttpd and Nginx.
+If you are using Omnibus GitLab, but don't want to use the bundled Nginx
+server, please read [using a non-bundled web-server][omnibus-ext-nginx].
 
-If you are using GitLab installed from source, also please read above documentation and examples, and make sure
-that whole HTTP(S) traffic is going trough the **GitLab Workhorse**.
+In gitlab-recipes repository there are [web-server configuration
+examples][recipes] for Apache and Nginx.
 
-See [gitlab-org/gitlab-ci-multi-runner#1105](https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1105) for an example of user issue.
+If you are using GitLab installed from source, also please read the above
+documentation and examples, and make sure that all HTTP(S) traffic is going
+trough the **GitLab Workhorse**.
+
+See [an example of a user issue][1105].
+
+[omnibus-ext-nginx]: http://doc.gitlab.com/omnibus/settings/nginx.html#using-a-non-bundled-web-server
+[recipes]: https://gitlab.com/gitlab-org/gitlab-recipes/tree/master/web-server
+[1105]: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/issues/1105
-- 
GitLab