summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-03-04 16:56:23 +0200
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:31 +0000
commit50d32d6cc6cf8643c1676f6241a125623a5af06e (patch)
treeb51d9d932ce4cfa3d2f14d8e9a891e3c1fa941bf /doc
parent52dcde272a7766dd22a045fe7ca94e3690a9590e (diff)
downloadgitlab-ce-50d32d6cc6cf8643c1676f6241a125623a5af06e.tar.gz
Add examples to 404 pages
[ci skip]
Diffstat (limited to 'doc')
-rw-r--r--doc/pages/README.md29
1 files changed, 12 insertions, 17 deletions
diff --git a/doc/pages/README.md b/doc/pages/README.md
index f614781e2ba..dc425f6a564 100644
--- a/doc/pages/README.md
+++ b/doc/pages/README.md
@@ -289,27 +289,22 @@ website hosted under GitLab.
### Secure your custom domain website with TLS
-### Use a static generator to develop your website
-
-#### Example projects
-
-Below is a list of example projects for GitLab Pages with a plain HTML website
-or various static site generators. Contributions are very welcome.
-
-- [Plain HTML](https://gitlab.com/gitlab-examples/pages-plain-html)
-- [Jekyll](https://gitlab.com/gitlab-examples/pages-jekyll)
-- [Hugo](https://gitlab.com/gitlab-examples/pages-hugo)
-- [Middleman](https://gitlab.com/gitlab-examples/pages-middleman)
-- [Hexo](https://gitlab.com/gitlab-examples/pages-hexo)
-- [Brunch](https://gitlab.com/gitlab-examples/pages-brunch)
-- [Metalsmith](https://gitlab.com/gitlab-examples/pages-metalsmith)
-- [Harp](https://gitlab.com/gitlab-examples/pages-harp)
### Custom error codes pages
You can provide your own 403 and 404 error pages by creating the `403.html` and
-`404.html` files respectively in the `public/` directory that will be included
-in the artifacts.
+`404.html` files respectively in the root directory of the `public/` directory
+that will be included in the artifacts.
+
+If the case of `404.html`, there are different scenarios. For example:
+
+- If you use project Pages (served under `/projectname/`) and try to access
+ `/projectname/non/exsiting_file`, GitLab Pages will try to serve first
+ `/projectname/404.html`, and then `/404.html`.
+- If you use user/group Pages (served under `/`) and try to access
+ `/non/existing_file` GitLab Pages will try to serve `/404.html`.
+- If you use a custom domain and try to access `/non/existing_file`, GitLab
+ Pages will try to server only `/404.html`.
### Remove the contents of your pages