Automatic merge of gitlab-org/gitlab-ce master

doc/administration/integration/plantuml.md

@@ -57,8 +57,7 @@ you can change these defaults by editing the `/etc/tomcat7/server.xml` file.
 You need to enable PlantUML integration from Settings under Admin Area. To do
 that, login with an Admin account and do following:
 
- - in GitLab go to **Admin Area** and then **Settings**
- - scroll to bottom of the page until PlantUML section
+ - in GitLab go to **Admin Area**->**Settings**->**Integrations**->**PlantUML**
  - check **Enable PlantUML** checkbox
  - set the PlantUML instance as **PlantUML URL**