Zhicheng Wang
9a0d3e9633
docs: 手动解决冲突
2018-10-22 18:16:47 +08:00
Zhicheng Wang
a9ac90d3df
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/ajs-quick-reference.md
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-next-steps.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/comparing-observables.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-pattern.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/elements.md
# aio/content/guide/feature-modules.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/i18n.md
# aio/content/guide/lazy-loading-ngmodules.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule-vs-jsmodule.md
# aio/content/guide/ngmodules.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables-in-angular.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/practical-observable-usage.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-communications.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/service-worker-intro.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/singleton-services.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/updating.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/marketing/docs.md
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt2.md
# aio/content/tutorial/toh-pt3.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/ngsw-manifest.json
# aio/package.json
# aio/src/app/custom-elements/api/api-list.component.html
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/index.html
# aio/tools/transforms/templates/api/base.template.html
# aio/tools/transforms/templates/api/class.template.html
# aio/tools/transforms/templates/api/directive.template.html
# aio/tools/transforms/templates/api/enum.template.html
# aio/tools/transforms/templates/api/includes/class-overview.html
# aio/tools/transforms/templates/api/includes/deprecation.html
# aio/tools/transforms/templates/api/includes/export-as.html
# aio/tools/transforms/templates/api/includes/info-bar.html
# aio/tools/transforms/templates/api/includes/interface-overview.html
# aio/tools/transforms/templates/api/includes/selectors.html
# aio/tools/transforms/templates/api/lib/directiveHelpers.html
# aio/tools/transforms/templates/api/lib/githubLinks.html
# aio/tools/transforms/templates/api/lib/memberHelpers.html
# aio/tools/transforms/templates/api/package.template.html
# aio/yarn.lock
# packages/common/http/src/module.ts
# packages/common/src/common_module.ts
# packages/common/src/directives/ng_for_of.ts
# packages/common/src/directives/ng_if.ts
# packages/common/src/directives/ng_template_outlet.ts
# packages/common/src/location/location.ts
# packages/common/src/pipes/async_pipe.ts
# packages/common/src/pipes/json_pipe.ts
# packages/common/src/pipes/number_pipe.ts
# packages/common/src/pipes/slice_pipe.ts
# packages/core/src/change_detection/change_detector_ref.ts
# packages/core/src/di/injectable.ts
# packages/core/src/linker/template_ref.ts
# packages/core/src/linker/view_container_ref.ts
# packages/core/src/metadata/di.ts
# packages/core/src/metadata/ng_module.ts
# packages/core/src/render/api.ts
# packages/forms/src/directives/form_interface.ts
# packages/forms/src/directives/ng_form.ts
# packages/forms/src/directives/ng_model.ts
# packages/forms/src/directives/reactive_directives/form_control_name.ts
# packages/forms/src/directives/select_control_value_accessor.ts
# packages/forms/src/directives/validators.ts
# packages/forms/src/form_providers.ts
# packages/forms/src/model.ts
# packages/forms/src/validators.ts
# packages/router/src/config.ts
# packages/router/src/router.ts
# packages/router/src/router_module.ts
# packages/router/src/router_state.ts
2018-10-21 17:43:29 +08:00
William Marques
fc6dad40ac
fix(docs-infra): rename "title" by "header" to avoid unwanted tooltips ( #26396 )
...
Closes #26174
PR Close #26396
2018-10-17 11:05:29 -07:00
Vani
f6a2dbf4f5
docs: updated text to match the Getting started guide ( #26421 )
...
PR Close #26421
2018-10-16 14:11:12 -07:00
Wei Lun
8e71ad6027
docs: typo on function name for handleError() ( #26261 )
...
changed function name `errorHandle()` to `handleError()`
PR Close #26261
2018-10-09 16:54:15 -07:00
Vani
c7e2930f25
docs: fix issues related to tutorial. ( #24445 )
...
PR Close #24445
2018-09-25 18:45:19 -07:00
Max Belsky
cf095d982d
docs: fix a typo ( #26074 )
...
PR Close #26074
2018-09-24 13:48:24 -07:00
Zhicheng Wang
c0b01ff6f5
chore: 指向 material.angular.cn
2018-09-21 10:14:20 +08:00
Jonathan Pool
bd0eb0d1d4
docs: correct misspellings and add missing punctuation in tutorial ( #25676 )
...
PR Close #25676
2018-09-04 12:08:52 -07:00
Frederik Schlemmer
9ee29ecdd4
docs: clarification of hero selection in routing section ( #25634 )
...
PR Close #25634
2018-08-28 22:16:18 -04:00
Eve
dbcc55f386
fix:错别字及语法
2018-08-24 09:16:48 +08:00
Ana María Martínez Gómez
cc55d609ce
docs: add HttpClientModule import code to services tutorial ( #24854 )
...
To be able to copy and paste.
PR Close #24854
2018-08-16 13:51:18 -07:00
René Ras
6861bc5b06
docs: clarify heroes example ( #21216 )
...
PR Close #21216
2018-08-06 13:44:17 -07:00
Stephon Harris
1dd2eaa7d2
docs: fix typos and missing word in tutorial ( #20764 )
...
PR Close #20764
2018-08-01 10:56:31 -07:00
firrae
4976a58780
docs: update to account for CLI changes ( #25223 )
...
This should help clarify the use of providedIn and correct the documentation where it was showing the use of a now depreciated CLI command flag.
I am openly looking for feedback on this change to figure out the best wording.
PR Close #25223
2018-08-01 10:51:05 -07:00
Frederik Schlemmer
a1b185b723
docs: Change unnecessary step in ToH-Tutorial ( #25059 )
...
PR Close #25059
2018-07-27 09:25:59 -07:00
Zhicheng Wang
2d485c6589
Merge remote-tracking branch 'en/master' into aio
...
# Conflicts:
# aio/content/guide/animations.md
# aio/content/guide/aot-compiler.md
# aio/content/guide/api-page-class.md
# aio/content/guide/architecture-components.md
# aio/content/guide/architecture-modules.md
# aio/content/guide/architecture-services.md
# aio/content/guide/architecture.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/browser-support.md
# aio/content/guide/component-interaction.md
# aio/content/guide/component-styles.md
# aio/content/guide/dependency-injection-in-action.md
# aio/content/guide/dependency-injection-pattern.md
# aio/content/guide/dependency-injection.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/elements.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/frequent-ngmodules.md
# aio/content/guide/glossary.md
# aio/content/guide/hierarchical-dependency-injection.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/language-service.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-api.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/npm-packages.md
# aio/content/guide/observables.md
# aio/content/guide/pipes.md
# aio/content/guide/providers.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/releases.md
# aio/content/guide/router.md
# aio/content/guide/rx-library.md
# aio/content/guide/security.md
# aio/content/guide/service-worker-config.md
# aio/content/guide/service-worker-getting-started.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup.md
# aio/content/guide/structural-directives.md
# aio/content/guide/styleguide.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing-observables.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/universal.md
# aio/content/guide/upgrade.md
# aio/content/guide/user-input.md
# aio/content/guide/visual-studio-2015.md
# aio/content/guide/webpack.md
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/content/tutorial/toh-pt0.md
# aio/content/tutorial/toh-pt1.md
# aio/content/tutorial/toh-pt4.md
# aio/content/tutorial/toh-pt5.md
# aio/content/tutorial/toh-pt6.md
# aio/src/app/custom-elements/api/api-list.component.ts
# aio/src/app/custom-elements/live-example/live-example.component.html
# aio/src/app/custom-elements/live-example/live-example.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/styles/main.scss
# aio/tools/transforms/remark-package/services/renderMarkdown.js
2018-07-27 10:51:18 +08:00
Zhicheng Wang
19da605eae
fix: 翻译微调 ( #322 )
...
fix: 增补鸣谢清单
2018-07-27 08:15:48 +08:00
Kang Li
5b483ae41e
Update toh-pt2.md
2018-07-27 07:47:10 +08:00
Stefanie Fluin
d523630ea2
docs(aio): cleanup aalert, callout, subsection use and author style ( #24986 )
...
PR Close #24986
2018-07-24 08:22:14 -07:00
ampGular
56a8533cf3
docs: add app.module to changed documents ( #23876 )
...
PR Close #23876
2018-07-06 10:10:20 -07:00
Zhicheng Wang
bb515e2f4f
fix: 翻译错误
2018-06-20 09:03:45 +08:00
Kyle Liu
7c39216083
docs(aio): fix typo for @NgModuledecorator to @NgModule decorator ( #24201 )
...
closes #23974
PR Close #24201
2018-05-30 11:24:12 -07:00
Zhicheng Wang
23f1e76479
fix: 翻译微调
2018-05-25 12:56:56 +08:00
Chris Yu
d6e2a8f614
fixed some translation errors and typo
2018-05-19 10:53:47 +08:00
Zhicheng Wang
2867ceecdb
fix: sync to 6.0(WIP)
2018-05-15 13:32:40 +08:00
Vani
43a49d3f64
docs: fix typo ( #23514 )
...
PR Close #23514
2018-04-24 14:43:34 -07:00
Eyal Cherevatzki
c3280b2c2f
docs(aio): change HeroService to MessagesComponent ( #23397 )
...
Someone probably forgot to change this when coping the sentence from a previous section.
PR Close #23397
2018-04-16 09:01:58 -07:00
Eyal Cherevatzki
d11b249d36
docs(aio): change HeroDetailsComponent to HeroDetailComponent ( #23397 )
...
For the sake of consistency, change `HeroDetailsComponent` to `HeroDetailComponent`.
PR Close #23397
2018-04-16 09:01:58 -07:00
Michael Huang
f958293205
docs(aio): update text InMemoryWebApiModule to HttpClientInMemoryWebApiModule ( #23285 )
...
PR Close #23285
2018-04-12 23:17:19 -07:00
Judy Bogart
1fac5f4eb1
docs: recommend best practice for providers ( #22934 )
...
PR Close #22934
2018-04-06 21:49:34 -07:00
jenniferfell
a4bf5621ed
docs: add reference to ng add in tutorial and quick reference ( #23130 )
...
PR Close #23130
2018-04-03 07:38:47 -07:00
Zhicheng Wang
4aeff82d53
fix: 文字微调
2018-04-03 10:34:27 +08:00
Judy Bogart
9f7bd8f618
docs: update text around changed obs examples ( #22920 )
...
PR Close #22920
2018-03-29 09:20:04 -07:00
ChristinaLy
47f73c2795
fix issue #290
...
文件拓展名翻译错误
2018-03-28 08:30:27 +08:00
ChristinaLy
86cc002b7e
修改翻译错误
...
inject into any class that asks for it应该翻译为“把它注入到任何请求注入的类中”
2018-03-28 08:30:27 +08:00
Zhicheng Wang
e167fa5229
refactor: 重构自动翻译代码
2018-03-24 20:03:10 +08:00
Zhicheng Wang
6c3d57aee9
fix: 合并了最新版本
2018-03-24 13:12:42 +08:00
Zhicheng Wang
c20a841249
fix: 部分 更新 替换成 修改
2018-03-23 09:48:55 +08:00
Zhicheng Wang
545d4b6c69
feat: 自动在中英文之间添加空格，以改善排版
2018-03-20 17:09:18 +08:00
Zhicheng Wang
e0fc873240
fix: minor fix and auto translate based on previous result
2018-03-18 07:44:33 +08:00
Zhicheng Wang
0c420c2efc
fix: 纠正错误及翻译遗漏的部分
2018-03-12 13:04:48 +08:00
Zhicheng Wang
636c072823
fix: 教程中的“我们”改成了“你”
2018-03-09 13:30:42 +08:00
Zhicheng Wang
524bb11cd5
fix: 公开改为公共
2018-03-09 13:23:04 +08:00
Zhicheng Wang
ead2165315
fix: 翻译了 toh-pt6
2018-03-09 13:17:13 +08:00
Zhicheng Wang
ed1ff926d8
fix: 翻译了 toh-pt5
2018-03-09 10:17:29 +08:00
Zhicheng Wang
45a14d1cc0
fix: 翻译了 toh-pt0 ~ toh-pt4
2018-03-08 17:07:55 +08:00
Zhicheng Wang
09d93793ff
fix: 翻译了 应用的壳 一章
2018-03-08 13:09:40 +08:00
Kapunahele Wong
065bcc5aad
docs: add HeroService to code tabs and fix headers ( #22373 )
...
PR Close #22373
2018-03-07 18:20:53 -08:00
Zhicheng Wang
b7ceb9e211
fix: 修正了死链接
2018-03-07 16:48:44 +08:00
