Skip to content

Commit 3892e98

Browse files
authored
Branch was updated using the 'autoupdate branch' Actions workflow.
2 parents eda3650 + 9b702de commit 3892e98

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

content/github/managing-security-vulnerabilities/about-alerts-for-vulnerable-dependencies.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ We send security alerts to people with admin permissions in the affected reposit
7777
### Configuring notifications for {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_alerts %}{% else %}security alerts{% endif %}
7878

7979
{% if currentVersion == "free-pro-team@latest" %}
80-
By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-options)."
80+
By default, you will receive {% data variables.product.prodname_dependabot_alerts %} by email, grouped by the specific vulnerability. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)."
8181
{% endif %}
8282

8383
{% if currentVersion != "free-pro-team@latest" and currentVersion ver_gt "[email protected]" %}
84-
By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-options)."
84+
By default, if your site administrator has configured email for notifications on your instance, you will receive {% data variables.product.prodname_dependabot_alerts %} by email. You can also choose to receive {% data variables.product.prodname_dependabot_alerts %} in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#github-dependabot-alerts-notification-options)."
8585
{% endif %}
8686

8787
{% if currentVersion != "free-pro-team@latest" and currentVersion == "[email protected]" %}
88-
By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-options)."
88+
By default, if your site administrator has configured email for notifications on your instance, you will receive security alerts by email. You can also choose to receive security alerts in a weekly email summarizing alerts for up to 10 of your repositories, in your web notifications, or in the {% data variables.product.product_name %} user interface. For more information, see "[Configuring notifications](/github/managing-subscriptions-and-notifications-on-github/configuring-notifications#security-alert-notification-options)."
8989
{% endif %}
9090

9191
{% if currentVersion != "free-pro-team@latest" and currentVersion ver_lt "[email protected]" %}

content/github/managing-subscriptions-and-notifications-on-github/configuring-notifications.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ Email notifications from {% data variables.product.product_name %} contain the f
120120
3. On the notifications settings page, choose how you receive notifications when:
121121
- There are updates in repositories or team discussions you're watching or in a conversation you're participating in. For more information, see "[About participating and watching notifications](#about-participating-and-watching-notifications)."
122122
- You gain access to a new repository or you've joined a new team. For more information, see "[Automatic watching](#automatic-watching)."{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
123-
- There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} options](#github-dependabot-alerts-options)." {% endif %}{% if currentVersion == "[email protected]" %}
124-
- There are new security alerts in your repository. For more information, see "[Security alert options](#security-alert-options)." {% endif %} {% if currentVersion == "free-pro-team@latest" %}
123+
- There are new {% data variables.product.prodname_dependabot_alerts %} in your repository. For more information, see "[{% data variables.product.prodname_dependabot_alerts %} notification options](#github-dependabot-alerts-notification-options)." {% endif %}{% if currentVersion == "[email protected]" %}
124+
- There are new security alerts in your repository. For more information, see "[Security alert notification options](#security-alert-notification-options)." {% endif %} {% if currentVersion == "free-pro-team@latest" %}
125125
- There are workflow runs updates on repositories set up with {% data variables.product.prodname_actions %}. For more information, see "[{% data variables.product.prodname_actions %} notification options](#github-actions-notification-options)."{% endif %}
126126

127127
### Automatic watching
@@ -158,9 +158,9 @@ If you are a member of more than one organization, you can configure each one to
158158
![Switching your per-org email address](/assets/images/help/notifications/notifications_switching_org_email.gif)
159159

160160
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
161-
### {% data variables.product.prodname_dependabot_alerts %} options
161+
### {% data variables.product.prodname_dependabot_alerts %} notification options
162162
{% else %}
163-
### Security alert options
163+
### Security alert notification options
164164
{% endif %}
165165

166166
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}Choose how you want to receive {% data variables.product.prodname_dependabot_alerts %} for repositories that you are watching. You can receive {% data variables.product.prodname_dependabot_alerts %} in your inbox, as a banner on {% data variables.product.product_name %}, on the command line, through email, or some combination of these options.
@@ -177,6 +177,12 @@ If you want to receive security alerts by email, choose whether you want a weekl
177177
![Security alerts options](/assets/images/help/notifications-v2/security-alerts-options.png)
178178
{% endif %}
179179

180+
{% note %}
181+
182+
**Note:** You can filter your {% data variables.product.company_short %} inbox notifications by {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts. For more information, see "[Managing notifications from your inbox](/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox#supported-queries-for-custom-filters)."
183+
184+
{% endnote %}
185+
180186
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}
181187

182188
### {% data variables.product.prodname_actions %} notification options

content/github/managing-subscriptions-and-notifications-on-github/managing-notifications-from-your-inbox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ To filter notifications by why you've received an update, you can use the `reaso
112112

113113
#### Supported `is:` queries
114114

115-
To filter notifications for specific activity on {% data variables.product.product_name %}, you can use the `is` query. For example, to only see repository invitation updates, use `is:repository-invitation`.
115+
To filter notifications for specific activity on {% data variables.product.product_name %}, you can use the `is` query. For example, to only see repository invitation updates, use `is:repository-invitation`, and to only see {% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}{% data variables.product.prodname_dependabot_short %}{% else %} security{% endif %} alerts, use `is:repository-vulnerability-alert`.
116116

117117
- `is:check-suite`
118118
- `is:commit`

content/github/site-policy/github-subprocessors-and-cookies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@ Since the number and names of cookies may change,the table below may be updated
8282
| Google Analytics** | `_gat` | This cookie is used by Google Analytics. | one minute |
8383
| Google Analytics** | `_gid` | This cookie is used by Google Analytics. | one day |
8484

85-
*The **expiration** dates for the cookies listed below generally apply on a rolling basis.
85+
_*_ The **expiration** dates for the cookies listed below generally apply on a rolling basis.
8686

87-
**We use <b>Google Analytics</b> as a third party analytics service to collect information about how our website performs and how our users, in general, navigate through and use GitHub. This helps us evaluate our users' use of GitHub, compile statistical reports on activity, and improve our content and website performance.
87+
_**_ We use **Google Analytics** as a third party analytics service to collect information about how our website performs and how our users, in general, navigate through and use GitHub. This helps us evaluate our users' use of GitHub, compile statistical reports on activity, and improve our content and website performance.
8888

8989
You can control your Google Analytics cookie preferences through our cookie preference link located at the footer of our website. In addition, Google provides further information about its own privacy practices and [offers a browser add-on to opt out of Google Analytics tracking](https://tools.google.com/dlpage/gaoptout).
9090

0 commit comments

Comments
 (0)