From 508e25b6d6e9a81edb6ddf8738450b79898b446a Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Mon, 27 Apr 2020 22:24:58 -0700 Subject: Adapt website to use g3doc sources and bazel. This adapts the merged website repository to use the image and bazel build framework. It explicitly avoids the container_image rules provided by bazel, opting instead to build with direct docker commands when necessary. The relevant build commands are incorporated into the top-level Makefile. --- website/_includes/footer-links.html | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 website/_includes/footer-links.html (limited to 'website/_includes/footer-links.html') diff --git a/website/_includes/footer-links.html b/website/_includes/footer-links.html new file mode 100644 index 000000000..b6a9771ca --- /dev/null +++ b/website/_includes/footer-links.html @@ -0,0 +1,37 @@ +
+
+
+

About

+ +
+
+

Support

+ +
+
+

Connect

+ +
+
+
+
+

© {{ 'now' | date: "%Y" }} The gVisor Authors

+
+
+
-- cgit v1.2.3 From cf86ec5e40bd1abf5be45fabbc7591a0452747ea Mon Sep 17 00:00:00 2001 From: Adin Scannell Date: Wed, 29 Apr 2020 10:53:25 -0700 Subject: Add powered by gVisor logo. --- website/_includes/footer-links.html | 12 +++++++++--- website/assets/logos/powered-gvisor.png | Bin 0 -> 5193 bytes 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 website/assets/logos/powered-gvisor.png (limited to 'website/_includes/footer-links.html') diff --git a/website/_includes/footer-links.html b/website/_includes/footer-links.html index b6a9771ca..10c28ead4 100644 --- a/website/_includes/footer-links.html +++ b/website/_includes/footer-links.html @@ -1,6 +1,6 @@
-
+

About

-
+

Support

-
+

Connect

+
+
diff --git a/website/assets/logos/powered-gvisor.png b/website/assets/logos/powered-gvisor.png new file mode 100644 index 000000000..e00c74a33 Binary files /dev/null and b/website/assets/logos/powered-gvisor.png differ -- cgit v1.2.3 From 068716ddf36f4dcb3d88e92b90774dcba2fe4db8 Mon Sep 17 00:00:00 2001 From: Michael Pratt Date: Wed, 1 Jul 2020 08:51:57 -0700 Subject: Fix FAQ URL The existing gvisor.dev/faq link returns 404 because the full URL has mistakenly been capitalized. PiperOrigin-RevId: 319233173 --- g3doc/user_guide/BUILD | 2 +- website/_includes/footer-links.html | 2 +- website/cmd/server/main.go | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'website/_includes/footer-links.html') diff --git a/g3doc/user_guide/BUILD b/g3doc/user_guide/BUILD index 5568e1ba4..b69aee12c 100644 --- a/g3doc/user_guide/BUILD +++ b/g3doc/user_guide/BUILD @@ -33,7 +33,7 @@ doc( name = "FAQ", src = "FAQ.md", category = "User Guide", - permalink = "/docs/user_guide/FAQ/", + permalink = "/docs/user_guide/faq/", weight = "90", ) diff --git a/website/_includes/footer-links.html b/website/_includes/footer-links.html index 10c28ead4..2036dbaa9 100644 --- a/website/_includes/footer-links.html +++ b/website/_includes/footer-links.html @@ -15,7 +15,7 @@
diff --git a/website/cmd/server/main.go b/website/cmd/server/main.go index 7c8bc9bfa..c401b6abd 100644 --- a/website/cmd/server/main.go +++ b/website/cmd/server/main.go @@ -35,6 +35,10 @@ var redirects = map[string]string{ // For links. "/faq": "/docs/user_guide/faq/", + // From 2020-05-12 to 2020-06-30, the FAQ URL was uppercase. Redirect that + // back to maintain any links. + "/docs/user_guide/FAQ/": "/docs/user_guide/faq/", + // Redirects to compatibility docs. "/c": "/docs/user_guide/compatibility/", "/c/linux/amd64": "/docs/user_guide/compatibility/linux/amd64/", -- cgit v1.2.3