From ac0e82cda786092f1211efa88ad7472cc9750858 Mon Sep 17 00:00:00 2001
From: Ward Bell <wardbell@hotmail.com>
Date: Sat, 24 Sep 2016 14:30:06 -0700
Subject: [PATCH] docs(js/guide): don't use shredder & _data.json fixes (#2467)

replay Patrice's PR #2448
---
 public/docs/js/latest/guide/_data.json |  4 ++--
 public/docs/js/latest/guide/index.jade | 22 +++++++++++-----------
 public/docs/ts/latest/guide/index.jade | 12 ++++--------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/public/docs/js/latest/guide/_data.json b/public/docs/js/latest/guide/_data.json
index 72977625c0..b3b33214c3 100644
--- a/public/docs/js/latest/guide/_data.json
+++ b/public/docs/js/latest/guide/_data.json
@@ -108,7 +108,7 @@
 
   "npm-packages": {
     "title": "Npm Packages",
-    "intro": "Details of the recommended npm packages and the different kinds of package dependencies"
+    "intro": "Recommended npm packages, and how to specify package dependencies"
   },
 
   "pipes": {
@@ -123,7 +123,7 @@
 
   "security": {
     "title": "Security",
-    "intro": "Prevent security vulnerabilities"
+    "intro": "Developing for content security in Angular applications"
   },
 
   "structural-directives": {
diff --git a/public/docs/js/latest/guide/index.jade b/public/docs/js/latest/guide/index.jade
index 4af0447111..c29be81578 100644
--- a/public/docs/js/latest/guide/index.jade
+++ b/public/docs/js/latest/guide/index.jade
@@ -1,12 +1,12 @@
-include ../_util-fns
+extends ../../../ts/latest/guide/index.jade
 
-+includeShared('{ts}', 'intro')
-+includeShared('{ts}', 'how-to-read-1')
-.alert.is-important
-  :marked
-    Most of the documentation has been written for TypeScript developers
-    and has not yet been translated to JavaScript.
-    Please bear with us. Meanwhile, we've provide links to the TypeScript chapters
-    where JavaScript versions are unavailable.
-+includeShared('{ts}', 'how-to-read-2')
-+includeShared('{ts}', 'the-rest')
+block includes
+  include ../_util-fns
+
+block js-alert
+  .alert.is-important
+    :marked
+      Most of the documentation has been written for TypeScript developers
+      and has not yet been translated to JavaScript.
+      Please bear with us. Meanwhile, we've provide links to the TypeScript chapters
+      where JavaScript versions are unavailable.
diff --git a/public/docs/ts/latest/guide/index.jade b/public/docs/ts/latest/guide/index.jade
index 3868c3c573..6af522624c 100644
--- a/public/docs/ts/latest/guide/index.jade
+++ b/public/docs/ts/latest/guide/index.jade
@@ -1,7 +1,6 @@
 block includes
   include ../_util-fns
 
-// #docregion intro
 - var langName = current.path[1] == 'ts' ? 'TypeScript' : 'JavaScript'
 figure
   img(src="/resources/images/devguide/intro/people.png" alt="Us" align="left" style="width:200px; margin-left:-40px;margin-right:10px" )
@@ -10,17 +9,16 @@ figure
   are building client applications in HTML and #{langName}.
 
   <br clear="all">
-// #enddocregion intro
 
-// #docregion how-to-read-1
 <a id="learning-path"></a>
 :marked
   # Organization
 
   The documentation is divided into major thematic sections, each
   a collection of pages devoted to that theme.
-// #enddocregion how-to-read-1
-// #docregion how-to-read-2
+
+block js-alert
+
 - var top="vertical-align:top"
 table(width="100%")
   col(width="15%")
@@ -83,8 +81,7 @@ table(width="100%")
   1. [Template Syntax](template-syntax.html) is a comprehensive study of Angular template HTML.
 
   After reading the above sections, you can skip to any other pages on this site.
-// #enddocregion how-to-read-2
-// #docregion the-rest
+
 :marked
   # Code samples
 
@@ -119,4 +116,3 @@ block example-links
 
 
   Use the [Angular Github repo](https://github.com/angular/angular) to report issues with **Angular** itself.
-// #enddocregion the-rest