reapply minor changes that escaped rebase

Author: yasunariw

documentation/config_docs.md

@@ -105,7 +105,7 @@ A json object with fields of bools for each status type.
 
 | value | description | optional | default |
 |-|-|-|-|
-| `default_channel` | default channel to notify if no rules match | Yes | None |
+| `default_channel` | default channel to notify if no rules match | Yes | don't notify any channel |
 | `rules` | list of `label_rule` objects | No | - |
 
 ### Label Rule
@@ -114,8 +114,8 @@ A **label rule** specifies whether or not a Slack channel should be notified, ba
 
 | value | description | optional | default |
 |-|-|-|-|
-| `allow` | whitelist of label values; if not provided, the rule is vacuously satisfied | Yes | - |
-| `ignore` | blacklist of label values; any labels matching will not match the rule | Yes | - |
+| `allow` | whitelist of labels that should match the rule | Yes | all labels allowed if no list provided |
+| `ignore` | blacklist of labels that shouldn't match the rule | Yes | - |
 | `channel` | channel to use as webhook if the rule is matched | No | - |
 
 ## Prefix Options
@@ -151,6 +151,6 @@ A **prefix rule** specifies whether or not a Slack channel should be notified, b
 
 | value | description | optional | default |
 |-|-|-|-|
-| `allow` | whitelist of file prefixes that match the rule | Yes | - |
-| `ignore` | blacklist of file prefixes that do not match the rule | Yes | - |
+| `allow` | whitelist of file prefixes that should match the rule | Yes | all prefixes allowed if no list provided |
+| `ignore` | blacklist of file prefixes that shouldn't match the rule | Yes | - |
 | `channel` | channel to use as webhook if the rule is matched | No | - |

documentation/secret_docs.md

@@ -45,12 +45,12 @@ A secrets file stores sensitive information. Unlike the repository configuration
 |-|-|-|-|
 | `slack_hooks` | list of channel names (`channel`) and their corresponding webhook endpoint (`url`) | No | - |
 | `gh_token` | specify to grant the bot access to private repositories; omit for public repositories | Yes | - |
-| `gh_webhook_secret` | specify to ensure the bot only receives GitHub notifications from pre-approved repositories | Yes | - |
+| `gh_hook_token` | specify to ensure the bot only receives GitHub notifications from pre-approved repositories | Yes | - |
 
 ## `gh_token`
 
 Some operations, such as fetching a config file from a private repository, or the commit corresponding to a commit comment event, require a personal access token. Refer [here](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token) for detailed instructions on token generation.
 
-## `gh_webhook_secret`
+## `gh_hook_token`
 
 Refer [here](https://docs.github.com/en/free-pro-team@latest/developers/webhooks-and-events/securing-your-webhooks) for more information on securing webhooks with a token.

lib/config.atd

@@ -4,7 +4,7 @@ type label_rule <ocaml from="Rule"> = abstract
 
 (* This type of rule is used for CI build notifications. *)
 type status_rules = {
-  ?allowed_pipelines: string list nullable; (* keep only status events with a title matching this list *)
+  ?allowed_pipelines : string list nullable; (* keep only status events with a title matching this list *)
   rules: status_state;
 }
 

lib/rule.atd

@@ -30,7 +30,7 @@ type status_state = {
 type prefix_rule = {
   ?allow : string list nullable;
   ?ignore : string list nullable;
-  channel_name <json name="channel">: string;
+  channel_name <json name="channel"> : string;
 }
 
 (* A payload matches a label rule with a channel name if absent from the ignore list
@@ -39,5 +39,5 @@ type prefix_rule = {
 type label_rule = {
   ?allow : string list nullable;
   ?ignore : string list nullable;
-  channel_name <json name="channel">: string;
+  channel_name <json name="channel"> : string;
 }

test/notabot.json

@@ -13,7 +13,7 @@
             "success": "once"
         }
     },
-"prefix_rules": {
+    "prefix_rules": {
         "default_channel": "default",
         "rules": [
             {