From cd7725b3d82595712118cde267e55266ee94f605 Mon Sep 17 00:00:00 2001
From: Evan Read <eread@gitlab.com>
Date: Thu, 25 Jun 2020 12:17:55 +1000
Subject: [PATCH] Add JSON to capitalization rule
---
.markdownlint.json | 1 +
doc/administration/pages/index.md | 2 +-
doc/api/feature_flag_specs.md | 4 ++--
doc/api/services.md | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.markdownlint.json b/.markdownlint.json
index b4da68989f375..253b7bd0c9244 100644
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -79,6 +79,7 @@
"Jira Cloud",
"Jira Server",
"jQuery",
+ "JSON",
"JupyterHub",
"Karma",
"Kerberos",
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 32307adeec2dc..18c17fc06b7a5 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -213,7 +213,7 @@ control over how the Pages daemon runs and serves content in your environment.
| `internal_gitlab_server` | Internal GitLab server address used exclusively for API requests. Useful if you want to send that traffic over an internal load balancer. Defaults to GitLab `external_url`.
| `listen_proxy` | The addresses to listen on for reverse-proxy requests. Pages will bind to these addresses' network socket and receives incoming requests from it. Sets the value of `proxy_pass` in `$nginx-dir/conf/gitlab-pages.conf`.
| `log_directory` | Absolute path to a log directory.
-| `log_format` | The log output format: 'text' or 'json'.
+| `log_format` | The log output format: `text` or `json`.
| `log_verbose` | Verbose logging, true/false.
| `max_connections` | Limit on the number of concurrent connections to the HTTP, HTTPS or proxy listeners.
| `metrics_address` | The address to listen on for metrics requests.
diff --git a/doc/api/feature_flag_specs.md b/doc/api/feature_flag_specs.md
index 52a4864fdc5c4..5f074be8b4a6c 100644
--- a/doc/api/feature_flag_specs.md
+++ b/doc/api/feature_flag_specs.md
@@ -166,7 +166,7 @@ POST /projects/:id/feature_flags/:name/scopes
| `name` | string | yes | The name of the feature flag. |
| `environment_scope` | string | yes | The [environment spec](../ci/environments/index.md#scoping-environments-with-specs) of the feature flag. |
| `active` | boolean | yes | Whether the spec is active. |
-| `strategies` | json | yes | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
+| `strategies` | JSON | yes | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
```shell
curl "https://gitlab.example.com/api/v4/projects/1/feature_flags/new_live_trace/scopes" \
@@ -249,7 +249,7 @@ PUT /projects/:id/feature_flags/:name/scopes/:environment_scope
| `name` | string | yes | The name of the feature flag. |
| `environment_scope` | string | yes | The URL-encoded [environment spec](../ci/environments/index.md#scoping-environments-with-specs) of the feature flag. |
| `active` | boolean | yes | Whether the spec is active. |
-| `strategies` | json | yes | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
+| `strategies` | JSON | yes | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
```shell
curl "https://gitlab.example.com/api/v4/projects/1/feature_flags/new_live_trace/scopes/production" \
diff --git a/doc/api/services.md b/doc/api/services.md
index 02048a27c1b27..145d83c62fa78 100644
--- a/doc/api/services.md
+++ b/doc/api/services.md
@@ -1008,7 +1008,7 @@ Parameters:
| --------- | ---- | -------- | ----------- |
| `api_url` | string | true | Prometheus API Base URL. For example, `http://prometheus.example.com/`. |
| `google_iap_audience_client_id` | string | false | Client ID of the IAP secured resource (looks like IAP_CLIENT_ID.apps.googleusercontent.com) |
-| `google_iap_service_account_json` | string | false | credentials.json file for your service account, like { "type": "service_account", "project_id": ... } |
+| `google_iap_service_account_json` | string | false | `credentials.json` file for your service account, like { "type": "service_account", "project_id": ... } |
### Delete Prometheus service
--
GitLab