Commit 82503745 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'docs-code-block-style-3' into 'master'

Fix whitespace in many administration docs (part 2)

See merge request gitlab-org/gitlab-ce!30555
parents c62ac54a 46336044
...@@ -57,9 +57,9 @@ you can change these defaults by editing the `/etc/tomcat7/server.xml` file. ...@@ -57,9 +57,9 @@ 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 You need to enable PlantUML integration from Settings under Admin Area. To do
that, login with an Admin account and do following: that, login with an Admin account and do following:
- in GitLab go to **Admin Area**->**Settings**->**Integrations**->**PlantUML** - in GitLab go to **Admin Area**->**Settings**->**Integrations**->**PlantUML**
- check **Enable PlantUML** checkbox - check **Enable PlantUML** checkbox
- set the PlantUML instance as **PlantUML URL** - set the PlantUML instance as **PlantUML URL**
## Creating Diagrams ## Creating Diagrams
...@@ -74,6 +74,7 @@ our AsciiDoc snippets, wikis and repos using delimited blocks: ...@@ -74,6 +74,7 @@ our AsciiDoc snippets, wikis and repos using delimited blocks:
Alice -> Bob : Go Away Alice -> Bob : Go Away
```</pre> ```</pre>
- **AsciiDoc** - **AsciiDoc**
``` ```
...@@ -111,11 +112,11 @@ diagram delimiters `@startuml`/`@enduml` as these are replaced by the AsciiDoc ` ...@@ -111,11 +112,11 @@ diagram delimiters `@startuml`/`@enduml` as these are replaced by the AsciiDoc `
Some parameters can be added to the AsciiDoc block definition: Some parameters can be added to the AsciiDoc block definition:
- *format*: Can be either `png` or `svg`. Note that `svg` is not supported by - *format*: Can be either `png` or `svg`. Note that `svg` is not supported by
all browsers so use with care. The default is `png`. all browsers so use with care. The default is `png`.
- *id*: A CSS id added to the diagram HTML tag. - *id*: A CSS id added to the diagram HTML tag.
- *width*: Width attribute added to the img tag. - *width*: Width attribute added to the img tag.
- *height*: Height attribute added to the img tag. - *height*: Height attribute added to the img tag.
Markdown does not support any parameters and will always use PNG format. Markdown does not support any parameters and will always use PNG format.
......
...@@ -81,16 +81,19 @@ executed, and then read the same 1,000 files. ...@@ -81,16 +81,19 @@ executed, and then read the same 1,000 files.
```sh ```sh
mkdir test; cd test mkdir test; cd test
``` ```
1. Run the command: 1. Run the command:
```sh ```sh
time for i in {0..1000}; do echo 'test' > "test${i}.txt"; done time for i in {0..1000}; do echo 'test' > "test${i}.txt"; done
``` ```
1. To benchmark read performance, run the command: 1. To benchmark read performance, run the command:
```sh ```sh
time for i in {0..1000}; do cat "test${i}.txt" > /dev/null; done time for i in {0..1000}; do cat "test${i}.txt" > /dev/null; done
``` ```
1. Remove the test files: 1. Remove the test files:
```sh ```sh
......
...@@ -395,6 +395,7 @@ Follow the steps below to configure GitLab Pages in a separate server. ...@@ -395,6 +395,7 @@ Follow the steps below to configure GitLab Pages in a separate server.
node_exporter['enable'] = false node_exporter['enable'] = false
gitlab_rails['auto_migrate'] = false gitlab_rails['auto_migrate'] = false
``` ```
1. Run `sudo gitlab-ctl reconfigure`. 1. Run `sudo gitlab-ctl reconfigure`.
1. On `app1` apply the following changes to `/etc/gitlab/gitlab.rb`: 1. On `app1` apply the following changes to `/etc/gitlab/gitlab.rb`:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment