diff --git a/pages/common/warp-cli.md b/pages/common/warp-cli.md
new file mode 100644
index 0000000000..d037d83416
--- /dev/null
+++ b/pages/common/warp-cli.md
@@ -0,0 +1,28 @@
+# warp-cli
+
+> Official command-line client for Cloudflare's WARP service.
+> More information: <https://developers.cloudflare.com/warp-client/>.
+
+- Register the current device to WARP (must be run before first connection):
+
+`warp-cli register`
+
+- Connect to WARP:
+
+`warp-cli connect`
+
+- Disconnect from WARP:
+
+`warp-cli disconnect`
+
+- Display the WARP connection status:
+
+`warp-cli status`
+
+- Display help:
+
+`warp-cli help`
+
+- Display help for a subcommand:
+
+`warp-cli help {{subcommand}}`
diff --git a/pages/common/warp-diag.md b/pages/common/warp-diag.md
new file mode 100644
index 0000000000..d3e9726b85
--- /dev/null
+++ b/pages/common/warp-diag.md
@@ -0,0 +1,21 @@
+# warp-diag
+
+> Diagnostic and feedback tool for Cloudflare's WARP service.
+> See also: `warp-cli`.
+> More information: <https://developers.cloudflare.com/warp-client/>.
+
+- Generate a zip file with information about the system configuration and the WARP connection:
+
+`warp-diag`
+
+- Generate a zip file with debug information including a timestamp to the output filename:
+
+`warp-diag --add-ts`
+
+- Save the output file under a specific directory:
+
+`warp-diag --output {{path/to/directory}}`
+
+- Submit a new feedback to Cloudflare's WARP interactively:
+
+`warp-diag feedback`