171 Commits

Author SHA1 Message Date
Zhicheng Wang
210b076594 根据网上反馈去掉了路由名字,新版已经不需要了。 2016-07-11 12:46:21 +08:00
Zhicheng Wang
6264d3bcde 批量把Provider/provide改译为提供商/提供,以和ISP(互联网服务提供商)的译法看齐 2016-07-07 08:22:36 +08:00
Zhicheng Wang
0303a18020 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/pipes.jade
#	public/docs/ts/latest/guide/security.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/structural-directives.jade
#	public/docs/ts/latest/quickstart.jade
#	public/docs/ts/latest/testing/testing-an-angular-pipe.jade
#	public/docs/ts/latest/tutorial/index.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
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-07-07 08:15:51 +08:00
Patrice Chalin
b0e0d94b5c docs: revert Jade to markdown
closes #1818
Previously, the markdown of some chapters was converted to Jade markup
to support the conditional exclusion of TS prose parts in Dart
chapters. This commit reverts some of that back to clean markdown,
thanks to a few custom directives.
2016-07-05 23:03:30 -07:00
Zhicheng Wang
be4748bce0 修改了一系列小bug
微调“关于”页面
2016-07-05 08:35:08 +08:00
Zhimin YE (Rex)
24ab1e5fcc Chore: break a line in toh-pt1 2016-07-04 12:00:32 +01:00
Zhicheng Wang
1a806de866 移除行尾不必要的空格 2016-07-01 08:26:45 +08:00
Zhicheng Wang
dfc20a6adc Merge remote-tracking branch 'cn/master' 2016-07-01 08:25:35 +08:00
Zhicheng Wang
21fe9dc1d2 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/docs/js/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/lifecycle-hooks.jade
#	public/docs/ts/latest/guide/router.jade
#	public/docs/ts/latest/guide/server-communication.jade
#	public/docs/ts/latest/guide/style-guide.jade
#	public/docs/ts/latest/guide/template-syntax.jade
#	public/docs/ts/latest/testing/first-app-tests.jade
#	public/docs/ts/latest/tutorial/toh-pt5.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
#	public/news.jade
2016-07-01 08:24:23 +08:00
Rex
fa9e83358c review(toh-pt6): done. 2016-06-30 20:35:04 +01:00
Zhimin YE (Rex)
1f883722c9 review(toh-pt6): line 243 2016-06-30 17:08:34 +01:00
Zhicheng Wang
fc6e68dc5c 调整首页
内容微调
2016-06-29 10:41:21 +08:00
Brandon Roberts
97fbda0d76 docs(toh-6/ts): Upgraded http tutorial to use new router 2016-06-28 13:03:04 -07:00
Brandon Roberts
f3189546a6 docs(toh-5): Upgraded tutorial to new router 2016-06-28 12:52:47 -07:00
Zhicheng Wang
d7a71ccf59 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/security.jade
#	public/docs/ts/latest/tutorial/toh-pt6.jade
2016-06-28 09:40:49 +08:00
Patrice Chalin
3fe0fb077c docs(toh-6/ts): minor edits and enhancements (#1686)
* docs(toh-6/ts): minor edits and enhancements

Changes to prose:

- Complete TODO item of displaying `heroes.component` errors.
- Mainly copyedits.
- Add of blocks statements so that prose can be used on Dart side.
- Show excerpt and briefly explain of changes (previously missing):
  - `app/hero-detail.component.html`
  - `app/heroes.component.ts` error handling
- Add missing file to changed/added files listing and makeTabs
  - `toh-6/ts/app/in-memory-data.service.ts,
  - `toh-6/ts/sample.css`

Code changes:

- Mainly copyedits
- Renamed `heroes.component.ts` `delete` to `deleteHero` to match
naming of other methods

* remove unnecessary change relative to toh-5
2016-06-27 11:23:27 -07:00
Zhicheng Wang
52c118ef8a 微调 2016-06-20 15:55:30 +08:00
Zhicheng Wang
d1db5bfb72 翻译了教程中的HTTP一章 2016-06-17 23:13:23 +08:00
Zhicheng Wang
c889525461 begin translate toh-pt6 2016-06-16 21:51:57 +08:00
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