ce3930b2c0
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# harp.json
# public/_includes/_hero-home.jade
# public/_includes/_scripts-include.jade
# public/docs/_examples/quickstart/js/package.1.json
# public/docs/_includes/_side-nav.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/api/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/aot-compiler.jade
# public/docs/ts/latest/cookbook/ngmodule-faq.jade
# public/docs/ts/latest/cookbook/rc4-to-rc5.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-10-17 22:48:18 +01:00
492c01d0dd
docs(quickstart): fix link to styles.css ( #2575 )
2016-10-11 16:26:33 +02:00
78418f4d3c
调整additional的翻译
2016-10-06 19:38:32 +08:00
3a78f6d8c6
chore(docs): list minimum node as 4 ( #2547 )
2016-10-05 22:58:57 +01:00
56ac24b411
chore: fix broken links on 9/30, mostly API links ( #2520 )
2016-10-01 07:11:21 -07:00
9c090cc19f
remove 一个 from quickstart
2016-09-25 19:55:07 +01:00
f7c60a07df
fix： change all 他 > 它
2016-09-25 19:50:45 +01:00
d9af771f8d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# README.md
# public/contribute.jade
# public/docs/_includes/_side-nav.jade
# public/docs/_includes/_ts-temp.jade
# public/docs/index.jade
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/cookbook/index.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/cookbook/visual-studio-2015.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/browser-support.jade
# public/docs/ts/latest/guide/component-styles.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/guide/upgrade.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/index.jade
# public/support.jade
2016-09-23 22:13:02 +01:00
e847581b23
Merge pull request #71 from Hellowor1d/fix-spell-mistake
...
rename style.css to styles.css ,add "s"
2016-09-21 12:28:26 +01:00
693f6ae462
chore: rename Angular 2 to simply Angular ( #2402 )
2016-09-19 20:24:40 -07:00
6aeb8efaa3
fix: live example localisation.
2016-09-19 10:03:53 +01:00
5137a9d65c
fix: quickstart.jade
2016-09-19 09:44:43 +01:00
3ee4c3850f
rename style.css to styles.css ,add "s"
2016-09-19 11:14:31 +08:00
107e3cc7a7
更正一个typo
2016-09-17 18:07:51 +08:00
50f73986be
翻译完了NgModule FAQ
...
少量错别字修改
2016-09-17 11:45:56 +08:00
2417245114
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/_data.json
# public/_includes/_footer.jade
# public/_includes/_hero-home.jade
# public/_includes/_hero.jade
# public/_includes/_main-nav.jade
# public/_includes/_util-fns.jade
# public/docs/_includes/_side-nav.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/animations.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/style-guide.jade
# public/docs/ts/latest/guide/testing.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/testing/_data.json
# public/docs/ts/latest/testing/application-under-test.jade
# public/docs/ts/latest/testing/first-app-tests.jade
# public/docs/ts/latest/testing/index.jade
# public/docs/ts/latest/testing/jasmine-testing-101.jade
# public/docs/ts/latest/testing/testing-an-angular-pipe.jade
# public/index.jade
# public/resources/css/main.scss
# public/resources/css/module/_side-nav.scss
2016-09-15 15:23:48 +08:00
65db6b9268
design(style): Restyle changes from Alex
2016-09-14 17:18:55 -07:00
d86f25f9d0
更正github aruis指出的问题
2016-09-12 08:06:01 +08:00
3d40a26655
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cheatsheet.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/quickstart.jade
2016-09-11 21:20:58 +08:00
8a7165acf5
对上次的合并查漏补缺
2016-09-10 20:44:57 +08:00
969da7d321
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# README.md
# public/_includes/_scripts-include.jade
# public/docs/_examples/homepage-hello-world/ts/index.1.html
# public/docs/_examples/homepage-tabs/ts/index.1.html
# public/docs/_examples/homepage-todo/ts/index.1.html
# public/docs/_examples/systemjs.config.plunker.build.js
# public/docs/_examples/systemjs.config.plunker.js
# public/docs/js/latest/cookbook/ts-to-js.jade
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/component-communication.jade
# public/docs/ts/latest/cookbook/component-relative-paths.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/_data.json
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/index.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/ngmodule.jade
# public/docs/ts/latest/guide/npm-packages.jade
# public/docs/ts/latest/guide/security.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/typescript-configuration.jade
# public/docs/ts/latest/index.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/_data.json
# public/docs/ts/latest/tutorial/toh-pt6.jade
# public/features.jade
# public/resources/js/directives/live-example.js
# tools/plunker-builder/indexHtmlTranslator.js
2016-09-08 17:20:01 +08:00
b56e4c6fd3
docs(quickstart): fix broken link to tutorial ( #2278 )
2016-09-07 13:30:39 -07:00
59f6ebe849
docs(*): misc fixes to prose in support of jade2ng ( #2266 )
...
Fixes to prose “syntax”. Anomalies detected by jade2ng.
Also updated the main _utils-fn.jade in support of jade2ng as well.
2016-09-06 10:28:24 -07:00
b16b05805e
docs(quickstart): Minor typo fixes. ( #2253 )
2016-09-03 18:10:11 -07:00
a9e7781844
docs(quickstart): remove instruction ( #2261 )
2016-09-03 18:09:31 -07:00
94a40a1852
fix(quickstart): remove accidental space ( #2248 )
...
- Remove accidental space causing URL to be rendered incorrectly
2016-09-03 12:15:03 -07:00
f823605a22
chore: fix quickstart
2016-09-01 08:40:42 -07:00
38fe94df81
docs(qs-reboot): edits for the quickstart
2016-09-01 07:10:42 -07:00
aeec881c81
docs(quickstart): adjust recent change for Dart ( #2223 )
...
* Update cache
* docs(quickstart): tweak recent change
Tweak to prose so that `AppModule` shows up as `AppComponent` in Dart.
2016-08-30 13:56:00 -07:00
00a508aa63
docs(quickstart): fix typo
...
closes #2158
2016-08-24 23:43:38 -07:00
0cbabe283d
fix: quickstart
2016-08-24 15:01:37 +01:00
383b67d262
fix: quickstart format bug.
2016-08-24 10:15:46 +01:00
654030f09d
Merge remote-tracking branch 'remotes/angular.io/master'
...
# Conflicts:
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/lifecycle-hooks.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/guide/user-input.jade
# public/docs/ts/latest/guide/webpack.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt2.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-08-23 14:02:54 +01:00
68c15c12e5
docs({quickstart,di}): fix code excerpts and titles ( #2118 )
2016-08-17 09:21:11 -07:00
f26ec0a889
(review:) Quick starter and TOH, patch up new paragraphs and mis-alignments.
2016-08-16 10:16:31 +01:00
94aa3664ab
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# .gitignore
# public/docs/_examples/cb-component-communication/ts/app/app.component.ts
# public/docs/ts/latest/_data.json
# public/docs/ts/latest/cookbook/_data.json
# public/docs/ts/latest/cookbook/a1-a2-quick-reference.jade
# public/docs/ts/latest/cookbook/dependency-injection.jade
# public/docs/ts/latest/cookbook/dynamic-form.jade
# public/docs/ts/latest/cookbook/set-document-title.jade
# public/docs/ts/latest/glossary.jade
# public/docs/ts/latest/guide/architecture.jade
# public/docs/ts/latest/guide/attribute-directives.jade
# public/docs/ts/latest/guide/dependency-injection.jade
# public/docs/ts/latest/guide/forms.jade
# public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
# public/docs/ts/latest/guide/pipes.jade
# public/docs/ts/latest/guide/router.jade
# public/docs/ts/latest/guide/server-communication.jade
# public/docs/ts/latest/guide/template-syntax.jade
# public/docs/ts/latest/quickstart.jade
# public/docs/ts/latest/tutorial/toh-pt1.jade
# public/docs/ts/latest/tutorial/toh-pt3.jade
# public/docs/ts/latest/tutorial/toh-pt5.jade
# public/docs/ts/latest/tutorial/toh-pt6.jade
2016-08-12 07:57:51 +08:00
19d06061c5
docs(quickstart): post-RC5 Dart resync ( #2078 )
...
* docs(quickstart): post-RC5 Dart resync
- Resync Dart QS prose with TS, post RC5.
- Added to-be-shared Jade `var` definitions to `_util-fns.jade`.
- Delete cached QS jade file.
- Eliminate the stub file `styles.1.css` in favor of a `docregion` in
the main `styles.css`.
This commit requires a `gulp add-example-boilerplate` after pulling it in.
Contributes to #2077 .
* post-review edits
2016-08-10 13:32:07 -07:00
38a59f91bd
docs: small, quick fixes for RC5 including link repair. ( #2062 )
2016-08-09 15:56:47 -07:00
d79adb2422
docs(rc5): update docs and plunkers for rc5
2016-08-09 11:48:07 -07:00
e2892d1382
纠正一个翻译错误，来自wudingli。
2016-07-14 10:41:54 +08:00
c8ec2db73c
翻译了一个遗漏的新增英文
2016-07-14 10:06:13 +08:00
ac9e032b51
根据 wudingli 的反馈修正了翻译
2016-07-11 12:51:41 +08:00
6264d3bcde
批量把Provider/provide改译为提供商/提供，以和ISP（互联网服务提供商）的译法看齐
2016-07-07 08:22:36 +08:00
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
37b377ddb3
docs: update node and npm version recommendations
...
closes #1821
2016-07-05 23:09:37 -07:00
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
3c5a045633
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# public/docs/ts/latest/guide/router.jade
2016-07-02 19:16:00 +08:00
0ba3d5d8d6
docs(dart/{quickstart,toh-[56]}): fix project names ( #1773 )
...
- Renamed `angular2_getting_started` to `angular2_quickstart` (to match
TS).
- s/-/_/g in project names elsewhere (only toh-5 & -6 needed to be
updated).
Fixes #378 .
2016-07-01 11:05:45 -07:00
d5728d8b1c
minor correction to quickstart.jade and review of router.jade to line 903.
2016-06-29 17:04:22 +01:00
64b9e476fb
把alternative统一改为备选或替代品（取决于语境）
2016-06-21 07:54:34 +08:00
rexebin
Jesús Rodríguez
Zhicheng Wang
Filipe Silva
Ward Bell
HelloWor1d
Alex Wolfe
Patrice Chalin
Aristeidis Bampakos
Wesley Cho
Naomi Black
Peter Bacon Darwin
Patrice Chalin