38 Commits

Author SHA1 Message Date
Zhicheng Wang
1340927e16 outlet从插座改为出口,含义更准确一点 2017-05-07 11:40:12 +08:00
Zhicheng Wang
83105da6c7 把英文双引号修正为中文的 2017-05-07 11:36:33 +08:00
Zhicheng Wang
e65fc98f11 修订完ngmodel-faq 2017-04-15 18:47:47 +08:00
Zhicheng Wang
f5c85b3e82 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_data.json
#	public/_includes/_hero-home.jade
#	public/_includes/_main-nav.jade
#	public/_includes/_scripts-include.jade
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cheatsheet.jade
#	public/docs/ts/latest/cli-quickstart.jade
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/index.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.jade
#	public/docs/ts/latest/cookbook/visual-studio-2015.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/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-dependency-injection.jade
#	public/docs/ts/latest/guide/learning-angular.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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/_data.json
#	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
#	public/events.jade
#	public/news.jade
#	public/presskit.jade
2017-04-15 15:34:47 +08:00
Ward Bell
a56c4a0b08 chore(aio): blank line before each list-item; - becomes * (#3481) 2017-04-01 00:25:27 +02:00
Pete Bacon Darwin
93d3db1fd4 docs(*): blank lines before lists are good (#3474) 2017-03-30 14:41:23 -07:00
SangKa.Z
a5a55eabe1 docs(ngmodule-faq): change wrong word "exports" to "imports" (#2582)
The correct sentence is: "Importing a module does _not_ automatically re-export the imported module's imports"
2017-03-29 16:02:08 -07:00
Pete Bacon Darwin
be53a50b6b fix(*): fix PUG syntax errors (#3401)
These errors are being missed by the Jade parser
but the more stringent Pug parser treats them as
errors.
2017-03-21 14:45:28 +01:00
AlexanderLukin
82d373d2f4 docs(ngmodule-faq): Remove unnecessary spaces (#3358) 2017-03-08 21:15:23 -08:00
cfranger
5985dc9cec docs(NgModules): Edits to change Angular Modules to NgModules.
* Edits to the "Angular Modules (NgModule)" page (ngmodule.jade). In order to fix some broken links, I defined their destinations in forms.jade and pipes.jade.

* Changed "Angular module" to "NgModule" and other edits.
- I assumed that the “Angular Module FAQs” cookbook page should change to “NgModule FAQs”, so I updated that page as well.
- I updated the name in page headers, TOC titles, and links on the Docs Home page (index.html).
- I noticed the Advanced and Cookbook sections are organized alphabetically, so I reordered the pages and references to reflect that.
2017-03-01 09:55:05 -08:00
Zhicheng Wang
7711fa6557 不再使用li进行切换,而是全面转换到li内嵌p元素 2017-02-26 21:44:00 +08:00
Zhicheng Wang
6af595d7bd Merge remote-tracking branch 'origin/master'
# Conflicts:
#	README.md
#	public/_includes/_hero-home.jade
#	public/_includes/_scripts-include.jade
#	public/docs/dart/latest/_data.json
#	public/docs/ts/latest/_data.json
#	public/docs/ts/latest/cookbook/_data.json
#	public/docs/ts/latest/cookbook/ajs-quick-reference.jade
#	public/docs/ts/latest/cookbook/aot-compiler.jade
#	public/docs/ts/latest/cookbook/component-communication.jade
#	public/docs/ts/latest/cookbook/component-relative-paths.jade
#	public/docs/ts/latest/cookbook/dependency-injection.jade
#	public/docs/ts/latest/cookbook/dynamic-form.jade
#	public/docs/ts/latest/cookbook/form-validation.jade
#	public/docs/ts/latest/cookbook/i18n.jade
#	public/docs/ts/latest/cookbook/ngmodule-faq.jade
#	public/docs/ts/latest/cookbook/set-document-title.jade
#	public/docs/ts/latest/cookbook/ts-to-js.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/appmodule.jade
#	public/docs/ts/latest/guide/architecture.jade
#	public/docs/ts/latest/guide/attribute-directives.jade
#	public/docs/ts/latest/guide/browser-support.jade
#	public/docs/ts/latest/guide/change-log.jade
#	public/docs/ts/latest/guide/component-styles.jade
#	public/docs/ts/latest/guide/dependency-injection.jade
#	public/docs/ts/latest/guide/displaying-data.jade
#	public/docs/ts/latest/guide/forms.jade
#	public/docs/ts/latest/guide/hierarchical-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/pipes.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/setup-systemjs-anatomy.jade
#	public/docs/ts/latest/guide/setup.jade
#	public/docs/ts/latest/guide/structural-directives.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/user-input.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/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
#	public/events.jade
#	public/presskit.jade
#	public/resources/js/directives/cheatsheet.js
2017-02-26 15:39:42 +08:00
hpawe01
3504b399e0 docs(ngmodule-faq): fix typo (#3111) 2017-02-09 09:43:07 -08:00
Filipe Silva
1101f07ef2 refactor: add src folder (#3171)
* boilerplate, gulpfile, quickstart

* move ts files up to cookbooks

* move rest of ts files

* fix tsconfig, default build task, json file

* fix js examples

* fix webpack example

* remove a2docs.css references

* fix aot examples

* fix webpack run task

* fix cb-i18n

* fix upgrade examples

* fix unit tests

* fix comment in deployment index

* removed unused typings.json

* fix plunkers

* fix js example paths

* fix ts quickstart/setup prose

* add src folder note to setup

* broadly replace app/ -> src/app/

* broadly replace main.ts

* broadly replaced index.html

* broadly replace tsconfig

* replace systemjs

* fix filetrees

* Minor prose fixes to aot, i18n cookbooks

* remove char harp was complaining about

* update new reactive forms example

* fix quickstart jade error

* fix mistakes uncovered by CI

* fix bad filename errors

* edit style guide 04-06 rule to use src

* add changelog

* Incorporate Jesus's feedback

* fix snippet headers in toh1/2

* chore: tweak changelog and setup text
2017-02-02 19:38:17 +01:00
Faraz Fazli
20a66c9d59 docs(ngmodule-faq): fix typo (#3062) 2017-01-02 13:52:03 -08:00
Jurgen Van de Moere
9e02eddac5 docs(ngmodule-faq): fix typo (#3053) 2016-12-30 18:24:56 +01:00
Yang Lin
5a7745fb27 Upgrade to 2.2.0 2016-11-22 20:07:16 +08:00
Patrice Chalin
061e50fa06 docs: adjust page heading levels (#2813)
* docs: adjust page heading levels

Only the page TOC should be at heading level 1. All other headings
should start at level 2. This commit also removes duplicate headings,
in continuation of #2796.

(This fix is necessary to support an auto-TOC feature.)
2016-11-16 10:02:31 -08:00
Zhimin YE
b82cf0de4c fix: ngmodule-faq 2016-10-18 22:16:04 +01:00
rexebin
7a894d6434 patch up: ngmodule-faq 2016-10-18 19:44:54 +01:00
rexebin
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
Zhicheng Wang
7aa3c2320a 把立即加载统一改为主动加载 2016-10-12 15:23:34 +08:00
Zhicheng Wang
72b0ec623e lazy-loading统一翻译为惰性加载 2016-10-11 16:26:41 +08:00
Brandon
ff118810ff docs(router): Updated routing examples to use routing modules (#2478)
Simplified routing in tutorial example

Updated ngmodule guide and ngmodule faq with routing module prose
2016-10-05 14:59:09 -07:00
rexebin
f7c60a07df fix: change all 他 > 它 2016-09-25 19:50:45 +01:00
rexebin
de6b8d6ad0 review: ngmodule-faq, done. 2016-09-18 22:32:25 +01:00
rexebin
3f9144eec2 review: ngmodule-faq: line 980 2016-09-18 17:10:44 +01:00
rexebin
d45052ab8c review: ngmodule-faq to line 153 2016-09-17 20:26:51 +01:00
Zhicheng Wang
50f73986be 翻译完了NgModule FAQ
少量错别字修改
2016-09-17 11:45:56 +08:00
Zhicheng Wang
0db676a23c 翻译了一部分NgModule FAQ 2016-09-16 20:45:50 +08:00
Zhicheng Wang
e693d35fb1 合并了最新更新,翻译了官方的发布声明 2016-09-15 17:08:17 +08:00
Zhicheng Wang
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
Zhicheng Wang
551f3dd51a 更新了cheatsheet
翻译了一部分FAQ
2016-09-14 21:12:14 +08:00
Ward Bell
c5ad38ee86 docs(ngmodule-faq): eager loaded Routed Feature Module must be imported (#2304)
fixes #2298
2016-09-13 12:27:27 -07:00
Jesús Rodríguez
98e5bc248e docs(ngmodule-faq): fix plunker link (#2277) 2016-09-13 12:27:13 -07:00
jmcgoldrick
e1b2f6a2fe docs(ngmodule-faq): correct BrowserModule import module (#2269) 2016-09-13 12:24:59 -07:00
Ward Bell
38bef16604 docs(ngmodule-faq): stronger, clearer advice on where to register providers (#2262) 2016-09-03 13:26:19 -07:00
Ward Bell
8e15829189 docs(ngmodule): fixes for defects discovered by John Papa (#2197)
includes splitting FAQs into its own cookbook.
2016-08-25 19:12:15 -07:00