Zhicheng Wang
89060a39df
fix: 不正常的中英文段落合并
2018-02-28 13:44:53 +08:00
Zhicheng Wang
c08a3830df
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.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/change-log.md
# aio/content/guide/component-styles.md
# aio/content/guide/deployment.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/pipes.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.md
# aio/content/guide/setup.md
# aio/content/guide/testing.md
# aio/content/guide/typescript-configuration.md
# aio/content/guide/upgrade.md
# aio/content/marketing/docs.md
# aio/content/marketing/features.html
# aio/content/marketing/resources.json
# aio/content/navigation.json
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
2018-02-28 13:13:29 +08:00
Zhicheng Wang
1531b0610d
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/attribute-directives.md
# aio/content/guide/bootstrapping.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/form-validation.md
# aio/content/guide/forms.md
# aio/content/guide/glossary.md
# aio/content/guide/http.md
# aio/content/guide/i18n.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/structural-directives.md
# aio/content/guide/template-syntax.md
# aio/content/guide/testing.md
# aio/content/marketing/index.html
# aio/content/navigation.json
# aio/content/tutorial/index.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/src/app/embedded/api/api-list.component.ts
# aio/src/app/layout/doc-viewer/doc-viewer.component.ts
# aio/src/app/layout/footer/footer.component.html
# aio/src/app/layout/toc/toc.component.html
# aio/src/app/search/search.service.ts
# aio/src/styles/1-layouts/_marketing-layout.scss
# aio/yarn.lock
2018-02-28 08:08:59 +08:00
Kapunahele Wong
53f91189a1
docs(aio): add NgModule docs ( #20306 )
...
PR Close #20306
2018-01-10 16:26:46 -08:00
Ward Bell
816d5ba3fd
docs: NgModule guide prose for CLI (partial) ( #19776 )
...
Also replaces “Angular Module” with “NgModule” wherever that is clarifying.
Continue using “module” when qualified as in “feature module”, “root module”, “routing module”, etc.
PR Close #19776
2017-11-20 18:39:25 -06:00
Ward Bell
c03186013c
docs: Dependency Injection guides for CLI ( #19892 )
...
PR Close #19892
2017-11-14 10:00:28 -08:00
Zhicheng Wang
0ddf72745e
fix: translate all pure english titles
2017-08-04 14:06:15 +08:00
Zhicheng Wang
c002fddabe
fix: many of broken links
2017-07-30 12:32:56 +08:00
Zhicheng Wang
f2059b445c
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.md
# aio/content/guide/attribute-directives.md
# aio/content/guide/bootstrapping.md
# aio/content/guide/browser-support.md
# aio/content/guide/cb-index.md
# aio/content/guide/change-log.md
# aio/content/guide/cheatsheet.md
# aio/content/guide/cli-quickstart.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.md
# aio/content/guide/deployment.md
# aio/content/guide/displaying-data.md
# aio/content/guide/dynamic-component-loader.md
# aio/content/guide/dynamic-form.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/index.md
# aio/content/guide/learning-angular.md
# aio/content/guide/lifecycle-hooks.md
# aio/content/guide/ngmodule-faq.md
# aio/content/guide/ngmodule.md
# aio/content/guide/npm-packages.md
# aio/content/guide/pipes.md
# aio/content/guide/quickstart.md
# aio/content/guide/reactive-forms.md
# aio/content/guide/router.md
# aio/content/guide/security.md
# aio/content/guide/server-communication.md
# aio/content/guide/set-document-title.md
# aio/content/guide/setup-systemjs-anatomy.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.md
# aio/content/guide/ts-to-js.md
# aio/content/guide/typescript-configuration.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/navigation.json
# aio/content/tutorial/index.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/package.json
# aio/src/styles/main.scss
# aio/transforms/angular.io-package/index.js
2017-07-30 00:09:50 +08:00
Zhicheng Wang
20a55c54ed
docs(aio): merge latest chinese translations
2017-07-23 11:51:25 +08:00
Jesús Rodríguez
cd5bc64658
docs(aio): update headers for toc ( #16969 )
2017-05-26 13:28:06 -06:00
Jesús Rodríguez
03610526e5
docs(aio): remove hardcoded TOC
2017-05-04 15:51:37 -07:00
Jesus Rodriguez
ff32c53099
docs(aio): fix lots of broken links
...
Closes #16317
2017-05-01 15:51:26 -07:00
Jesus Rodriguez
cbe5f78c1a
docs(aio): fix old jade on DI
2017-04-21 16:01:20 +01:00
Jesus Rodriguez
061475402c
docs(aio): final migration from old site
2017-04-12 21:01:55 +01:00
Peter Bacon Darwin
df619adc76
docs(aio): update to remark syntax
2017-04-12 12:24:02 -07:00
Jesus Rodriguez
0e38bf9de0
build(aio): new migration
2017-04-03 15:41:05 -07:00
Peter Bacon Darwin
46f8a6dd85
docs(aio): remove unnecessary blank lines
2017-03-31 16:22:08 +01:00
Peter Bacon Darwin
2d14c3b17a
docs(aio): ensure blank lines before HTML blocks in markdown
2017-03-31 08:05:33 +01:00
Peter Bacon Darwin
fd72fad8fd
docs(aio): update migrated content from anguar.io
2017-03-28 10:21:46 +01:00
Peter Bacon Darwin
ab40fcb068
docs(aio): fix relative links
...
The migrator was updated to automatically fix these links.
See fca5fb02803927b7a038
2017-03-13 16:56:23 -07:00
Peter Bacon Darwin
3e34ba01bd
docs(aio): migrate content docs from angular.io
...
This content was generated by a tool: https://github.com/petebacondarwin/aio-migrator
2017-02-23 23:23:58 -08:00
