Skip to content

Conversation

pin3da
Copy link
Contributor

@pin3da pin3da commented Feb 4, 2017

This is a clean PR of #998

@pin3da
Copy link
Contributor Author

pin3da commented Feb 9, 2017

#1130 automatically changed words that not were in english in events.md. That generates the conflict with this PR.

What do you suggest ?

@bf4 bf4 mentioned this pull request Feb 9, 2017
bf4 added a commit to bf4/nodejs.org that referenced this pull request Feb 9, 2017
As noted in nodejs#1128, there was non-English that was erroneously
modified in nodejs#1130
pin3da pushed a commit that referenced this pull request Feb 11, 2017
#1137)

As noted in #1128, there was non-English that was erroneously
modified in #1130
ZibbyKeaton and others added 6 commits February 11, 2017 08:57
Add Google Analytics click tracking on Walmart Case Study.

Refs #1121
```
go get -u github.com/client9/misspell/cmd/misspell
misspell  -w -error -source=text .
```

	modified:   TRANSLATION.md
	modified:   locale/en/about/trademark.md
	modified:   locale/en/blog/uncategorized/node-interactive-convince-boss.md
	modified:   locale/en/blog/vulnerability/openssl-march-2016.md
	modified:   locale/en/blog/weekly-updates/weekly-update.2015-02-13.md
	modified:   locale/en/foundation/case-studies.md
	modified:   locale/en/foundation/outreachy.md
	modified:   locale/en/foundation/tsc/minutes/2014-12-10.md
	modified:   locale/en/foundation/tsc/minutes/2015-01-22.md
	modified:   locale/en/foundation/tsc/minutes/2015-02-09.md
	modified:   locale/en/foundation/tsc/minutes/2015-03-19.md
	modified:   locale/en/foundation/tsc/minutes/2015-04-24.md
	modified:   locale/en/foundation/tsc/minutes/2015-04-30.md
	modified:   locale/en/get-involved/events.md
	modified:   locale/en/knowledge/HTTP/clients/how-to-create-a-HTTP-request.md
	modified:   locale/en/knowledge/HTTP/servers/how-to-read-POST-data.md
	modified:   locale/en/knowledge/file-system/how-to-use-the-path-module.md
	modified:   locale/en/knowledge/getting-started/control-flow/what-are-callbacks.md
	modified:   locale/en/knowledge/getting-started/control-flow/what-are-event-emitters.md
	modified:   locale/en/knowledge/getting-started/npm/what-is-npm.md
	modified:   locale/en/knowledge/getting-started/npm/what-is-the-file-package-json.md
	modified:   locale/en/knowledge/javascript-conventions/how-to-create-default-parameters-for-functions.md
	modified:   locale/en/knowledge/javascript-conventions/what-are-the-built-in-timer-functions.md
	modified:   locale/en/knowledge/javascript-conventions/what-is-json.md
	modified:   scripts/release-post.js
	modified:   static/js/dnt_helper.js
* remove old members

* fix email contact us

* update membership wording and benefit
#1137)

As noted in #1128, there was non-English that was erroneously
modified in #1130
@pin3da pin3da closed this Feb 11, 2017
@pin3da pin3da mentioned this pull request Feb 11, 2017
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.

5 participants