diff --git a/src/routes.json b/src/routes.json
index bcb4bd28a..b52be8429 100644
--- a/src/routes.json
+++ b/src/routes.json
@@ -170,13 +170,6 @@
"title": "Scratch Project",
"dynamicMetaTags": true
},
- {
- "name": "3faq",
- "pattern": "^/3faq/?$",
- "routeAlias": "/3faq/?$",
- "view": "preview-faq/preview-faq",
- "title": "Scratch 3.0 FAQ"
- },
{
"name": "parents",
"pattern": "^/parents/?$",
@@ -302,6 +295,12 @@
"view": "microbit/microbit",
"title": "micro:bit"
},
+ {
+ "name":"3-faq-redirect",
+ "pattern": "^/3faq/?$",
+ "routeAlias": "/3faq/?$",
+ "redirect": "info/faq#scratch3"
+ },
{
"name": "donate-redirect",
"pattern": "^/info/donate/?",
diff --git a/src/views/faq/faq.jsx b/src/views/faq/faq.jsx
index d24160e7a..1ce162696 100644
--- a/src/views/faq/faq.jsx
+++ b/src/views/faq/faq.jsx
@@ -22,18 +22,37 @@ const Faq = injectIntl(props => (
+
+
+
+
+
+
+
+
+
-
-
-
@@ -41,26 +60,51 @@ const Faq = injectIntl(props => (
-
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -81,12 +125,18 @@ const Faq = injectIntl(props => (
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -147,6 +197,20 @@ const Faq = injectIntl(props => (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -169,8 +233,6 @@ const Faq = injectIntl(props => (
-
-
@@ -179,36 +241,34 @@ const Faq = injectIntl(props => (
-
-
-
+
-
+
-
-
-
+
-