From ed405a78abc603a72a3e622973eaedbf492f22d5 Mon Sep 17 00:00:00 2001
From: Kody Jackson <kody@cloudflare.com>
Date: Mon, 10 Apr 2023 11:37:46 -0600
Subject: [PATCH] [DNS][SSL] Various maintenance tasks (#8414)
* Removed structured how-to data and components
* Addresses #7262
* Addresses #7748
* Moved caa records out of custom certs
* Fixed broken links
* Forgot support links
---
content/_redirects | 1 +
.../reference/dns-record-types.md | 2 +-
content/dns/zone-setups/full-setup/setup.md | 69 ++-----------------
.../manage-domains/remove-domain.md | 6 ++
.../{custom-certificates => }/caa-records.md | 0
.../custom-certificates/uploading.md | 4 +-
.../certificate-validation-options.md | 11 +++
...ation Authority Authorization (CAA) FAQ.md | 4 +-
.../Cloudflare mit Shopify verwenden .md | 2 +-
.../Cloudflare con Shopify.md" | 2 +-
...Utilisation de Cloudflare avec Shopify.md" | 2 +-
.../Usar a Cloudflare com Shopify.md" | 2 +-
...re\343\202\222\344\275\277\343\201\206.md" | 2 +-
...0\216 Shopify \346\220\255\351\205\215.md" | 2 +-
...54\354\232\251\355\225\230\352\270\260.md" | 2 +-
.../Troubleshooting SSL errors.md | 2 +-
.../Using Cloudflare with Shopify.md | 2 +-
layouts/_default/_markup/render-heading.html | 3 +-
layouts/_default/baseof.html | 2 -
layouts/shortcodes/how-to-direction.html | 5 --
layouts/shortcodes/how-to-section.html | 23 -------
layouts/shortcodes/how-to-step.html | 25 -------
layouts/shortcodes/how-to-tip.html | 5 --
23 files changed, 38 insertions(+), 140 deletions(-)
rename content/ssl/edge-certificates/{custom-certificates => }/caa-records.md (100%)
create mode 100644 content/ssl/reference/certificate-validation-options.md
delete mode 100644 layouts/shortcodes/how-to-direction.html
delete mode 100644 layouts/shortcodes/how-to-section.html
delete mode 100644 layouts/shortcodes/how-to-step.html
delete mode 100644 layouts/shortcodes/how-to-tip.html
diff --git a/content/_redirects b/content/_redirects
index d9d171338..3a6a5921c 100644
--- a/content/_redirects
+++ b/content/_redirects
@@ -468,6 +468,7 @@
/ssl/advanced-certificate-manager/ /ssl/edge-certificates/advanced-certificate-manager/ 301
/ssl/certificate-transparency-monitoring/ /ssl/edge-certificates/additional-options/certificate-transparency-monitoring/ 301
/ssl/edge-certificates/certificate-transparency-monitoring/ /ssl/edge-certificates/additional-options/certificate-transparency-monitoring/ 301
+/ssl/edge-certificates/custom-certificates/caa-records/ /ssl/edge-certificates/caa-records/ 301
/ssl/edge-certificates/http-strict-transport-security/ /ssl/edge-certificates/additional-options/http-strict-transport-security/ 301
/ssl/edge-certificates/universal-ssl/changing-dcv-method/ /ssl/edge-certificates/changing-dcv-method/ 301
/ssl/edge-certificates/uploading/ /ssl/edge-certificates/custom-certificates/uploading/ 301
diff --git a/content/dns/manage-dns-records/reference/dns-record-types.md b/content/dns/manage-dns-records/reference/dns-record-types.md
index c98ec998f..9db429c26 100644
--- a/content/dns/manage-dns-records/reference/dns-record-types.md
+++ b/content/dns/manage-dns-records/reference/dns-record-types.md
@@ -234,7 +234,7 @@ The **Content** for TXT records at Cloudflare must be 2048 characters or less.
### CAA
-A [Certificate Authority Authorization (CAA) record](/ssl/edge-certificates/custom-certificates/caa-records/) specifies which Certificate Authorities (CAs) are allowed to issue certificates for a domain.
+A [Certificate Authority Authorization (CAA) record](/ssl/edge-certificates/caa-records/) specifies which Certificate Authorities (CAs) are allowed to issue certificates for a domain.
{{<render file="_api-field-definitions.md">}}
diff --git a/content/dns/zone-setups/full-setup/setup.md b/content/dns/zone-setups/full-setup/setup.md
index 0269b92f3..13e04020b 100644
--- a/content/dns/zone-setups/full-setup/setup.md
+++ b/content/dns/zone-setups/full-setup/setup.md
@@ -4,7 +4,6 @@ pcx_content_type: tutorial
weight: 1
meta:
title: Change your nameservers (Full setup)
-structured_data: true
---
# Change your nameservers (Full setup)
@@ -13,9 +12,7 @@ structured_data: true
---
-{{<how-to-step headingLevel=2 title="Before you begin" >}}
-
-{{<how-to-direction>}}
+## Before you begin
Before update your domain nameservers, make sure that you:
@@ -25,10 +22,6 @@ Before update your domain nameservers, make sure that you:
{{<render file="_dnssec-providers.md">}}
-{{</how-to-direction>}}
-
-{{<how-to-direction>}}
-
{{<Aside type="note">}}
If you do not already have a [domain name](https://www.cloudflare.com/learning/dns/glossary/what-is-a-domain-name/), get one at-cost through [Cloudflare Registrar](https://dash.cloudflare.com/?to=/:account/domains/register).
@@ -37,27 +30,15 @@ All domains purchased through Cloudflare Registrar automatically use Cloudflare
{{</Aside>}}
-{{</how-to-direction>}}
-
-{{</how-to-step>}}
-
---
-{{<how-to-step headingLevel=2 title="Add site to Cloudflare" >}}
-
-{{<how-to-direction>}}
+## Add site to Cloudflare
In the Cloudflare dashboard, [add your domain](/fundamentals/get-started/setup/add-site/).
-{{</how-to-direction>}}
-
-{{</how-to-step>}}
-
---
-{{<how-to-step headingLevel=2 title="Review DNS records" >}}
-
-{{<how-to-direction>}}
+## Review DNS records
When you start using Cloudflare's nameservers for authoritative DNS and your zone is in a full setup, Cloudflare will become your primary DNS provider. This means that your DNS records in Cloudflare need to be accurate for your domain to work properly.
@@ -65,26 +46,16 @@ When you start using Cloudflare's nameservers for authoritative DNS and your zon
{{<render file="_dns-scan-procedure.md">}}
-{{</how-to-direction>}}
-
-{{<how-to-tip>}}
-
{{<render file="_dns-nxdomain-warning.md">}}
-{{</how-to-tip>}}
-
-{{</how-to-step>}}
-
---
-{{<how-to-step headingLevel=2 title="Update your nameservers" >}}
+## Update your nameservers
{{<render file="_nameserver-preamble.md">}}
{{<render file="_minimize-downtime-tip.md">}}
-{{<how-to-direction>}}
-
### Get nameserver names
1. Log in to the [Cloudflare dashboard](https://dash.cloudflare.com) and select your account and domain.
@@ -95,18 +66,10 @@ When you start using Cloudflare's nameservers for authoritative DNS and your zon
<br/>
3. Keep this window open while you perform the next step.
-{{</how-to-direction>}}
-
-{{<how-to-tip>}}
-
{{<Aside type="note">}}
Cloudflare automatically assigns nameservers to a domain and these assignments cannot be changed. For more details, refer to [Nameserver assignments](/dns/zone-setups/reference/nameserver-assignment/).
{{</Aside>}}
-{{</how-to-tip>}}
-
-{{<how-to-direction>}}
-
### Update your registrar
1. Log in to the admin account for your domain registrar. If you do not know your provider, use [ICANN WHOIS](https://whois.icann.org/).
@@ -162,20 +125,12 @@ Cloudflare automatically assigns nameservers to a domain and these assignments c
</div>
</details>
-{{</how-to-direction>}}
-
-{{<how-to-tip>}}
-
{{<Aside type="note">}}
To avoid common issues, refer to our [Nameserver replacement checklist](/dns/zone-setups/troubleshooting/nameservers/).
{{</Aside>}}
-{{</how-to-tip>}}
-
-{{<how-to-direction>}}
-
### Verify changes
Wait up to 24 hours while your registrar updates your nameservers.
@@ -197,30 +152,16 @@ nslookup <DOMAIN_NAME> 1.1.1.1
nslookup <DOMAIN_NAME> 8.8.8.8
```
-{{</how-to-direction>}}
-
-{{<how-to-tip>}}
-
{{<Aside type="note">}}
If you see unexpected results, refer to our [troubleshooting suggestions](/dns/zone-setups/troubleshooting/nameservers/) and check with your domain registrar.
{{</Aside>}}
-{{</how-to-tip>}}
-
-{{</how-to-step>}}
-
---
-{{<how-to-step headingLevel=2 title="Re-enable DNSSEC" >}}
-
-{{<how-to-direction>}}
+## Re-enable DNSSEC
When you updated your nameservers, you should have also disabled DNSSEC at your registrar.
You should now [enable DNSSEC](/dns/additional-options/dnssec/) to protect from domain spoofing.
-
-{{</how-to-direction>}}
-
-{{</how-to-step>}}
diff --git a/content/fundamentals/get-started/basic-tasks/manage-domains/remove-domain.md b/content/fundamentals/get-started/basic-tasks/manage-domains/remove-domain.md
index 644b864eb..9ce053b17 100644
--- a/content/fundamentals/get-started/basic-tasks/manage-domains/remove-domain.md
+++ b/content/fundamentals/get-started/basic-tasks/manage-domains/remove-domain.md
@@ -41,3 +41,9 @@ If you need to re-add the domain in a different account, make sure the current s
3. Select **Confirm**.
+
+{{<Aside type="note">}}
+
+Cloudflare retains your configuration history for 18 months, which is the default retention period for the zone's [audit logs](/fundamentals/account-and-billing/account-security/review-audit-logs/).
+
+{{</Aside>}}
\ No newline at end of file
diff --git a/content/ssl/edge-certificates/custom-certificates/caa-records.md b/content/ssl/edge-certificates/caa-records.md
similarity index 100%
rename from content/ssl/edge-certificates/custom-certificates/caa-records.md
rename to content/ssl/edge-certificates/caa-records.md
diff --git a/content/ssl/edge-certificates/custom-certificates/uploading.md b/content/ssl/edge-certificates/custom-certificates/uploading.md
index fe4905443..9e8321bb2 100644
--- a/content/ssl/edge-certificates/custom-certificates/uploading.md
+++ b/content/ssl/edge-certificates/custom-certificates/uploading.md
@@ -66,7 +66,7 @@ To upload a custom SSL certificate in the dashboard:
9. Select **Upload Custom Certificate**. If you see an error for `The key you provided does not match the certificate`, contact your Certificate Authority to ensure the private key matches the certificate.
-10. (optional) [Add a CAA DNS record](/ssl/edge-certificates/custom-certificates/caa-records/).
+10. (optional) [Add a CAA DNS record](/ssl/edge-certificates/caa-records/).
{{</tab>}}
{{<tab label="api" no-code="true">}}
@@ -137,7 +137,7 @@ $ curl -sX POST https://api.cloudflare.com/client/v4/zones/{zone_id}/custom_cert
{{<render file="_caa-records-definition.md">}}
-For more guidance, refer to [Create a CAA record](/ssl/edge-certificates/custom-certificates/caa-records/).
+For more guidance, refer to [Create a CAA record](/ssl/edge-certificates/caa-records/).
{{</tab>}}
{{</tabs>}}
diff --git a/content/ssl/reference/certificate-validation-options.md b/content/ssl/reference/certificate-validation-options.md
new file mode 100644
index 000000000..64b5dbbf8
--- /dev/null
+++ b/content/ssl/reference/certificate-validation-options.md
@@ -0,0 +1,11 @@
+---
+title: Validation options
+pcx_content_type: reference
+weight: 8
+---
+
+# Validation options
+
+All certificates issued by Cloudflare - [Universal](/ssl/edge-certificates/universal-ssl/), [Advanced](/ssl/edge-certificates/advanced-certificate-manager/), and [Custom Hostname](/cloudflare-for-platforms/cloudflare-for-saas/security/certificate-management/) - are Domain Validated (DV) certificates.
+
+If you need Organization Validated (OV) or Extended Validation (EV) certificates, [upload a custom certificate](/ssl/edge-certificates/custom-certificates/).
\ No newline at end of file
diff --git a/content/support/DNS/How to/Certification Authority Authorization (CAA) FAQ.md b/content/support/DNS/How to/Certification Authority Authorization (CAA) FAQ.md
index 9d1456fc5..0d49ece29 100644
--- a/content/support/DNS/How to/Certification Authority Authorization (CAA) FAQ.md
+++ b/content/support/DNS/How to/Certification Authority Authorization (CAA) FAQ.md
@@ -12,7 +12,7 @@ title: Certification Authority Authorization (CAA) FAQ
A Certificate Authority Authorization (CAA) record allows domain owners to restrict issuance to specified Certificate Authorities (CAs).
-For more details and instructions on how to create these records, refer to our [developer documentation](/ssl/edge-certificates/custom-certificates/caa-records).
+For more details and instructions on how to create these records, refer to our [developer documentation](/ssl/edge-certificates/caa-records/).
___
@@ -52,7 +52,7 @@ ___
## What records are added to keep Universal SSL enabled?
-If you use Cloudflare’s free Universal SSL certificates, [several CAA records are added by Cloudflare](/ssl/edge-certificates/custom-certificates/caa-records#caa-records-added-by-cloudflare).
+If you use Cloudflare’s free Universal SSL certificates, [several CAA records are added by Cloudflare](/ssl/edge-certificates/caa-records/#caa-records-added-by-cloudflare).
{{<Aside type="warning">}}
Do not use the *Only allow wildcards* option for the root record (which
diff --git a/content/support/Other Languages/Deutsch/Cloudflare mit Shopify verwenden .md b/content/support/Other Languages/Deutsch/Cloudflare mit Shopify verwenden .md
index a05dfe5dc..05c2f3439 100644
--- a/content/support/Other Languages/Deutsch/Cloudflare mit Shopify verwenden .md
+++ b/content/support/Other Languages/Deutsch/Cloudflare mit Shopify verwenden .md
@@ -41,7 +41,7 @@ Bei der Verwendung mit O2O können bestimmte Cloudflare-Funktionen den Traffic-F
- Seien Sie vorsichtig mit den folgenden Cloudflare-Funktionen:
- [Page Rules](https://support.cloudflare.com/hc/articles/218411427): Falsch konfigurierte Page Rules, die mit der für Shopify verwendeten Subdomain übereinstimmen, können den Fluss der E-Commerce-Besucher auf Ihrer Website blockieren oder verzerren.
- [Workers](/workers/): Ähnlich wie Page Rules kann Workers den Traffic-Fluss auf Ihre Website unterbrechen und folglich den Umsatz reduzieren. Seien Sie beim Schreiben von Workers vorsichtig. Es wird empfohlen, die mit Shopify verwendete Subdomain von der Worker-Route auszuschließen.
- - [DNS-CAA-Einträge](/ssl/edge-certificates/custom-certificates/caa-records): Shopify stellt SSL/TLS-Zertifikate für Händlerdomains mit Let's Encrypt aus. Wenn Sie DNS-CAA-Einträge hinzufügen, müssen Sie Let's Encrypt als Zertifizierungsstelle (CA) auswählen, da HTTPS-Verbindungen sonst fehlschlagen können.
+ - [DNS-CAA-Einträge](/ssl/edge-certificates/caa-records/): Shopify stellt SSL/TLS-Zertifikate für Händlerdomains mit Let's Encrypt aus. Wenn Sie DNS-CAA-Einträge hinzufügen, müssen Sie Let's Encrypt als Zertifizierungsstelle (CA) auswählen, da HTTPS-Verbindungen sonst fehlschlagen können.
{{<Aside type="note">}}
Cloudflare kann keine Konfigurationsprobleme mit den oben genannten
diff --git "a/content/support/Other Languages/Espa\303\261ol (Espa\303\261a)/Cloudflare con Shopify.md" "b/content/support/Other Languages/Espa\303\261ol (Espa\303\261a)/Cloudflare con Shopify.md"
index cba73d916..16a5c1ca1 100644
--- "a/content/support/Other Languages/Espa\303\261ol (Espa\303\261a)/Cloudflare con Shopify.md"
+++ "b/content/support/Other Languages/Espa\303\261ol (Espa\303\261a)/Cloudflare con Shopify.md"
@@ -41,7 +41,7 @@ Cuando se utiliza con O2O, determinadas funciones de Cloudflare pueden interrump
- Debes tener cuidado con las siguientes funciones de Cloudflare:
- [Reglas de página](https://support.cloudflare.com/hc/articles/218411427): las reglas de página mal configuradas que coinciden con el subdominio utilizado para Shopify pueden bloquear o alterar el flujo de visitantes a tu sitio web.
- [Workers](/workers/): Al igual que las reglas de página, Workers puede interrumpir el flujo de tráfico a tu sitio web, reduciendo de esta manera los ingresos. Escribe Workers con cuidado. Es recomendable excluir el subdominio utilizado con Shopify de la ruta de Workers.
- - [Registros DNS CAA](/ssl/edge-certificates/custom-certificates/caa-records): Shopify usa Let's Encrypt para emitir certificados SSL/TLS para dominios de comercio electrónico. Si añades algún registro DNS CAA, debes seleccionar Let's Encrypt como autoridad de certificación (CA), de lo contrario las conexiones HTTPS pueden fallar.
+ - [Registros DNS CAA](/ssl/edge-certificates/caa-records/): Shopify usa Let's Encrypt para emitir certificados SSL/TLS para dominios de comercio electrónico. Si añades algún registro DNS CAA, debes seleccionar Let's Encrypt como autoridad de certificación (CA), de lo contrario las conexiones HTTPS pueden fallar.
{{<Aside type="note">}}
Cloudflare no puede solucionar ningún problema de configuración con las
diff --git "a/content/support/Other Languages/Fran\303\247ais (France)/Utilisation de Cloudflare avec Shopify.md" "b/content/support/Other Languages/Fran\303\247ais (France)/Utilisation de Cloudflare avec Shopify.md"
index 11a082e36..9e02a415e 100644
--- "a/content/support/Other Languages/Fran\303\247ais (France)/Utilisation de Cloudflare avec Shopify.md"
+++ "b/content/support/Other Languages/Fran\303\247ais (France)/Utilisation de Cloudflare avec Shopify.md"
@@ -45,7 +45,7 @@ Lorsqu'elles sont utilisées avec O2O, certaines fonctions de Cloudflare peuvent
- Soyez prudent avec les fonctions suivantes de Cloudflare :
- [Règles Page Rules](https://support.cloudflare.com/hc/articles/218411427) : Les règles de page incorrectement configurées qui correspondent au sous-domaine utilisé pour Shopify peuvent bloquer ou fausser le flux des visiteurs de commerce électronique sur votre site Web.
- [Workers](/workers/) : À l'instar des règles Page Rules, Workers peut interrompre le flux de trafic vers votre site web et, ainsi, grever vos revenus. Intégrez Workers avec prudence. Il est recommandé d'exclure le sous-domaine utilisé avec Shopify de l'itinéraire Workers.
- - [Enregistrement DNS CAA](/ssl/edge-certificates/custom-certificates/caa-records) : Shopify utilise Let's Encrypt pour émettre des certificats SSL/TLS pour les domaines de commerce. Si vous ajoutez des enregistrements DNS CAA, vous devez sélectionner Let's Encrypt comme autorité de certification (CA), faute de quoi les connexions HTTPS risquent d'échouer.
+ - [Enregistrement DNS CAA](/ssl/edge-certificates/caa-records/) : Shopify utilise Let's Encrypt pour émettre des certificats SSL/TLS pour les domaines de commerce. Si vous ajoutez des enregistrements DNS CAA, vous devez sélectionner Let's Encrypt comme autorité de certification (CA), faute de quoi les connexions HTTPS risquent d'échouer.
___
diff --git "a/content/support/Other Languages/Portugu\303\252s do Brasil/Usar a Cloudflare com Shopify.md" "b/content/support/Other Languages/Portugu\303\252s do Brasil/Usar a Cloudflare com Shopify.md"
index 5e8d0af51..0e666d472 100644
--- "a/content/support/Other Languages/Portugu\303\252s do Brasil/Usar a Cloudflare com Shopify.md"
+++ "b/content/support/Other Languages/Portugu\303\252s do Brasil/Usar a Cloudflare com Shopify.md"
@@ -45,7 +45,7 @@ Quando usados com O2O, certos recursos da Cloudflare podem interromper o fluxo d
- Tenha cuidado com os seguintes recursos da Cloudflare:
- [Page Rules](https://support.cloudflare.com/hc/articles/218411427): Page Rules configuradas incorretamente que correspondem ao subdomínio usado pelo Shopify podem bloquear ou distorcer o fluxo de visitantes de comércio eletrônico em seu site.
- [Workers](/workers/): de modo semelhante ao Page Rules, o Workers pode interromper o fluxo de tráfego para o seu site e, consequentemente, reduzir a receita. Insira o Workers com cautela. É aconselhável excluir o subdomínio usado com a Shopify da rota do Workers.
- - [Registros DNS CAA](/ssl/edge-certificates/custom-certificates/caa-records): a Shopify emite certificados SSL/TLS para domínios de lojistas usando a Let's Encrypt. Se você adicionar algum registro de DNS CAA, deverá selecionar a Let's Encrypt como autoridade de certificação (CA) ou as conexões HTTPS poderão falhar.
+ - [Registros DNS CAA](/ssl/edge-certificates/caa-records/): a Shopify emite certificados SSL/TLS para domínios de lojistas usando a Let's Encrypt. Se você adicionar algum registro de DNS CAA, deverá selecionar a Let's Encrypt como autoridade de certificação (CA) ou as conexões HTTPS poderão falhar.
___
diff --git "a/content/support/Other Languages/\346\227\245\346\234\254\350\252\236/Shopify\343\201\247Cloudflare\343\202\222\344\275\277\343\201\206.md" "b/content/support/Other Languages/\346\227\245\346\234\254\350\252\236/Shopify\343\201\247Cloudflare\343\202\222\344\275\277\343\201\206.md"
index 3a134eef3..ced8a6126 100644
--- "a/content/support/Other Languages/\346\227\245\346\234\254\350\252\236/Shopify\343\201\247Cloudflare\343\202\222\344\275\277\343\201\206.md"
+++ "b/content/support/Other Languages/\346\227\245\346\234\254\350\252\236/Shopify\343\201\247Cloudflare\343\202\222\344\275\277\343\201\206.md"
@@ -45,7 +45,7 @@ O2Oで使用する場合、Cloudflareの特定の機能がShopifyストアへの
- 以下のCloudflareの機能には注意が必要です。
- [Page rules](https://support.cloudflare.com/hc/articles/218411427): Shopifyに使用されているサブドメインにマッチするページルールが正しく設定されていないと、Webサイトへのeコマース訪問者の流れを妨げたり、歪めたりする可能性があります。
- [Workers](/workers/)：Page Rulesと同様にWorkersもWebサイトへのトラフィックのフローを中断し、結果的に減益につながる可能性があります。Workersの書き込みは慎重に行ってください。WorkersのルーティングからShopifyで使われるサブドメインを除外することをお勧めします。
- - [DNS CAAレコード](/ssl/edge-certificates/custom-certificates/caa-records)：ShopifyはLet's Encryptを使って、出店者ドメインにSSL/TLS証明書を発行します。DNS CAAレコードを追加する場合、Let's Encryptを認証局（CA）に選択しなければなりません。そうしないと、HTTPS接続に失敗します。
+ - [DNS CAAレコード](/ssl/edge-certificates/caa-records/)：ShopifyはLet's Encryptを使って、出店者ドメインにSSL/TLS証明書を発行します。DNS CAAレコードを追加する場合、Let's Encryptを認証局（CA）に選択しなければなりません。そうしないと、HTTPS接続に失敗します。
___
diff --git "a/content/support/Other Languages/\347\256\200\344\275\223\344\270\255\346\226\207/Cloudflare \344\270\216 Shopify \346\220\255\351\205\215.md" "b/content/support/Other Languages/\347\256\200\344\275\223\344\270\255\346\226\207/Cloudflare \344\270\216 Shopify \346\220\255\351\205\215.md"
index a20e11c19..cfb832b07 100644
--- "a/content/support/Other Languages/\347\256\200\344\275\223\344\270\255\346\226\207/Cloudflare \344\270\216 Shopify \346\220\255\351\205\215.md"
+++ "b/content/support/Other Languages/\347\256\200\344\275\223\344\270\255\346\226\207/Cloudflare \344\270\216 Shopify \346\220\255\351\205\215.md"
@@ -45,7 +45,7 @@ ___
- 要注意以下 Cloudflare 功能：
- [页面规则](https://support.cloudflare.com/hc/articles/218411427): 与 Shopify 使用的子域相匹配的页面规则配置不正确，可能会阻止或扭曲电子商务访问者对您网站的访问。
- [Workers](/workers/)：与页面规则类似，Workers 可能会中断发往您网站的流量，从而导致收益缩减。编写 Workers 应谨慎。建议您从 Workers 路由中排除用于 Shopify 的子域。
- - [DNS CAA 记录](/ssl/edge-certificates/custom-certificates/caa-records)：Shopify 使用 Let’s Encrypt 为商家域颁发 SSL/TLS 证书。如果您添加任何 DNS CAA 记录，则必须选择 Let’s Encrypt 作为证书颁发机构（CA），否则 HTTPS 连接可能会出错。
+ - [DNS CAA 记录](/ssl/edge-certificates/caa-records/)：Shopify 使用 Let’s Encrypt 为商家域颁发 SSL/TLS 证书。如果您添加任何 DNS CAA 记录，则必须选择 Let’s Encrypt 作为证书颁发机构（CA），否则 HTTPS 连接可能会出错。
___
diff --git "a/content/support/Other Languages/\355\225\234\352\265\255\354\226\264/Shopify\354\231\200 \355\225\250\352\273\230 Cloudflare \354\202\254\354\232\251\355\225\230\352\270\260.md" "b/content/support/Other Languages/\355\225\234\352\265\255\354\226\264/Shopify\354\231\200 \355\225\250\352\273\230 Cloudflare \354\202\254\354\232\251\355\225\230\352\270\260.md"
index e9c97c6c4..14c513303 100644
--- "a/content/support/Other Languages/\355\225\234\352\265\255\354\226\264/Shopify\354\231\200 \355\225\250\352\273\230 Cloudflare \354\202\254\354\232\251\355\225\230\352\270\260.md"
+++ "b/content/support/Other Languages/\355\225\234\352\265\255\354\226\264/Shopify\354\231\200 \355\225\250\352\273\230 Cloudflare \354\202\254\354\232\251\355\225\230\352\270\260.md"
@@ -45,7 +45,7 @@ O2O와 함께 사용하는 경우 특정 Cloudflare 기능은 구매자에게
- 다음 Cloudflare 기능에 주의하십시오.
- [페이지 규칙](https://support.cloudflare.com/hc/articles/218411427): Shopify에 사용되는 서브도메인과 일치하는 올바르게 구성된 페이지 규칙은 웹 사이트에 대한 전자 상거래 방문자의 플로우를 차단하거나 왜곡할 수 있습니다.
- [Workers](/workers/): Page Rules와 유사하게 Workers도 웹 사이트의 트래픽 흐름을 방해하여 결과적으로 매출이 낮아질 수 있습니다. Workers 이용 시 주의가 필요합니다. Shopify에 사용되는 하위 도메인은 Workers 경로에서 제외하는 것이 좋습니다.
- - [DNS CAA 레코드](/ssl/edge-certificates/custom-certificates/caa-records): Shopify는 Let’s Encrypt를 이용하여 상인들에게 SSL/TLS 인증서를 발급합니다. DNS CAA 레코드를 추가하는 경우 Let's Encrypt를 인증 기관(CA)으로 선택해야 하며 그렇게 하지 않으면 HTTPS 연결이 실패할 수 있습니다.
+ - [DNS CAA 레코드](/ssl/edge-certificates/caa-records/): Shopify는 Let’s Encrypt를 이용하여 상인들에게 SSL/TLS 인증서를 발급합니다. DNS CAA 레코드를 추가하는 경우 Let's Encrypt를 인증 기관(CA)으로 선택해야 하며 그렇게 하지 않으면 HTTPS 연결이 실패할 수 있습니다.
___
diff --git a/content/support/SSL TLS/Troubleshooting/Troubleshooting SSL errors.md b/content/support/SSL TLS/Troubleshooting/Troubleshooting SSL errors.md
index d2ec88245..fa8a3ec9c 100644
--- a/content/support/SSL TLS/Troubleshooting/Troubleshooting SSL errors.md
+++ b/content/support/SSL TLS/Troubleshooting/Troubleshooting SSL errors.md
@@ -96,7 +96,7 @@ Our SSL vendors verify each SSL certificate request before Cloudflare can issue
**Resolution**
-If your domain is on a [partial setup](/dns/zone-setups/partial-setup): Confirm whether you have CAA DNS records enabled at your current hosting provider. If so, ensure you [specify the Certificate Authorities that Cloudflare uses](/ssl/edge-certificates/custom-certificates/caa-records) to provision certificates for your domain. If [Universal SSL](/ssl/edge-certificates/universal-ssl) is disabled on your domain under the **Disable Universal SSL** section of the **Edge Certificates** tab in Cloudflare **SSL/TLS** app:
+If your domain is on a [partial setup](/dns/zone-setups/partial-setup): Confirm whether you have CAA DNS records enabled at your current hosting provider. If so, ensure you [specify the Certificate Authorities that Cloudflare uses](/ssl/edge-certificates/caa-records/) to provision certificates for your domain. If [Universal SSL](/ssl/edge-certificates/universal-ssl) is disabled on your domain under the **Disable Universal SSL** section of the **Edge Certificates** tab in Cloudflare **SSL/TLS** app:
- enable Universal SSL
- purchase an [advanced certificate](/ssl/edge-certificates/advanced-certificate-manager)
diff --git a/content/support/Third-Party Software/e-Commerce/Using Cloudflare with Shopify.md b/content/support/Third-Party Software/e-Commerce/Using Cloudflare with Shopify.md
index 8a4d0b406..0fd1e0482 100644
--- a/content/support/Third-Party Software/e-Commerce/Using Cloudflare with Shopify.md
+++ b/content/support/Third-Party Software/e-Commerce/Using Cloudflare with Shopify.md
@@ -40,7 +40,7 @@ When used with O2O, certain Cloudflare features can interrupt the flow of traffi
- Be careful with the following Cloudflare features:
- [Page rules](https://support.cloudflare.com/hc/articles/218411427): Incorrectly configured Page Rules that match the subdomain used for Shopify may block or distort the flow of ecommerce visitors to your website.
- [Workers](/workers/): Similar to Page Rules, Workers may interrupt the flow of traffic to your website and consequently reduce revenue. Write Workers with caution. It is advisable to exclude the subdomain used with Shopify from the Worker route.
- - [DNS CAA records](/ssl/edge-certificates/custom-certificates/caa-records): Shopify issues SSL/TLS certificates for merchant domains using Let’s Encrypt. If you add any DNS CAA records, you must select Let’s Encrypt as the Certificate Authority (CA) or HTTPS connections may fail.
+ - [DNS CAA records](/ssl/edge-certificates/caa-records/): Shopify issues SSL/TLS certificates for merchant domains using Let’s Encrypt. If you add any DNS CAA records, you must select Let’s Encrypt as the Certificate Authority (CA) or HTTPS connections may fail.
{{<Aside type="note">}}
Cloudflare cannot fix any configuration issues with the above features
diff --git a/layouts/_default/_markup/render-heading.html b/layouts/_default/_markup/render-heading.html
index 98200f0c5..8f87b3e6b 100644
--- a/layouts/_default/_markup/render-heading.html
+++ b/layouts/_default/_markup/render-heading.html
@@ -1,8 +1,7 @@
{{- $ID := (.Anchor | safeURL) -}}
{{- $text := (.Text | safeHTML) -}}
{{- if eq .Level 1 }}
- <h1 id="{{ $ID }}" {{ with $.Page.Params.structured_data -}}{{- if or (eq $.Page.Params.pcx_content_type "how-to") (eq $.Page.Params.pcx_content_type "tutorial") }} itemprop="name" {{- end -}}{{- end -}}
- >{{ $text }}</h1>
+ <h1 id="{{ $ID }}">{{ $text }}</h1>
{{- else -}}
<h{{ .Level }} id="{{ $ID }}">
<span class="DocsMarkdown--header-anchor-positioner">
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index d4dc96988..69a7580b1 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -23,9 +23,7 @@
<noscript><link rel="stylesheet" href="https://feedback.developers.cloudflare.com/sdk.css"/></noscript>
</head>
<body>
- {{- with $.Page.Params.structured_data -}}{{- if or (eq $.Page.Params.pcx_content_type "how-to") (eq $.Page.Params.pcx_content_type "tutorial") -}}<div itemscope itemtype="https://schema.org/HowTo">{{- end -}}{{- end -}}
{{- block "main" . -}}{{- end -}}
- {{- with $.Page.Params.structured_data -}}{{- if or (eq $.Page.Params.pcx_content_type "how-to") (eq $.Page.Params.pcx_content_type "tutorial") -}}</div>{{- end -}}{{- end -}}
{{- partial "gtag" -}}
{{- partial "littlefoot" -}}
</body>
diff --git a/layouts/shortcodes/how-to-direction.html b/layouts/shortcodes/how-to-direction.html
deleted file mode 100644
index 6a1ea4732..000000000
--- a/layouts/shortcodes/how-to-direction.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div itemprop="itemListElement" itemscope itemtype="https://schema.org/HowToDirection">
- <div itemprop="text" class="howToDirection">
- {{- .Inner | $.Page.RenderString }}
- </div>
- </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/how-to-section.html b/layouts/shortcodes/how-to-section.html
deleted file mode 100644
index dab00b746..000000000
--- a/layouts/shortcodes/how-to-section.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{{- $headingLevel := (default 2 (.Get "headingLevel")) | string -}}
-{{- $title := (default "" (.Get "title")) -}}
-{{- $ID := $title | urlize -}}
-
-<div itemprop="step" itemscope itemtype="https://schema.org/HowToSection" class="howToSection">
-<h{{$headingLevel}} id="{{ $ID }}" itemprop="name"><span class="DocsMarkdown--header-anchor-positioner">
- <a
- class="DocsMarkdown--header-anchor Link Link-without-underline"
- href="#{{ $ID }}"
- itemprop="url"
- >​</a
- >
-</span>
-<span>{{ $title | markdownify }}</span>
- </h{{ $headingLevel }}>
-
-{{- .Inner -}}
-
-{{- with .Get "imageURL" -}}
- <img itemprop="image" alt="image showing preparation" src="{{.}}"/>
-{{- end -}}
-
-</div>
\ No newline at end of file
diff --git a/layouts/shortcodes/how-to-step.html b/layouts/shortcodes/how-to-step.html
deleted file mode 100644
index 202be344d..000000000
--- a/layouts/shortcodes/how-to-step.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{{- $title := (default "" (.Get "title")) -}}
-{{- $ID := $title | urlize -}}
-
-{{- with .Get "insideSection" -}}
-<div itemprop="itemListElement" itemscope itemtype="https://schema.org/HowToStep" class="howToStep">
- {{- else -}}
- <div itemprop="step" itemscope itemtype="https://schema.org/HowToStep" class="howToSection">
- {{- end -}}
-
- {{- with .Get "headingLevel" -}}
- <h{{ . | string }} id="{{ $ID }}" itemprop="name"><span class="DocsMarkdown--header-anchor-positioner">
- <a
- class="DocsMarkdown--header-anchor Link Link-without-underline"
- href="#{{ $ID }}"
- itemprop="url"
- >​</a
- >
- </span>
- <span>{{ $title | markdownify }}</span>
- </h{{ . | string }}>
-
- {{- end -}}
-
- {{- .Inner -}}
- </div>
\ No newline at end of file
diff --git a/layouts/shortcodes/how-to-tip.html b/layouts/shortcodes/how-to-tip.html
deleted file mode 100644
index 7688b46a6..000000000
--- a/layouts/shortcodes/how-to-tip.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div itemprop="itemListElement" itemscope itemtype="https://schema.org/HowToTip">
- <div itemprop="text" class="howToTip">
- {{- .Inner | $.Page.RenderString }}
- </div>
- </div>
\ No newline at end of file
--
GitLab