Automatic merge of gitlab-org/gitlab master

doc/administration/job_logs.md

@@ -101,7 +101,7 @@ Archived logs are considered as [job artifacts](job_artifacts.md).
 Therefore, when you [set up the object storage integration](job_artifacts.md#object-storage-settings),
 job logs are automatically migrated to it along with the other job artifacts.
 
-See "Phase 4: uploading" in [Data flow](#data-flow) to learn about the process.
+See "Phase 3: uploading" in [Data flow](#data-flow) to learn about the process.
 
 ## Prevent local disk usage
 

doc/administration/troubleshooting/log_parsing.md

@@ -60,7 +60,7 @@ zcat some_json.log.25.gz | (head -1; tail -1) | jq '.time'
 #### Find all requests with a 5XX status code
 
 ```shell
-jq 'select(status >= 500)' <FILE>
+jq 'select(.status >= 500)' <FILE>
 ```
 
 #### Top 10 slowest requests