From fc6e68dc5c1a7628be70b6318ad211603b01c48d Mon Sep 17 00:00:00 2001
From: Zhicheng Wang <zcwang@thoughtworks.com>
Date: Wed, 29 Jun 2016 10:39:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A6=96=E9=A1=B5=20?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/_includes/_main-nav.jade             | 4 ++--
 public/docs/ts/latest/tutorial/toh-pt6.jade | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/public/_includes/_main-nav.jade b/public/_includes/_main-nav.jade
index edd3d6457a..f759f00097 100644
--- a/public/_includes/_main-nav.jade
+++ b/public/_includes/_main-nav.jade
@@ -10,10 +10,10 @@ md-toolbar(class="main-nav background-regal l-pinned-top l-layer-5",scroll-y-off
     ul(ng-class="appCtrl.showMainNav ? 'is-visible' : ''")
       li.l-left <a class="main-nav-button" href="/features.html" md-button>特性</a>
       li.l-left <a class="main-nav-button" href="/docs/#{language}/latest/" md-button>文档</a>
-      li.l-left <a class="main-nav-button" href="/events.html" md-button>事件</a>
+      li.l-left <a class="main-nav-button" href="/events.html" md-button>开发者会议</a>
       li.l-left <a class="main-nav-button" href="/news.html" md-button>新闻</a>
       li.l-left <a class="main-nav-button" href="/translate/cn/about.html" md-button>关于中文版</a>
-      li.l-left <a class="main-nav-button" href="https://angular.io/" md-button target="_blank">官网(被墙)</a>
+      li.l-left <a class="main-nav-button" href="https://angular.io/" md-button target="_blank">官网</a>
       li.l-right <a class="main-nav-button" href="/docs/ts/latest/quickstart.html" md-button>立即开始！</a>
       li.l-right
         a.main-nav-button.md-button(ng-click="appCtrl.toggleSource($event)", href)
diff --git a/public/docs/ts/latest/tutorial/toh-pt6.jade b/public/docs/ts/latest/tutorial/toh-pt6.jade
index db6308b4df..f36cb8c572 100644
--- a/public/docs/ts/latest/tutorial/toh-pt6.jade
+++ b/public/docs/ts/latest/tutorial/toh-pt6.jade
@@ -355,6 +355,7 @@ block get-heroes-details
   ### Put
 
   Put will be used to update an individual hero. Its structure is very similar to Post requests. The only difference is that we have to change the url slightly by appending the id of the hero we want to update.
+  
   Put用来编辑一个指定的英雄，但是代码结构和POST请求很相似。唯一的不同是，我们要修改url，为它附加上我们想要编辑的那位英雄的id。
 
 +makeExcerpt('app/hero.service.ts', 'put')