Skip to content

Commit 61f76ef

Browse files
Merge branch 'cloudflare:production' into production
2 parents 6813184 + 097043e commit 61f76ef

File tree

21 files changed

+177
-106
lines changed

21 files changed

+177
-106
lines changed

public/_redirects

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@
252252

253253
# china network
254254
/support/about-cloudflare/enterprise-documentation/understanding-and-configuring-an-icp-number/ /china-network/concepts/icp/ 301
255+
/china-network/concepts/china-express/ /china-network/concepts/global-acceleration/ 301
255256

256257
# cloudflare for platforms
257258
/cloudflare-for-platforms/cloudflare-for-saas/start/advanced-settings/regional-services-for-saas/ /data-localization/regional-services/get-started/ 301

src/content/docs/1.1.1.1/setup/android.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ sidebar:
66
head:
77
- tag: title
88
content: Set up 1.1.1.1 on Android
9+
description: Learn how to set up Cloudflare's 1.1.1.1 DNS resolver on Android devices. Encrypt DNS queries with DoT or DoH, and enable 1.1.1.1 for Families.
910
slug: 1.1.1.1/setup/android
1011

1112
---
@@ -17,7 +18,6 @@ import { Details, Render } from "~/components"
1718
The app also allows you to enable encryption for DNS queries or enable [WARP mode](/warp-client/), which keeps all your HTTP traffic private and secure, including your DNS queries to 1.1.1.1.
1819

1920
You can select between the options available in the app settings. By default, 1.1.1.1: Faster Internet is configured to WARP mode.
20-
2121
## Set up 1.1.1.1: Faster Internet
2222

2323
1. Download [1.1.1.1: Faster Internet from Google Play](https://play.google.com/store/apps/details?id=com.cloudflare.onedotonedotonedotone) for free.

src/content/docs/china-network/concepts/china-express.mdx

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
title: Global Acceleration
3+
pcx_content_type: concept
4+
weight: 4
5+
---
6+
7+
:::note
8+
Global Acceleration a service offering that can be an add-on to China Network and also extend Zero Trust services into China.
9+
:::
10+
11+
Global Acceleration is a suite of connectivity, performance offerings and professional services designed to simplify your global assets' deployment in China. Global Acceleration is provided by our partners including CMI, CBC, and JD Cloud. Depending on what fits your needs best, Global Acceleration can support the following scenarios:
12+
13+
| Offer | Scenario |
14+
| ----------------------------------------------------- | ------------------------------------------------------------- |
15+
| [CDN Global Acceleration](#cdn-global-acceleration) | Higher performance of China Network CDN with dynamic content. |
16+
| [WARP Global Acceleration](#warp-global-acceleration) | WARP client used in China. |
17+
| [Magic WAN Connection](#mwan-global-acceleration) | Magic WAN used in China. |
18+
| [ICP](#icp-services) | ICP services. |
19+
| [MLPS](#mlps-services) | MLPS certification services. |
20+
| [Travel SIM](#travel-sim) | Zero Trust clients in business traveling to China. |
21+
22+
## CDN Global Acceleration
23+
24+
CDN Global Acceleration provides stable and reliable connections for dynamic content entering and exiting China, specifically beneficial for users' experience within the country. Additionally, this service can help facilitate seamless dynamic traffic management, ensuring stable connectivity across multiple global origins. It can support more advanced scenarios of Cloudflare features with great performance, such as accessing Cloudflare R2 and Cloudflare Fonts in China.
25+
26+
## WARP Global Acceleration
27+
28+
WARP Global Acceleration is a verified solution for enabling WARP client access within China, allowing remote employees to maintain secure and consistent connections.
29+
30+
## Magic WAN Global Acceleration
31+
32+
Magic WAN Global Acceleration is a verified solution for enabling Magic WAN access within China, allowing in-office employees to maintain secure and reliable connectivity.
33+
34+
## ICP services
35+
36+
Internet Content Provider (ICP) service simplifies the complexities of acquiring an ICP for domains to operate compliantly within China.
37+
38+
## MLPS services
39+
40+
The Multi-Level Protection Scheme (MLPS) service add-on streamlines the certification process to secure the MLPS L3 certification for your applications.
41+
42+
### Travel SIM
43+
44+
Travel SIM offers temporary, seamless WARP access for individual employees traveling to China, ensuring uninterrupted connectivity during their visit.
45+
46+
---
47+
48+
## General process
49+
50+
### 1. Validate prerequisites
51+
52+
Ensure that you have a Cloudflare [Enterprise plan](https://www.cloudflare.com/plans/enterprise/) and [China Network](/china-network/) if you want CDN Global Acceleration or other offers. Licenses of WARP and Magic WAN are required for WARP Connection or Magic WAN Global Acceleration.
53+
54+
### 2. Sign contract
55+
56+
Contact your Cloudflare account team. They will assist you with contracting with our local China partners.
57+
58+
### 3. Deploy Global Acceleration
59+
60+
Our local China partners will assist you to deploy Global Acceleration.

src/content/docs/china-network/index.mdx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,12 @@ The Cloudflare China Network provides:
2222
- An unified experience for managing network traffic and security posture. You can manage all configurations on the same dashboard.
2323
- The same customer support capabilities as Cloudflare's global network. You may also have access to premium service and local language support.
2424
- [In-China Authoritative DNS and in-China nameservers](/china-network/concepts/china-dns/) to improve the Time to First Byte (TTFB) performance.
25-
- [China Express](/china-network/concepts/china-express) is a suite of connectivity, performance offerings and professional services designed to simplify your global assets' deployment in China.
25+
- [Global Acceleration](/china-network/concepts/global-acceleration/) is a suite of connectivity, performance offerings and professional services designed to simplify your global assets' deployment in China.
2626

2727
### Video Introduction
2828

2929
<Stream id="b7933a5b3636ca29f834128ca92665b3" title="China Network Overview" thumbnail="1s" />
3030

31-
3231
## Availability
3332

3433
The Cloudflare China Network is available as a separate subscription for customers on an [Enterprise plan](https://www.cloudflare.com/plans/enterprise/).

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/api/office365-api.mdx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ sidebar:
55
order: 3
66
---
77

8+
import { Render } from "~/components"
9+
810
This guide will instruct you through setting up Microsoft Office 365 with Email Security via the Cloudflare dashboard.
911

1012
## Prerequisites
@@ -73,4 +75,8 @@ To view the integration for each connected domain:
7375
1. Select a domain.
7476
2. Select the three dots > **View integration**.
7577

76-
Once you have set up Email Security to scan through your inbox, Email Security will display detailed information about your inbox. Refer to [Monitor your inbox](/cloudflare-one/email-security/email-monitoring/) to learn more.
78+
Once you have set up Email Security to scan through your inbox, Email Security will display detailed information about your inbox. Refer to [Monitor your inbox](/cloudflare-one/email-security/email-monitoring/) to learn more.
79+
80+
## Next steps
81+
82+
<Render file="email-security/enable-logs" />

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/bcc-microsoft-exchange.mdx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,8 @@ If you have multiple rules, you may need to change the order of the BCC rule and
7373

7474
## Email processing and reports
7575

76-
In BCC mode, all emails are put through automated phishing detections by Email Security. Emails that trigger phishing detections are logged for reporting via product portal, email and Slack. Emails that do not trigger any detections are deleted.
76+
In BCC mode, all emails are put through automated phishing detections by Email Security. Emails that trigger phishing detections are logged for reporting via product portal, email and Slack. Emails that do not trigger any detections are deleted.
77+
78+
## Next steps
79+
80+
<Render file="email-security/enable-logs" />

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/enable-gmail-integration.mdx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,4 +84,7 @@ Enter the email associated with the Google Workspace Administrator account. Your
8484

8585
## Next steps
8686

87-
Now that you have created an integration, you will need to [connect your domains](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/connect-domains/) for Email Security to start scanning your inbox.
87+
Now that you have created an integration:
88+
89+
- [Connect your domains](/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/bcc-setup/gmail-bcc-setup/connect-domains/) for Email Security to start scanning your inbox.
90+
- [Enable logs](/cloudflare-one/insights/logs/enable-logs/) to send detection data to an endpoint of your choice.

src/content/docs/cloudflare-one/email-security/setup/post-delivery-deployment/bcc-journaling/journaling-setup/office365-journaling.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ sidebar:
55
order: 2
66
---
77

8-
import { GlossaryTooltip } from "~/components"
8+
import { GlossaryTooltip, Render } from "~/components"
99

1010
When you receive an email, the email lands on your Microsoft O365 inbox, and then Email Security receives a copy of that email. The following email flow shows how this works:
1111

@@ -51,4 +51,8 @@ Your domains are now added successfully.
5151
To view your connected domains:
5252

5353
1. Go to **Settings**.
54-
2. Locate your domain, select the three dots > **View domain**. Selecting **View domain** will display information about your domain.
54+
2. Locate your domain, select the three dots > **View domain**. Selecting **View domain** will display information about your domain.
55+
56+
## Next steps
57+
58+
<Render file="email-security/enable-logs" />

src/content/docs/dns/concepts.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ In this context, you can have a primary DNS setup, when you use Cloudflare to ma
4545

4646
When you have a primary DNS setup, you can either use only Cloudflare (also known as [Full setup](/dns/zone-setups/full-setup/)), or you can use Cloudflare and another provider, where the other provider is the one to receive [outgoing zone transfers](/dns/zone-setups/zone-transfers/cloudflare-as-primary/) from Cloudflare.
4747

48-
Finally, as Cloudflare also works as a [reverse proxy](/fundamentals/concepts/how-cloudflare-works/#how-cloudflare-works-as-a-reverse-proxy), [partial (CNAME) setups](/dns/zone-setups/partial-setup/) can be used when you do not want Cloudflare to be [authoritative](#authoritative-dns) for your domain but you still want to proxy individual subdomains through Cloudflare.
48+
Finally, as Cloudflare also works as a [reverse proxy](/fundamentals/concepts/how-cloudflare-works/#cloudflare-as-a-reverse-proxy), [partial (CNAME) setups](/dns/zone-setups/partial-setup/) can be used when you do not want Cloudflare to be [authoritative](#authoritative-dns) for your domain but you still want to proxy individual subdomains through Cloudflare.
4949

5050
## DNS records
5151

0 commit comments

Comments
 (0)