Build the FAQ into the tutorials

The FAQ file had to be moved into the tutorials folder to make this work for some reason. JSDoc did not want to take "../faq" as a name. Closes #865 Change-Id: I63ff5b181f494d72c04eaa054111d9fdc866064c
shaka-project · Jun 12, 2017 · 0283935 · 0283935
1 parent 52957b7
commit 0283935
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-**Have you read the [FAQ](https://goo.gl/njDlGk) and checked for duplicate issues**:
+**Have you read the [FAQ](https://goo.gl/JE1Sy5) and checked for duplicate issues**:
 
 **What version of Shaka Player are you using**:
 

diff --git a/README.md b/README.md
@@ -150,4 +150,5 @@ contributors to follow.
 
 ## FAQ ##
 
-For general help and before filing any bugs, please read the [FAQ](docs/faq.md).
+For general help and before filing any bugs, please read the
+[FAQ](docs/tutorials/faq.md).
diff --git a/docs/faq.md → docs/tutorials/faq.md b/docs/faq.md → docs/tutorials/faq.md
diff --git a/docs/tutorials/index.json b/docs/tutorials/index.json
@@ -11,6 +11,7 @@
   { "manifest-parser": { "title": "Manifest Parser Plugins" } },
   { "architecture": { "title": "Architecture Diagrams" } },
   { "service-worker": { "title": "Service Worker Caching" } },
+  { "faq": { "title": "Frequently Asked Questions" } },
   { "upgrade": {
       "title": "Upgrade Guide",
       "children": {