diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 12:40:43 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-10-20 12:40:43 +0300 |
| commit | d7ec8451dc5c938e6e30830b83ca17c84091fece (patch) | |
| tree | e937ddd09966d1a6e166dd0c3c5caff7ebefcde7 | |
| parent | c4d487a7ef5bfaf2ad57f70f39abaa8994db9a74 (diff) | |
| parent | 489d9cdaab0eb5c306a20b0e5aa9318ca2092bd0 (diff) | |
| download | gitlab-ce-d7ec8451dc5c938e6e30830b83ca17c84091fece.tar.gz | |
Merge branch 'master' of github.com:gitlabhq/gitlabhq
| -rw-r--r-- | doc/markdown/markdown.md | 4 | ||||
| -rw-r--r-- | lib/support/nginx/gitlab-ssl | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md index 6d96da76ad7..edb7a975503 100644 --- a/doc/markdown/markdown.md +++ b/doc/markdown/markdown.md @@ -510,6 +510,10 @@ Code above produces next output: | cell 1 | cell 2 | | cell 3 | cell 4 | +**Note** + +The row of dashes between the table header and body must have at least three dashes in each column. + ## References - This document leveraged heavily from the [Markdown-Cheatsheet](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). diff --git a/lib/support/nginx/gitlab-ssl b/lib/support/nginx/gitlab-ssl index d3fb467ef27..fd4f93c2f92 100644 --- a/lib/support/nginx/gitlab-ssl +++ b/lib/support/nginx/gitlab-ssl @@ -91,8 +91,7 @@ server { # resolver_timeout 10s; ## [Optional] Generate a stronger DHE parameter: - ## cd /etc/ssl/certs - ## sudo openssl dhparam -out dhparam.pem 4096 + ## sudo openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096 ## # ssl_dhparam /etc/ssl/certs/dhparam.pem; |