Automatic merge of gitlab-org/gitlab-ce master

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`

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)