Sync with upstream @ ec21af8a#35
Closed
javascript-translate-bot wants to merge 1323 commits intomasterfrom
Closed
Conversation
Update article.md
Made some changes to make it more correct.
minor
Long awaited second stab at revising this paragraph (which someone in the distant past took issue with).
us, them, commas
Update article.md
Update article.md
Grammar issues fix
Fix minor typo
Grammar suggestions, one rephrase
Grammar suggestions
Rephrase
fix mini typo
Fix syntax error
Update task.md
Update article.md
Update article.md
code non-compatible with clarification drawing
code non-compatible with clarification drawing
arrow function instead of function
Update article.md
Update article.md
"helper function" term reminds "utility libraries" but "wrapper" term refers "function decorators" and in this context wrapper can be more self-descriptive and meaningful.
wrapper instead of helper
bug fix on the server
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR was automatically generated to merge changes from en.javascript.info at ec21af8
Conflicted files in this PR have labels ">>>..." with both sides of conflict. If you merge this PR, you'll need to examine the listed files and resolve conflicts.
Alternatively, you can close this PR and merge conflicting changes manually.
The following files have conflicts and may need updates of the translations:
Click to open a list of 206 files
To merge changes manually (instead of merging this PR):
git add remote upstream https://github.com/javascript-tutorial/en.javascript.infogit checkout mastergit pull upstream mastergit checkout --ours <path>git diff --word-diff master...upstream/master <path>(please note: three dots in the command)git push origin masterPlease ignore changes in README.md (git checkout --ours README.md && git commit -m ignore README.md).
This PR will be closed and replaced with a new one in a few days.