9a0d3e9633
docs: 手动解决冲突
2018-10-22 18:16:47 +08:00
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
3ac7070009
docs: fix typo in Architecture overview page ( #25438 )
...
PR Close #25438
2018-08-13 21:38:22 -07:00
8bbce3feff
docs: copy edit architecture guide ( #25328 )
...
PR Close #25328
2018-08-08 13:12:53 -07:00
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
d523630ea2
docs(aio): cleanup aalert, callout, subsection use and author style ( #24986 )
...
PR Close #24986
2018-07-24 08:22:14 -07:00
e0c86318b1
Fix typo
2018-07-04 17:22:02 +08:00
4d10289bb5
Fix typo in architecture.md
...
估计是用拼音输入的时候不小心打错了吧
2018-07-04 17:22:02 +08:00
77a2381d0a
fix: sync to 6.0(WIP)
2018-05-07 13:06:47 +08:00
b01ec8ad9a
feat: 翻译完了 architecture-next-steps
2018-03-25 08:27:31 +08:00
9e732fc4ff
feat: 翻译完了 architecture
2018-03-25 08:01:14 +08:00
e167fa5229
refactor: 重构自动翻译代码
2018-03-24 20:03:10 +08:00
6c3d57aee9
fix: 合并了最新版本
2018-03-24 13:12:42 +08:00
a4ac40b640
fix: 翻译了所有遗漏的部分。
2018-03-24 11:16:33 +08:00
d0292bbe82
fix: 把遗漏的 我们 替换成 你
2018-03-23 09:43:02 +08:00
2b2b537008
fix: 把中文中的_替换成*
2018-03-22 17:24:05 +08:00
f75baea397
fix: 把除了 upgrading 之外的 我们 都替换成了 你
...
fix: 翻译了一部分 AOT Compiler
2018-03-22 17:19:12 +08:00
545d4b6c69
feat: 自动在中英文之间添加空格，以改善排版
2018-03-20 17:09:18 +08:00
04ca77e38e
docs(aio): update architecture section ( #21569 )
...
PR Close #21569
2018-03-15 14:48:35 -07:00
b7ceb9e211
fix: 修正了死链接
2018-03-07 16:48:44 +08:00
964266f4b0
fix: 合并第一版的翻译
2018-03-07 15:42:49 +08:00
fc58e0eee0
fix: 合并第二版的翻译
2018-03-07 14:54:27 +08:00
1c028aee24
fix: 提交没错误的自动翻译结果
2018-03-07 10:20:29 +08:00
206f6ecc4f
fix: 修正最后一版的全部翻译
2018-03-04 09:07:33 +08:00
19f4ad46ae
refactor: extract checker functions
2018-03-03 08:13:52 +08:00
53a7a4cbf5
feat: add auto checker
...
fix: some translations found by auto checker
2018-03-01 22:19:59 +08:00
89060a39df
fix: 不正常的中英文段落合并
2018-02-28 13:44:53 +08:00
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
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
7b120b5f73
docs: consistency fix in describing a custom tag ( #21747 )
...
PR Close #21747
2018-02-02 07:53:18 -08:00
53f91189a1
docs(aio): add NgModule docs ( #20306 )
...
PR Close #20306
2018-01-10 16:26:46 -08:00
f1da1419fa
docs(aio): Fix typo in Architecture Overview. ( #20073 )
2017-11-03 11:00:22 -07:00
11ef4f9cd4
Fixed some typos
...
1.它/她 => 他/她 or other better expression.
2.some of 英雄.+它们 => 英雄.+他们
3.some of 它们.+他们 => 他们.+英雄
2017-09-20 08:40:20 +08:00
c2cf6c711a
fix break style in architecture doc
2017-09-06 10:24:47 +08:00
de6cfeeee3
clean: remove useless codes
2017-08-06 13:42:51 +08:00
3a584ba96c
fix: some untranslated english
2017-08-06 13:21:34 +08:00
0ddf72745e
fix: translate all pure english titles
2017-08-04 14:06:15 +08:00
75ac1cd5ce
fix: add line break before `<code-example...`
2017-08-04 07:39:15 +08:00
1ec5c6a82f
fix: minor improvements
2017-07-30 17:40:53 +08:00
c002fddabe
fix: many of broken links
2017-07-30 12:32:56 +08:00
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
20a55c54ed
docs(aio): merge latest chinese translations
2017-07-23 11:51:25 +08:00
8d2819121b
fix(aio): invalid formatting in architecure.md ( #18159 )
...
Introduced in e110a80caf (diff-9ac9c6a9277eea9856d75249a7c0a40aL127)
2017-07-20 09:48:02 -07:00
e110a80caf
docs(aio): change Angular Module to NgModule ( #16964 )
2017-07-11 15:05:20 -07:00
d56b7ed96d
docs(aio): reorganise the sidenav menu ( #16934 )
...
Reorganizes the items in the sidenav menu and consolidates the quickstart
and cli-quickstart guides into one.
2017-06-09 14:48:53 -07:00
8a0e5659c0
docs(aio): tidy up docs that use float clearing
...
Closes #16681
2017-05-19 09:47:53 +01:00
b016984c04
docs(aio): resize images
2017-05-12 14:28:09 +01:00
9e661e58d1
docs(aio): image sweep ( #16609 )
...
* fix(aio): allow code blocks to clear floated images
Previously the negative margin on the code headings were causing
floated images to overlay the start of a code block. Now all code block
successfully clear all floated elements.
* feat(aio): add a `.clear` class for clearing floating images
* fix(aio): tidy up image styles
The css rules for `img.right` and `img.left` allow authors easy
access to floating an image on the left or right, respectively.
The `.image-display` rule which was always found on a figure
has been simplified so that all figures have this styling. It is very
unlikely that a figure will be used outside the content area; and
at this time it seems like `figure` is as good an indicator that we
want this kind of styling as anything.
Now that images are all tagged with width and height values, we cannot
assume to modify these dimensions via CSS as it can cause the image to
lose its correct proportions. Until we find a better solition we must set
`height` to `auto` when the screen width is below 1300px to ensure that
these images maintain their proportions as they get shrunk to fit.
* docs(aio): general tidy up of image HTML in guides
Previously, the guides have a lot of inline image styling and unnecessary
use of the `image-display` css class.
Images over 700px are problematic for guide docs, so those have been given
specific widths and associated heights.
* docs(aio): use correct anchor for "back to the top" link
The `#toc` anchor does not work when the page is
wide enough that the TOC is floating to the side.
* build(aio): add `#top-of-page` to path variants for link checking
Since the `#top-of-page` is outside the rendered docs
the `checkAnchorLinks` processor doesn't find them
as valid targets for links.
Adding them as a `pathVariant` solves this problem
but will still catch links to docs that do not actually exist.
* fix(aio): ensure that headings clear floated images
* fix(aio): do not force live-example embedded image to 100% size
This made them look too big, generally. Leaving them with no size means
that they will look reasonable in large viewports and switch to 100% width
in narrow viewports.
2017-05-09 15:53:32 -07:00
03610526e5
docs(aio): remove hardcoded TOC
2017-05-04 15:51:37 -07:00
5b96fb9320
build(aio): rename `src/content` to `src/generated`
...
This commit will definitely require a clean up of your
working folder:
```
cd aio
git clean -xdf
yarn setup
```
2017-05-03 13:40:46 -07:00
Zhicheng Wang
Justin Noel
Judy Bogart
Stefanie Fluin
Kris Li
Jannis Lehmann
Kapunahele Wong
Ezeikel
KingMario
aaron
Zhicheng Wang
Kevin Cooper
Peter Bacon Darwin
Jesus Rodriguez