Commit b5410a28 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'cs-docs-fixes' into 'master'

Simple docs fixes

See merge request gitlab-org/gitlab-ce!15001
parents 9991bb87 0011d874
...@@ -85,7 +85,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i ...@@ -85,7 +85,7 @@ Manage your [repositories](user/project/repository/index.md) from the UI (user i
### Issues and Merge Requests (MRs) ### Issues and Merge Requests (MRs)
- [Discussions](user/discussions/index.md) Threads, comments, and resolvable discussions in issues, commits, and merge requests. - [Discussions](user/discussions/index.md): Threads, comments, and resolvable discussions in issues, commits, and merge requests.
- [Issues](user/project/issues/index.md) - [Issues](user/project/issues/index.md)
- [Project issue Board](user/project/issue_board.md) - [Project issue Board](user/project/issue_board.md)
- [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests. - [Issues and merge requests templates](user/project/description_templates.md): Create templates for submitting new issues and merge requests.
...@@ -155,7 +155,7 @@ have access to GitLab administration tools and settings. ...@@ -155,7 +155,7 @@ have access to GitLab administration tools and settings.
- [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab. - [Git LFS configuration](workflow/lfs/lfs_administration.md): Learn how to use LFS under GitLab.
- [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages. - [GitLab Pages configuration](administration/pages/index.md): Configure GitLab Pages.
- [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability. - [High Availability](administration/high_availability/README.md): Configure multiple servers for scaling or high availability.
- [User cohorts](user/admin_area/user_cohorts.md) View user activity over time. - [User cohorts](user/admin_area/user_cohorts.md): View user activity over time.
- [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab. - [Web terminals](administration/integration/terminal.md): Provide terminal access to environments from within GitLab.
- GitLab CI - GitLab CI
- [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time. - [CI admin settings](user/admin_area/settings/continuous_integration.md): Define max artifacts size and expiration time.
......
...@@ -458,7 +458,7 @@ Content-Type: application/json ...@@ -458,7 +458,7 @@ Content-Type: application/json
## Encoding `+` in ISO 8601 dates ## Encoding `+` in ISO 8601 dates
If you need to include a `+` in a query parameter, you may need to use `%2B` instead due If you need to include a `+` in a query parameter, you may need to use `%2B` instead due
a [W3 recommendation]((http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that a [W3 recommendation](http://www.w3.org/Addressing/URL/4_URI_Recommentations.html) that
causes a `+` to be interpreted as a space. For example, in an ISO 8601 date, you may want to pass causes a `+` to be interpreted as a space. For example, in an ISO 8601 date, you may want to pass
a time in Mountain Standard Time, such as: a time in Mountain Standard Time, such as:
......
...@@ -39,4 +39,4 @@ Learn more about generating a personal access token in the ...@@ -39,4 +39,4 @@ Learn more about generating a personal access token in the
[Personal Access Token Documentation][personal-access-token-documentation]. [Personal Access Token Documentation][personal-access-token-documentation].
Don't forget to check the API scope checkbox! Don't forget to check the API scope checkbox!
[personal-access-token-documentation]: ../user/profile/personal_access_tokens.html [personal-access-token-documentation]: ../user/profile/personal_access_tokens.md
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
> **Notes:** > **Notes:**
> - This feature was [introduced][ee-80] in GitLab EE 8.3. > - This feature was [introduced][ee-80] in GitLab EE 8.3.
> - Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5. > - Custom CNAMEs with TLS support were [introduced][ee-173] in GitLab EE 8.5.
> - GitLab Pages [were ported][ce-14605] to Community Edition in GitLab 8.17. > - GitLab Pages [was ported][ce-14605] to Community Edition in GitLab 8.17.
> - This document is about the user guide. To learn how to enable GitLab Pages > - This document is about the user guide. To learn how to enable GitLab Pages
> across your GitLab instance, visit the [administrator documentation](../../../administration/pages/index.md). > across your GitLab instance, visit the [administrator documentation](../../../administration/pages/index.md).
...@@ -174,7 +174,7 @@ job, the contents of the `public` directory will be served by GitLab Pages. ...@@ -174,7 +174,7 @@ job, the contents of the `public` directory will be served by GitLab Pages.
#### How `.gitlab-ci.yml` looks like when the static content is in your repository #### How `.gitlab-ci.yml` looks like when the static content is in your repository
Supposedly your repository contained the following files: Supposed your repository contained the following files:
``` ```
├── index.html ├── index.html
...@@ -419,7 +419,7 @@ You can only create the highest level group website. ...@@ -419,7 +419,7 @@ You can only create the highest level group website.
## Redirects in GitLab Pages ## Redirects in GitLab Pages
Since you cannot use any custom server configuration files, like `.htaccess` or Since you cannot use any custom server configuration files, like `.htaccess` or
any `.conf` file for that matter, if you want to redirect a web page to another any `.conf` file, if you want to redirect a page to another
location, you can use the [HTTP meta refresh tag][metarefresh]. location, you can use the [HTTP meta refresh tag][metarefresh].
Some static site generators provide plugins for that functionality so that you Some static site generators provide plugins for that functionality so that you
...@@ -434,7 +434,7 @@ Sure. All you need to do is download the artifacts archive from the job page. ...@@ -434,7 +434,7 @@ Sure. All you need to do is download the artifacts archive from the job page.
### Can I use GitLab Pages if my project is private? ### Can I use GitLab Pages if my project is private?
Yes. GitLab Pages don't care whether you set your project's visibility level Yes. GitLab Pages doesn't care whether you set your project's visibility level
to private, internal or public. to private, internal or public.
### Do I need to create a user/group website before creating a project website? ### Do I need to create a user/group website before creating a project website?
......
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