Skip to content

Commit 8894184

Browse files
committed
Merge branch 'production' into ranbel/generic-s2s
build errors
2 parents 4b61579 + a891d45 commit 8894184

File tree

4 files changed

+45
-38
lines changed

4 files changed

+45
-38
lines changed

src/content/docs/bots/reference/verified-bot-categories.mdx

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,24 @@ The Verified Bot Categories field is not compatible with legacy Firewall rules.
1414

1515
## Categories
1616

17-
- **Academic research**: Internet Archive, Library of Congress, TurnItInBot
18-
- **Accessibility**
19-
- **Advertising or marketing**: Google Adsbot
20-
- **Aggregators**: Pinterest, Indeed Jobsbot
21-
- **AI Crawler**: Google Bard, ChatGPT bot
22-
- **Feed fetcher**: RSS or Podcast feed updaters
23-
- **Monitoring or analytics**: Uptime Monitors
24-
- **Page preview**: Facebook, Slack, Twitter, or Discord Link Preview tools
25-
- **Search engine crawler**: Googlebot, Bingbot, Yandexbot, Baidubot
26-
- **Search engine optimization**: Google Lighthouse, GT Metrix, Pingdom, AddThis
27-
- **Security**: Vulnerability Scanners, SSL Domain Control Validation (DCV) Check Tools
28-
- **Webhooks**: Payment processors, WordPress Integration tools
29-
- **Other**
17+
| Name | String value | Example |
18+
| -------------------------- | ---------------------------- | ----------------------------------------------------------------------- |
19+
| Academic research | `Academic Research` | Internet Archive, Library of Congress, TurnItInBot |
20+
| Accessibility | `Accessibility` ||
21+
| Advertising or marketing | `Advertising & Marketing` | Google Adsbot |
22+
| Aggregators | `Aggregator` | Pinterest, Indeed Jobsbot |
23+
| AI Assistant | `AI Assistant` ||
24+
| AI Crawler | `AI Crawler` | Google Bard, ChatGPT bot |
25+
| AI Search | `AI Search` ||
26+
| Feed fetcher | `Feed Fetcher` | RSS or Podcast feed updaters |
27+
| Monitoring or analytics | `Monitoring & Analytics` | Uptime Monitors |
28+
| Page preview | `Page Preview` | Facebook, Slack, Twitter, or Discord Link Preview tools |
29+
| Search engine crawler | `Search Engine Crawler` | Googlebot, Bingbot, Yandexbot, Baidubot |
30+
| Search engine optimization | `Search Engine Optimization` | Google Lighthouse, GT Metrix, Pingdom, AddThis |
31+
| Security | `Security` | Vulnerability Scanners, SSL Domain Control Validation (DCV) Check Tools |
32+
| Social media marketing | `Social Media Marketing` ||
33+
| Webhooks | `Webhooks` | Payment processors, WordPress Integration tools |
34+
| Other | `Other` ||
3035

3136
## Availability
3237

src/content/docs/cloudflare-one/connections/connect-devices/warp/user-side-certificates/install-cert-with-warp.mdx

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ import { Details } from "~/components";
1515
| ----------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
1616
| All modes | All plans |
1717

18-
| System | Availability | Minimum WARP version |
19-
| -------- | ------------ | -------------------- |
20-
| Windows || 2023.3.381.0 |
21-
| macOS || 2023.3.381.0 |
22-
| Linux <sup>*</sup> || 2023.3.381.0 |
23-
| iOS || |
24-
| Android || |
25-
| ChromeOS || |
18+
| System | Availability | Minimum WARP version |
19+
| ------------------- | ------------ | -------------------- |
20+
| Windows || 2023.3.381.0 |
21+
| macOS || 2023.3.381.0 |
22+
| Linux <sup>\*</sup> || 2023.3.381.0 |
23+
| iOS || |
24+
| Android || |
25+
| ChromeOS || |
2626

2727
<sup>*</sup> Only supported on Debian-based systems.
2828
</Details>
@@ -41,18 +41,18 @@ The certificate is required if you want to [apply HTTP policies to encrypted web
4141

4242
If a custom certificate is not provided, WARP will install the default [Cloudflare certificate](/cloudflare-one/connections/connect-devices/warp/user-side-certificates/install-cloudflare-cert/#download-the-cloudflare-root-certificate) in the system keychain for all users. If you uploaded a custom certificate, the WARP client will deploy your custom certificate instead of the Cloudflare certificate.
4343

44-
Next, [verify](#view-the-installed-certificate) that the certificate was successfully installed.
44+
Next, [verify](#access-the-installed-certificate) that the certificate was successfully installed.
4545

4646
:::note[Important]
47-
4847
WARP only installs the system certificate — it does not install the certificate on individual applications. You will need to [manually add the certificate](/cloudflare-one/connections/connect-devices/warp/user-side-certificates/install-cloudflare-cert/#add-the-certificate-to-applications) to applications that rely on their own certificate store.
49-
5048
:::
5149

52-
## View the installed certificate
50+
## Access the installed certificate
5351

5452
### Windows
5553

54+
To access the installed certificate in Windows:
55+
5656
1. Open the Start menu and select **Run**.
5757
2. Enter `certlm.msc`.
5858
3. Go to **Trusted Root Certification Authority** > **Certificates**.
@@ -63,26 +63,29 @@ The certificate is also placed in `%ProgramData%\Cloudflare\installed_cert.pem`
6363

6464
### macOS
6565

66-
1. Open **Keychain Access**.
67-
2. Go to **System** > **Certificates**.
68-
3. Double-click your certificate. (The default Cloudflare certificate is named **Cloudflare for Teams ECC Certificate Authority**.)
69-
4. You should see **This certificate is marked as trusted for all users**.
66+
To access the installed certificate in Windows:
7067

71-
:::note
68+
1. Open Keychain Access.
69+
2. In **System Keychains**, go to **System** > **Certificates**.
70+
3. Open your certificate. The default Cloudflare certificate is named **Cloudflare for Teams ECC Certificate Authority**.
71+
4. If the certificate is trusted by all users, Keychain Access will display **This certificate is marked as trusted for all users**.
7272

73-
Certain macOS versions (`13.5` for example) do not allow WARP to automatically trust the certificate. To manually trust the certificate:
73+
:::note
74+
Certain macOS versions (such as macOS Ventura `13.5`) do not allow WARP to automatically trust the certificate. To manually trust the certificate:
7475

7576
1. Select **Trust**.
7677
2. Set **When using this certificate** to _Always Trust_.
77-
:::
78+
79+
Alternatively, you can configure your mobile device management (MDM) to automatically trust the certificate on all of your organization's devices.
80+
:::
7881

7982
The certificate is also placed in `/Library/Application Support/Cloudflare/installed_cert.pem` for reference by scripts or tools.
8083

8184
### Linux
8285

8386
On Linux, the certificate is stored in `/usr/local/share/ca-certificates`. The default Cloudflare certificate is named `managed-warp.pem`.
8487

85-
If you do not see the certificate, run the following commands to update the system store:
88+
If you cannot find the certificate, run the following commands to update the system store:
8689

8790
1. Go to the system certificate store.
8891

src/content/docs/cloudflare-one/policies/gateway/domain-categories.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Subdomains that have not been assigned a category will inherit the category of t
198198
| 29 | Violence | 165 | Violence |
199199
| 29 | Violence | 166 | Weapons |
200200
| 30 | Weather | 167 | Weather |
201-
| 31 | Blocked by default | 170 | Child Abuse |
201+
| 31 | Always blocked | 170 | Child Abuse |
202202
| 32 | Security Risks | 128 | Parked & For Sale Domains |
203203
| 32 | Security Risks | 169 | New Domains |
204204
| 32 | Security Risks | 177 | Newly Seen Domains |
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
22
{}
3-
43
---
54

65
Cloudflare categorizes domains into content categories and security categories, which cover security risks and security threats:
76

8-
* **Content categories**: An upstream vendor supplies content categories for domains. These categories help us organize domains into broad topic areas. However, the specific criteria and methods used by our vendor may not be disclosed.
9-
* **Security risks**: Cloudflare determines security risks for domains using internal models. These models analyze various factors, including the age of a domain and its reputation. This allows us to identify potentially risky domains.
10-
* **Security threats**: To identify malicious domains that pose security threats, Cloudflare employs a mix of internal data sources, machine learning models, commercial feeds, and open-source threat intelligence.
7+
- **Content categories**: An upstream vendor supplies content categories for domains. These categories help us organize domains into broad topic areas. However, the specific criteria and methods used by our vendor may not be disclosed.
8+
- **Security risks**: Cloudflare determines security risks for domains using internal models. These models analyze various factors, including the age of a domain and its reputation. This allows us to identify potentially risky domains.
9+
- **Security threats**: To identify malicious domains that pose security threats, Cloudflare employs a mix of internal data sources, machine learning models, commercial feeds, and open-source threat intelligence.

0 commit comments

Comments
 (0)