20 Commits

Author SHA1 Message Date
Zhicheng Wang
de34171fa2 Merge remote-tracking branch 'origin/master' into aio
# Conflicts:
#	aio/content/guide/aot-compiler.md
#	aio/content/guide/change-log.md
#	aio/content/guide/ts-to-js.md
#	aio/content/marketing/docs.md
#	aio/content/navigation.json
#	aio/src/app/documents/document.service.ts
2017-08-20 19:39:38 +08:00
Ward Bell
697c6ed0fe docs: remove TypeScript to JavaScript guide & sample 2017-08-15 16:31:31 -07:00
Zhicheng Wang
e29188ad54 fix: 快速起步改为快速上手 2017-08-07 07:49:44 +08:00
Zhicheng Wang
828528dade fix: "覆盖" -> "涵盖" 2017-07-30 12:43:20 +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
Peter Bacon Darwin
f054c8360b docs(aio): fix up broken links 2017-07-18 11:45:05 +01:00
Kapunahele Wong
e110a80caf docs(aio): change Angular Module to NgModule (#16964) 2017-07-11 15:05:20 -07:00
Jesús Rodríguez
cd5bc64658 docs(aio): update headers for toc (#16969) 2017-05-26 13:28:06 -06:00
Jesus Rodriguez
ff32c53099 docs(aio): fix lots of broken links
Closes #16317
2017-05-01 15:51:26 -07:00
Jesús Rodríguez
249cd8c2ec docs(aio): remove _blank target (#16205) 2017-04-24 11:23:45 -07:00
Ward Bell
93516ea8a1 docs(aio): rename cb- files and a few others 2017-04-24 14:00:51 +01:00
cameronbriar
05d1008a08 docs(aio): fix bad cookbook URL references for aot-compiler (#16165)
PR Close #16165
2017-04-19 22:34:21 -05:00
Jesus Rodriguez
0e38bf9de0 build(aio): new migration 2017-04-03 15:41:05 -07: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
b70c881c00 docs(aio): fix paths to images 2017-03-06 22:27:32 -08: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