Automatic merge of gitlab-org/gitlab-ce master

doc/user/permissions.md

@@ -152,13 +152,9 @@ which visibility level you select on project settings.
 
 ### Protected branches
 
-To prevent people from messing with history or pushing code without
-review, we've created protected branches. Read through the documentation on
-[protected branches](project/protected_branches.md)
-to learn more.
-
-Additionally, you can allow or forbid users with Maintainer and/or
-Developer permissions to push to a protected branch. Read through the documentation on
+Additional restrictions can be applied on a per-branch basis with [protected branches](project/protected_branches.md).
+Additionally, you can customize permissions to allow or prevent project
+Maintainers and Developers from pushing to a protected branch. Read through the documentation on
 [Allowed to Merge and Allowed to Push settings](project/protected_branches.md#using-the-allowed-to-merge-and-allowed-to-push-settings)
 to learn more.
 

doc/user/project/protected_branches.md

@@ -5,9 +5,8 @@ type: reference, howto
 # Protected Branches
 
 [Permissions](../permissions.md) in GitLab are fundamentally defined around the
-idea of having read or write permission to the repository and branches. To
-prevent people from messing with history or pushing code without review, we've
-created protected branches.
+idea of having read or write permission to the repository and branches. To impose
+further restrictions on certain branches, they can be protected.
 
 ## Overview
 

doc/workflow/gitlab_flow.md

-
 # Introduction to GitLab Flow
 
 ![GitLab Flow](img/gitlab_flow.png)
@@ -60,7 +59,7 @@ For example, many projects do releases but don't need to do hotfixes.
 In reaction to Git flow, GitHub created a simpler alternative.
 [GitHub flow](https://guides.github.com/introduction/flow/index.html) has only feature branches and a `master` branch.
 This flow is clean and straightforward, and many organizations have adopted it with great success.
-Atlassian recommends [a similar strategy](https://www.atlassian.com/blog/archives/simple-git-workflow-simple), although they rebase feature branches.
+Atlassian recommends [a similar strategy](https://www.atlassian.com/blog/git/simple-git-workflow-is-simple), although they rebase feature branches.
 Merging everything into the `master` branch and frequently deploying means you minimize the amount of unreleased code, which is in line with lean and continuous delivery best practices.
 However, this flow still leaves a lot of questions unanswered regarding deployments, environments, releases, and integrations with issues.
 With GitLab flow, we offer additional guidance for these questions.