From 76269f4a1ff9c483c3fe84724ec97e8ebb9ab276 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Tue, 18 Apr 2017 12:51:17 -0700
Subject: [PATCH] docs(aio): fix the broken docs guide

---
 aio/content/guide/additional.md |  5 ++++
 aio/content/guide/core.md       |  5 ++++
 aio/content/marketing/docs.html | 25 -----------------
 aio/content/marketing/docs.md   | 48 +++++++++++++++++++++++++++++++++
 aio/content/navigation.json     |  4 ++-
 5 files changed, 61 insertions(+), 26 deletions(-)
 create mode 100644 aio/content/guide/additional.md
 create mode 100644 aio/content/guide/core.md
 delete mode 100644 aio/content/marketing/docs.html
 create mode 100644 aio/content/marketing/docs.md

diff --git a/aio/content/guide/additional.md b/aio/content/guide/additional.md
new file mode 100644
index 0000000000..6e9bf9c8d2
--- /dev/null
+++ b/aio/content/guide/additional.md
@@ -0,0 +1,5 @@
+@title
+Additional techniques
+
+@description
+Learn important techniques such as how to secure, style, animate, and deploy your application.
diff --git a/aio/content/guide/core.md b/aio/content/guide/core.md
new file mode 100644
index 0000000000..9245676842
--- /dev/null
+++ b/aio/content/guide/core.md
@@ -0,0 +1,5 @@
+@title
+Core features of Angular
+
+@description
+Explore the core modules and features of Angular in this section of the guide.
\ No newline at end of file
diff --git a/aio/content/marketing/docs.html b/aio/content/marketing/docs.html
deleted file mode 100644
index 30c72adda5..0000000000
--- a/aio/content/marketing/docs.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<h1>Angular Docs</h1>
-<h6>v 4.0.0</h6>
-<p>Learn about the latest updates to the documentation. View the Angular change log for enhancements, fixes, and breaking changes in Angular itself. If you're looking for Angular vs2 documents you'll find them at <a href="#">v2.angular.io</a></p>
-
-<div class="card-container clearfix">
-
-    <a href="../guide/quickstart" class="card">
-        <h2>Quickstart</h2>
-        <p>A short beginner guide explaining the basic concepts of Angular</p>
-        <p class="card-footer">View Quickstart</p>
-    </a>
-
-    <a href="..api" class="card">
-        <h2>Developer Guide</h2>
-        <p>An intermediuate development guide covering all major features of Angular</p>
-        <p class="card-footer">View Quickstart</p>
-
-    </a>
-
-    <a href="../api" class="card">
-        <h2>API Reference</h2>
-        <p>An advanced reference of all Angular Classes, Methods, etc.</p>
-        <p class="card-footer">View Quickstart</p>
-    </a>
-<div>
\ No newline at end of file
diff --git a/aio/content/marketing/docs.md b/aio/content/marketing/docs.md
new file mode 100644
index 0000000000..cf78c19bb6
--- /dev/null
+++ b/aio/content/marketing/docs.md
@@ -0,0 +1,48 @@
+@title
+Angular Docs
+
+@description
+
+<div class="card-container clearfix">
+
+    <a href="./guide/quickstart" class="card">
+        <h2>Quickstart</h2>
+        <p>A quick look at an Angular application.</p>
+        <p class="card-footer">View Quickstart</p>
+    </a>
+
+    <a href="guide/learning-angular" class="card">
+        <h2>Getting Started</h2>
+        <p>A beginner's guide to basic Angular concepts.</p>
+        <p class="card-footer">View Getting Started</p>
+    </a>
+
+    <a href="tutorial" class="card">
+        <h2>Tutorial</h2>
+        <p>The "Tour of Heroes" tutorial, a step-by-step.</p>
+        <p class="card-footer">View Tutorial</p>
+    </a>
+
+    <a href="api" class="card">
+        <h2>API Reference</h2>
+        <p>The developer's reference to Angular classes, methods, etc.</p>
+        <p class="card-footer">View API Reference</p>
+    </a>
+
+    <a href="guide/core" class="card">
+        <h2>Core Guide</h2>
+        <p>Core features of Angular.</p>
+        <p class="card-footer">View Core Guide</p>
+    </a>
+
+    <a href="guide/additional" class="card">
+        <h2>Additional Techniques</h2>
+        <p>Additional modules and techniques.</p>
+        <p class="card-footer">View Additional Techniques</p>
+    </a>
+
+<div>
+
+This is the Angular **version 4** documentation. See what's new in the [documentation changelog](guide/change-log). View the [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md) for enhancement and fixes to Angular itself.
+
+The Angular **version 2** documentation has been archived at [v2.angular.io](https://v2.angular.io "Angular v2 Docs").
diff --git a/aio/content/navigation.json b/aio/content/navigation.json
index bca49df174..607361d774 100644
--- a/aio/content/navigation.json
+++ b/aio/content/navigation.json
@@ -136,6 +136,7 @@
 
     {
       "title": "Core",
+      "url": "guide/core",
       "tooltip": "Learn the core capabilities of Angular",
       "children": [
         {
@@ -263,7 +264,8 @@
 
     {
       "title": "Additional Techniques",
-      "tooltip": "Other",
+      "url": "guide/additional",
+      "tooltip": "Additional modules and techniques",
       "children": [
         {
           "url": "guide/aot-compiler",