Commit Graph

18 Commits

Author SHA1 Message Date
Zhicheng Wang d7fd581c37 Merge branch 'master' into aio
# Conflicts:
#	aio/content/guide/ajs-quick-reference.md
#	aio/content/guide/animations.md
#	aio/content/guide/browser-support.md
#	aio/content/guide/form-validation.md
#	aio/content/guide/i18n.md
#	aio/content/guide/pipes.md
#	aio/content/guide/router.md
#	aio/content/guide/set-document-title.md
#	aio/content/guide/structural-directives.md
#	aio/content/guide/template-syntax.md
#	aio/content/guide/testing.md
#	aio/content/marketing/resources.json
#	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
2017-10-01 13:22:33 +08:00
Kapunahele Wong 8d8995f1ab docs(aio): edit summary and next step headers (#16962) 2017-09-27 13:45:47 -07:00
KingMario 11ef4f9cd4 Fixed some typos
1.它/她 => 他/她 or other better expression.
2.some of 英雄.+它们 => 英雄.+他们
3.some of 它们.+他们 => 他们.+英雄
2017-09-20 08:40:20 +08:00
Zhicheng Wang e1446f1fa5 fix: 增加阅读指南 2017-08-29 11:01: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
Ward Bell 9449eff6fd docs(aio): improve tutorial next-steps prose/links 2017-05-04 15:51:57 -07:00
Jesus Rodriguez 9d40ab9e20 docs(aio): rename ToH to match the guide name 2017-04-19 10:28:31 +01:00
Jesus Rodriguez 061475402c docs(aio): final migration from old site 2017-04-12 21:01:55 +01:00
Peter Bacon Darwin 28c2a71cfc docs(aio): revert file-trees back to original structure
This is an auto-migration from angular.io
2017-04-12 12:24:02 -07: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 fca5fb0280
and 3927b7a038

The result of this is that, going forward, we should ask
authors to include the path from the base href to the thing
being linked. E.g. guide/architecture#intro
2017-03-13 16:56:23 -07:00
Peter Bacon Darwin 1847550ad1 docs(aio): move cookbooks into guide
Also update all docs with migrated versions from latest angular.io

Fixes #14941
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