Merge branch 'master' into release-doc-improvements

Conflicts:
	doc/release/monthly.md

5 files changed, 18 insertions, 16 deletions

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 77ce78025d7..91bc7b02878 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -49,7 +49,7 @@ up-to-date and install it.
 
 Install the required packages (needed to compile Ruby and native extensions to Ruby gems):
 
-    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils cmake
+    sudo apt-get install -y build-essential zlib1g-dev libyaml-dev libssl-dev libgdbm-dev libreadline-dev libncurses5-dev libffi-dev curl openssh-server redis-server checkinstall libxml2-dev libxslt-dev libcurl4-openssl-dev libicu-dev logrotate python-docutils pkg-config cmake
 
 Make sure you have the right version of Git installed
 
diff --git a/doc/release/monthly.md b/doc/release/monthly.md
index 260b049fd74..2e19fc50890 100644
--- a/doc/release/monthly.md
+++ b/doc/release/monthly.md
@@ -229,12 +229,7 @@ git checkout -b x-x-stable
 git push <remote> x-x-stable
 ```
 
-### **3. Build the Omnibus packages**
-
-Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md).
-This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase.
-
-### **4. Create annotated tag vx.x.x**
+### **3. Create annotated tag vx.x.x**
 
 In `x-x-stable` branch check for the SHA-1 of the commit with VERSION file changed. Tag that commit,
 
@@ -244,12 +239,17 @@ git tag -a vx.x.0 -m 'Version x.x.0' xxxxx
 
 where `xxxxx` is SHA-1.
 
-### **5. Push the tag**
+### **4. Push the tag**
 
 ```
 git push origin vx.x.0
 ```
 
+### **5. Build the Omnibus packages**
+
+Follow the [release doc in the Omnibus repository](https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/doc/release.md).
+This can happen before tagging because Omnibus uses tags in its own repo and SHA1's to refer to the GitLab codebase.
+
 ### **6. Push to remotes**
 
 For GitLab CE, push to dev, GitLab.com and GitHub.
@@ -258,8 +258,6 @@ For GitLab EE, push to the subscribers repo.
 
 Make sure the branch is marked 'protected' on each of the remotes you pushed to.
 
-NOTE: You might not have the rights to push to master on dev. Ask Dmitriy.
-
 ### **7. Publish blog for new release**
 
 Merge the [blog merge request](#1-prepare-the-blog-post) in `www-gitlab-com` repository.
@@ -280,6 +278,10 @@ Include a link to the blog post and keep it short.
 Proposed email text:
 "We have released a new version of GitLab. See our blog post(<link>) for more information."
 
+### **10. Update installation.md**
+
+Update [installation.md](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md) to the newest version in master and cherry-pick that commit into the stable branch.
+
 # **23rd - Optional Patch Release**
 
 # **24th - Update GitLab.com**
diff --git a/doc/update/6.0-to-7.2.md b/doc/update/6.0-to-7.2.md
index bb756460233..51e260b9e62 100644
--- a/doc/update/6.0-to-7.2.md
+++ b/doc/update/6.0-to-7.2.md
@@ -85,8 +85,8 @@ sudo -u git -H git checkout 7-2-stable-ee
 # Add support for lograte for better log file handling
 sudo apt-get install logrotate
 
-# Install cmake, which is needed for the latest versions of rugged
-sudo apt-get install cmake
+# Install pkg-config and cmake, which is needed for the latest versions of rugged
+sudo apt-get install pkg-config cmake
 ```
 
 ## 5. Update gitlab-shell
diff --git a/doc/update/7.1-to-7.2.md b/doc/update/7.1-to-7.2.md
index 408ed42cdbb..04b9ce76a14 100644
--- a/doc/update/7.1-to-7.2.md
+++ b/doc/update/7.1-to-7.2.md
@@ -51,11 +51,11 @@ sudo -u git -H git checkout v1.9.7
 
 ### 4. Install new system dependencies
 
-The latest version of the 'rugged' gem requires cmake to build its native
-extensions.
+The latest version of the 'rugged' gem requires `pkg-config` and `cmake` to
+build its native extensions.
 
 ```bash
-sudo apt-get install cmake
+sudo apt-get install pkg-config cmake
 ```
 
 ### 5. Install libs, migrations, etc.
diff --git a/doc/update/upgrader.md b/doc/update/upgrader.md
index 966430c2c01..e8379fcc318 100644
--- a/doc/update/upgrader.md
+++ b/doc/update/upgrader.md
@@ -21,7 +21,7 @@ If you have local changes to your GitLab repository the script will stash them a
 
 ## 2. Run GitLab upgrade tool
 
-Note: GitLab 7.2 adds cmake as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
+Note: GitLab 7.2 adds `pkg-config` and `cmake` as dependency. Please check the dependencies in the [installation guide.](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/install/installation.md#1-packages-dependencies)
 
     # Starting with GitLab version 7.0 upgrader script has been moved to bin directory
     cd /home/git/gitlab