Merge pull request #2028 from Imperadeiro98/master

Gramar correction
This commit is contained in:
Nick Winter 2014-12-30 07:36:18 -08:00
commit a1fac423c0
4 changed files with 12 additions and 13 deletions

View file

@ -3,8 +3,8 @@ The MIT License (MIT)
Copyright (c) 2014 CodeCombat Inc. and other contributors
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in allcopies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN sCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THESOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View file

@ -14,7 +14,7 @@ contributing and help us make this world a better place.
Do you have questions or would you like to meet us?
Talk with us on hipchat @ https://www.hipchat.com/g3plnOKqa
Another way to reach is, is by visiting our forum.
Another way to reach us, is by visiting our forum.
You can find it @ http://discourse.codecombat.com/
You can read about the latest developments on our blog site.
@ -23,7 +23,7 @@ This one can be found @ http://blog.codecombat.com/
Last but not least, you can find most of our documentation
and information on our wiki @ https://github.com/codecombat/codecombat/wiki
We hope you'll enjoy yourself within our community, just as much as us.
We hope you enjoy yourself within our community, just as much as we do.
- Nick, George, Scott, Michael, Jeremy and Glen

View file

@ -1,7 +1,6 @@
1) When there is a question, please answer carefull and correct
1) When there is a question, please answer carefully and correctly
2) This setup is still in beta and may contain bugs
3) You can report bugs @ 'https://github.com/codecombat/codecombat/issues'
4) Having questions/suggestions? Talk with us on HipChat via CodeCombat.com
4) Having questions/suggestions? Talk with us on HipChat @ https://www.hipchat.com/g3plnOKqa
You can find a step-by-step guide for this installation on our wiki.
github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide
You can find a step-by-step guide for this installation at @ https://github.com/codecombat/codecombat/wiki/Setup-on-Windows:-a-step-by-step-guide

View file

@ -47,7 +47,7 @@
<opensource>CodeCombat is opensource, like you already know.</opensource>
<online>All our sourcecode can be found online at Github.</online>
<manual>You can choose to do the entire Git setup yourself.</manual>
<norec>However we recommend that you instead let us handle it instead.</norec>
<norec>However we recommend that you let us handle it instead.</norec>
</intro>
<skip>
<question>Do you want to do the Local Git setup manually yourself?</question>
@ -69,7 +69,7 @@
<info>Please enter your github information, to configure your local repository.</info>
<username>Username: </username>
<password>Password: </password>
<process>Thank you... Configuring your local repistory right now...</process>
<process>Thank you... Configuring your local repository right now...</process>
</config>
</github>
<switch>
@ -82,7 +82,7 @@
<binstall>Installing bower packages...</binstall>
<sass>Installing sass...</sass>
<npm>Installing npm...</npm>
<brnch>Starting brunch....</brnch>
<brnch>Starting brunch...</brnch>
<mongodb>Setting up a MongoDB database for you...</mongodb>
<db>Downloading the last version of the CodeCombat database...</db>
<script>Preparing the automatic startup script for you...</script>
@ -105,4 +105,4 @@
<s5> 2) Now just open 'localhost:3000' in your prefered browser.</s5>
<s6>That's it, you're now ready to start working on CodeCombat!</s6>
</start>
</variables>
</variables>