summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Lewis <mlewis@gitlab.com>2019-06-07 20:16:48 +0000
committerMike Lewis <mlewis@gitlab.com>2019-06-07 20:16:48 +0000
commit116551ba04257c1f6d99f0ac8efd9b1a93b04d7c (patch)
treeb01f884fbd1418dd5465fc1741f1620061ae8c5c
parente07b2b277f79bc25cdce22ca2defba1ba80791aa (diff)
parent99df0218f82b851b017bd0eea1b8351dc89df6ed (diff)
downloadgitlab-ce-116551ba04257c1f6d99f0ac8efd9b1a93b04d7c.tar.gz
Merge branch 'docs/fix-example-dot-net' into 'master'
Remove example.net, replace with example.com See merge request gitlab-org/gitlab-ce!25535
-rw-r--r--doc/administration/logs.md2
-rw-r--r--doc/user/project/clusters/serverless/index.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index ac41f9177dd..c5cfb8d5016 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -129,7 +129,7 @@ It contains information about [integrations](../user/project/integrations/projec
``` json
{"severity":"ERROR","time":"2018-09-06T14:56:20.439Z","service_class":"JiraService","project_id":8,"project_path":"h5bp/html5-boilerplate","message":"Error sending message","client_url":"http://jira.gitlap.com:8080","error":"execution expired"}
-{"severity":"INFO","time":"2018-09-06T17:15:16.365Z","service_class":"JiraService","project_id":3,"project_path":"namespace2/project2","message":"Successfully posted","client_url":"http://jira.example.net"}
+{"severity":"INFO","time":"2018-09-06T17:15:16.365Z","service_class":"JiraService","project_id":3,"project_path":"namespace2/project2","message":"Successfully posted","client_url":"http://jira.example.com"}
```
## `kubernetes.log`
diff --git a/doc/user/project/clusters/serverless/index.md b/doc/user/project/clusters/serverless/index.md
index dfbed0ec95f..2cda850f24e 100644
--- a/doc/user/project/clusters/serverless/index.md
+++ b/doc/user/project/clusters/serverless/index.md
@@ -216,7 +216,7 @@ The sample function can now be triggered from any HTTP client using a simple `PO
--header "Content-Type: application/json" \
--request POST \
--data '{"GitLab":"FaaS"}' \
- http://functions-echo.functions-1.functions.example.com
+ http://functions-echo.functions-1.functions.example.com/
```
2. Using a web-based tool (ie. postman, restlet, etc)