Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docs:fix typo #1537

Merged
merged 1 commit into from
Oct 19, 2017
Merged

docs:fix typo #1537

merged 1 commit into from
Oct 19, 2017

Conversation

beilunyang
Copy link
Contributor

Checklist
  • npm test passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)
Description of change
  • 删除乱码字符
  • 修正JavaScript拼写

@codecov-io
Copy link

codecov-io commented Oct 17, 2017

Codecov Report

Merging #1537 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #1537   +/-   ##
=======================================
  Coverage   99.71%   99.71%           
=======================================
  Files          29       29           
  Lines         714      714           
=======================================
  Hits          712      712           
  Misses          2        2

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 68c0e1a...b9036a7. Read the comment docs.

@@ -144,7 +144,7 @@ egg 基于 [semver] 语义化版本号进行发布。

### 分支策略

`master` 分支为当前稳定发布的版本,`next` 分支为下一个开发中的大版本
`master` 分支为当前稳定发布的版本,`next` 分支为下一个开发中的大版本

- 只维护两个版本,除非有安全问题,否则修复只会 patch 到 `master` 和 `next` 分支,其他更新推动上层框架升级到稳定大版本的最新版本。
- 所有 API 的废弃都需要在当前的稳定版本上 `deprecate` 提示,并保证在当前的稳定版本上一直兼容到新版本的发布。
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecated is better.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you for your suggestion, solarhell.
i think using deprecate or deprecated is only a personal habit. so i won't to modify it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

deprecate is better, since egg provide app.deprecate()

@solarhell
Copy link
Contributor

You'd better modify english version at the same time.

@popomore popomore merged commit 7fb9bbf into eggjs:master Oct 19, 2017
popomore pushed a commit that referenced this pull request Oct 19, 2017
docs: fix typo (#1537)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants