152 Commits

Author SHA1 Message Date
Zhicheng Wang
20c59f9e4a Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:31:28 +08:00
Zhicheng Wang
c1b8183c38 Add some blank lines, to avoid unnecessary conflicts on merging. 2016-06-15 23:21:05 +08:00
Zhicheng Wang
6a5f4a0fc2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-15 23:10:41 +08:00
Patrice Chalin
6e5d8e6491 docs(toh-5/dart): review edits and code cleanup (#1643) 2016-06-15 07:46:26 -07:00
Zhicheng Wang
7995cb4897 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-14 14:04:30 +08:00
Zhicheng Wang
bc2e4b83c0 把所有全角括号改成了半角的 2016-06-14 09:26:54 +08:00
Zhicheng Wang
c1051cc8e1 微调
为词汇表加上了双语备注
2016-06-14 07:54:46 +08:00
Patrice Chalin
ca2e5c5d1d docs(toh-4/ts): copyedits
closes #1638
2016-06-13 11:40:30 -07:00
Helmi
7f256eea75 Fix typo in 'Simulating the web api' section.
closes #1655
2016-06-13 11:05:15 -07:00
Foxandxss
61ad427319 docs(toh): add missing snippets
closes #1649
2016-06-13 10:46:53 -07:00
Patrice Chalin
fd46bf4970 docs(toh-5/ts): minor edits
closes #1644
2016-06-13 10:45:23 -07:00
Patrice Chalin
070cb5a193 docs(toh-3/ts): copyedits
closes #1630
2016-06-13 10:36:04 -07:00
Patrice Chalin
16848fc822 docs(toh-2/ts): copyedits
closes #1622
2016-06-13 10:34:19 -07:00
Patrice Chalin
2fc7e5ab50 docs(toh-1/ts): minor edits
closes #1615
- Fixed HTML.
- Removed unnecessary snippet since it is in the code.
- Copyedit: (Hero property) -> (hero property).
2016-06-13 10:28:04 -07:00
Zhicheng Wang
f389c57ede 来自网友Z的修改意见 2016-06-13 17:22:28 +08:00
Zhicheng Wang
c802c2b5dc 来自网友张旋和Z的修改意见 2016-06-13 17:20:08 +08:00
Zhicheng Wang
164244d77a 修正了api的链接(仅中文版) 2016-06-10 14:45:12 +08:00
Zhicheng Wang
f2dbdb3163 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/_examples/cb-component-communication/ts/app/app.component.ts
#	public/docs/_examples/dependency-injection/ts/app/main.1.ts
#	public/docs/ts/latest/tutorial/toh-pt1.jade
#	public/docs/ts/latest/tutorial/toh-pt2.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-08 10:02:24 +08:00
Patrice Chalin
7e52648ee7 docs(toh): update live example links (#1602) 2016-06-07 15:51:25 -07:00
Zhicheng Wang
0a967baf51 Merge remote-tracking branch 'origin/master' 2016-06-07 09:47:24 +08:00
jevonearth
f7cf6fde9f docs(toh-6): Fix typo in 'Add/Delete in the HeroesComponent' section.
closes #1603
2016-06-06 17:28:07 -07:00
Zhimin(Rex) YE
633964ac2f Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/upgrade.jade
2016-06-04 17:52:51 +01:00
twinssbc
6f02f76fc2 docs: remove duplicated words in toh-pt6.jade
closes #1575
2016-06-04 01:25:41 -07:00
Anastasia Kozaeva
2f3cb405e8 Fix typo in 'Error Handling' section
closes #1592
Remove duplicate 'to'
2016-06-04 01:24:00 -07:00
Zhimin YE (Rex)
72efc8f055 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	README.md
#	public/contribute.jade
#	public/docs/_examples/cb-component-communication/e2e-spec.ts
#	public/docs/ts/latest/glossary.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/guide/webpack.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-06-01 09:51:27 +01:00
Anderson
301aadddde docs(toh-pt6): fix filename typo 2016-06-01 01:19:37 -07:00
Vikash
8569479423 docs: fix numerous typos in many doc files.
closes #1509
2016-06-01 01:08:56 -07:00
Ward Bell
2f115a3425 chore: fix broken devguide links as of May 31
Did not fix broken Dart and API links
2016-06-01 00:52:22 -07:00
Christopher Thorne
2d27097d55 docs(toh-pt6): correct DetailHeroComponent to HeroDetailComponent
closes #1550
2016-05-31 22:32:55 -07:00
Christopher Thorne
3d868da4b7 docs(toh-pt5): change getHero to match toh-pt6 getHero
closes #1551
2016-05-31 22:31:04 -07:00
Zhicheng Wang
752a152731 Merge remote-tracking branch 'origin/master'
upgrade.jade的附录没有翻译

# Conflicts:
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/npm-packages.jade
#	public/docs/ts/latest/guide/upgrade.jade
#	public/docs/ts/latest/quickstart.jade
#	public/index.jade
2016-05-30 21:46:16 +08:00
Foxandxss
2bc166c34f docs(toh): fix some header extensions
closes #1549
2016-05-29 14:36:10 -07:00
Zhimin YE (Rex)
17d6eeb1e2 Merge remote-tracking branch 'remotes/angular.io/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
2016-05-25 11:13:25 +01:00
Zhicheng Wang
cb756a5a05 统一了大量Attribute和Property的翻译
更新了小抄
调整了翻译样式
2016-05-24 11:33:50 +08:00
Foxandxss
508b779a41 docs(toh): add instructions to add the goBack method
closes #1478
2016-05-23 12:18:46 -07:00
Foxandxss
129b34c77e docs(toh): update HTTP chapter with style guide conventions
closes #1477
2016-05-23 12:15:10 -07:00
Zhicheng Wang
ae3b205c77 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/tutorial/toh-pt3.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-21 21:02:15 +08:00
Foxandxss
33b5829b25 docs(toh): put a bit of clarification
closes #1352
2016-05-20 23:40:55 -07:00
Ward Bell
f9fea00824 docs(component-relative-paths): new cookbook 2016-05-20 20:33:38 -07:00
Zhicheng Wang
29df35d724 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/docs/ts/latest/tutorial/index.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
2016-05-20 15:34:27 +08:00
Ward Bell
3324bd944d docs(toh-6): fix broken 'Add Hero' and fill in instructional gaps 2016-05-19 19:00:20 -07:00
Zhicheng Wang
aadbeb3ae9 修正一些合并中的问题 2016-05-19 19:23:01 +08:00
Ward Bell
a4bc455030 docs(toh): remove unneeded directive from heroes.component 2016-05-19 00:57:35 -07:00
Ward Bell
e91659ac13 docs(tutorial/ts): delete tutorial sample in favor of toh-6 2016-05-19 00:30:30 -07:00
Torgeir Helgevold
e4db340464 docs:(TOH chapter on Http) New Tour of Hero Chapter on Http 2016-05-18 23:38:08 -07:00
Zhicheng Wang
5f1f27e09c Merge remote-tracking branch 'origin/master'
# Conflicts:
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/guide/_data.json
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/index.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/tutorial/toh-pt4.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/news.jade
#	public/resources/index.jade
2016-05-19 13:33:02 +08:00
Zhicheng Wang
86d151c40e 把QuickStart改成“快速起步” 2016-05-18 13:30:07 +08:00
Zhicheng Wang
fd69ea3270 把部分expose统一译为暴露 2016-05-16 23:15:02 +08:00
Zhicheng Wang
898539d8d5 基础知识-显示数据 一审了一半儿 2016-05-16 13:44:00 +08:00
Zhicheng Wang
0ee5264d19 实现了显示/隐藏原文的功能
用jqLite重构了翻译逻辑
2016-05-15 21:28:20 +08:00