diff --git a/public/js/main_0.0.3.js b/public/js/main_0.0.3.js index 20152c48f5339d..2088beb46b3ac1 100644 --- a/public/js/main_0.0.3.js +++ b/public/js/main_0.0.3.js @@ -56,7 +56,7 @@ $(document).ready(function() { $('#report-issue').on('click', function() { $('#issue-modal').modal('hide'); - window.open('https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge '+ window.location.href +' has an issue. Please describe how to reproduce it, and include links to screen shots if possible.', '_blank') + window.open('https://github.com/freecodecamp/freecodecamp/issues/new?&body=Challenge '+ window.location.href +' has an issue. Please describe how to reproduce it, and include links to screenshots if possible.', '_blank') }); $('#i-want-to-pair').on('click', function() { diff --git a/seed/challenges/basic-bonfires.json b/seed/challenges/basic-bonfires.json index 14d5a40437fcd7..b2a49c8ce3c3e9 100644 --- a/seed/challenges/basic-bonfires.json +++ b/seed/challenges/basic-bonfires.json @@ -13,16 +13,16 @@ "OK, we're finally ready to start pair programming!", "Pair Programming is where two people code together on the same computer. It is an efficient way to collaborate, and widely practiced at software companies. Pair Programming is one of the core concepts of \"Agile\" Software Development, which you will hear more about later.", "Many people use Skype or Google Hangouts to pair program, but if you talk with professional software engineers, they will tell you that it's not really pair programming unless both people have the ability to use the keyboard and mouse.", - "The most popular tool for pair programming is Screen Hero. You can download Screen Hero for Mac or Windows. Create your new user account from within the app.", - "We have a special chat room for people ready to pair program. Go to our LetsPair chatroom on gitter and type \"Hello Pair Programmers!\"", + "The most popular tool for pair programming is Screenhero. You can download Screenhero for Mac or Windows. Create your new user account from within the app.", + "We have a special chat room for people ready to pair program. Go to our LetsPair chatroom on Gitter and type \"Hello Pair Programmers!\"", "If someone is available, they will be your \"pair\" - the person you pair programming with.", "If no one gets back to you in the first few minutes, don't worry. There will be lots of opportunities to pair program in the future.", - "If someone does get back to you, private message them and ask for the email address they used to register Screen Hero.", - "Add them as a new contact in Screen Hero, then click the monitor-looking button to attempt to share your screen with them.", - "Once the Screen Hero session starts, your screen's margins will glow orange. You are now sharing your screen.", + "If someone does get back to you, private message them and ask for the email address they used to register Screenhero.", + "Add them as a new contact in Screenhero, then click the monitor-looking button to attempt to share your screen with them.", + "Once the Screenhero session starts, your screen's margins will glow orange. You are now sharing your screen.", "Your pair will have their own cursor, and will be able to type text on his or her keyboard.", "Now it's time to tackle our Bonfires. You can begin them by advancing to the next challenge.", - "Once you you finish pair programming, end the session in Screen Hero session.", + "Once you you finish pair programming, end the session in Screenhero session.", "Congratulations! You have completed your first pair programming session.", "Pair program as much as possible with different campers until you've completed all the Bonfire challenges. This is a big time investment, but the JavaScript practice you get will be well worth it!", "Mark this Waypoint complete and move on." diff --git a/seed/challenges/bootstrap.json b/seed/challenges/bootstrap.json index 2c0ff3b0315eb6..483af976d8d707 100644 --- a/seed/challenges/bootstrap.json +++ b/seed/challenges/bootstrap.json @@ -622,7 +622,7 @@ "Bootstrap uses a responsive grid system, which makes it easy to put elements into rows and specify each element's relative width. Most of Bootstrap's classes can be applied to a div element.", "Here's a diagram of how Bootstrap's 12-column grid layout works:", "", - "Note that in this illustration, we use the col-md-* class. Here, \"md\" means \"medium\", and \"*\" is a number specifying how many columns wide the element should be. In this case, we're specifying how many columns wide an element should be on a medium-sized screen, such as a laptop.", + "Note that in this illustration, the col-md-* class is being used. Here, \"md\" means \"medium\", and \"*\" is a number specifying how many columns wide the element should be. In this case, the column width of an element on a medium-sized screen, such as a laptop, is being specified.", "In the Cat Photo App that we're building, we'll use col-xs-*, where \"*\" is the number of columns wide the element should be, and \"xs\" means \"extra small\", like an extra-small mobile phone screen.", "The \"row\" class is applied to a div, and the buttons themselves can be wrapped within it." ], diff --git a/seed/field-guides.json b/seed/field-guides.json index 91f0f190e2556e..b9a2522b02cb56 100644 --- a/seed/field-guides.json +++ b/seed/field-guides.json @@ -204,7 +204,7 @@ "

Pair programming is where two people code together on one computer.

", " ", "

You discuss different approaches to solving problems, and keep each other motivated. The result is better code than either of you could have written by yourselves. Because of its benefits, many engineers pair program full time. And it's the best way to learn coding. Thanks to tools that allow two people to share mouse and keyboard inputs, you can pair program with a friend without needing to be in the same room.

", - "

By pair programming with other Free Code Camp students on our coding challenges. Eventually, you'll work with people at nonprofits to build real-life software solutions.

", + "

By pair programming with other campers on our coding challenges you'll develop the necessary skills to work with people at nonprofits to build real-life software solutions.

", "" ] }, @@ -280,7 +280,7 @@ "
    ", "
  1. Follow this tutorial to set up your computer for streaming.
    2. ", "
  2. Contact Jason Ruekert - he's @jsonify in Gitter. He's in charge of our Twitch.tv channel. Tell him what you'd like to stream, and when you're available to stream.
    3. ", - "
  3. Jason will pair with you using Screen Hero to verify your computer is configured properly to stream.
    4. ", + "
  4. Jason will pair with you using Screenhero to verify your computer is configured properly to stream.
    5. ", "
", "

", "

Be respectful of your audience. Everything you stream should be related to coding JavaScript, and should be acceptable for children. (Yes, children do sometimes watch our Twitch stream to learn to code).

", @@ -677,7 +677,7 @@ " ", "

", @@ -702,7 +702,7 @@ "
", "

Download for Mac

", "

Download for Windows

", - "

You'll use Screen Hero to pair program starting with http://freecodecamp.com/challenges/pair-program-on-bonfires

", + "

You'll use Screenhero to pair program starting with http://freecodecamp.com/challenges/pair-program-on-bonfires

", "
" ] }, @@ -773,7 +773,7 @@ "dashedName": "what-is-the-free-code-camp-privacy-policy", "description": [ "
", - "

Free Code Camp is committed to respecting the privacy of visitors to our web sites and web applications. The guidelines below explain how we protect the privacy of visitors to FreeCodeCamp.com and its features.

", + "

Free Code Camp is committed to respecting the privacy of visitors to our websites and web applications. The guidelines below explain how we protect the privacy of visitors to FreeCodeCamp.com and its features.

", "

Personally Identifiable Information

", "

Free Code Camp protects the identity of visitors to FreeCodeCamp.com by limiting the collection of personally identifiable information.

", "

Free Code Camp does not knowingly collect or solicit personally identifiable information from or about children under 13, except as permitted by law. If we discover we have received any information from a child under 13 in violation of this policy, we will delete that information immediately. If you believe Free Code Camp has any information from or about anyone under 13, please email us at team@freecodecamp.com.

", @@ -795,8 +795,8 @@ "

All of the content on FreeCodeCamp.com is copyrighted by Free Code Camp. If you'd like to redistribute it beyond simply sharing it through social media, please contact us at team@freecodecamp.com.

", "

Contacting Us

", "

If you have questions about Free Code Camp, or to correct, update, or remove personally identifiable information, please email us at team@freecodecamp.com.

", - "

Links to Other Web sites

", - "

Free Code Camp's sites each contain links to other Web sites. Free Code Camp is not responsible for the privacy practices or content of these third-party Web sites. We urge all FreeCodeCamp.com visitors to follow safe Internet practices: Do not supply Personally Identifiable Information to these Web sites unless you have verified their security and privacy policies.

", + "

Links to Other Websites

", + "

Free Code Camp's sites each contain links to other Websites. Free Code Camp is not responsible for the privacy practices or content of these third-party Websites. We urge all FreeCodeCamp.com visitors to follow safe Internet practices: Do not supply Personally Identifiable Information to these Websites unless you have verified their security and privacy policies.

", "

Data Retention

", "

We retain your information for as long as necessary to permit us to use it for the purposes that we have communicated to you and comply with applicable law or regulations.

", "

Business Transfers

", @@ -958,7 +958,7 @@ "
  • Zipline: Stylize Stories on Camper News
    • ", "
  • Zipline: Wikipedia Viewer
    • ", " ", - "

    This won't be a new curriculum - it will just the first 200 hours of our full stack JavaScript curriculum.

    ", + "

    This won't be a new curriculum - it will just be the first 200 hours of our full stack JavaScript curriculum.

    ", "

    All campers who have already completed these challenges are retroactively eligible for the certificate!

    ", "
    " ] diff --git a/server/utils/resources.json b/server/utils/resources.json index 847f4538a3dfd7..9c2182738a5c82 100644 --- a/server/utils/resources.json +++ b/server/utils/resources.json @@ -1,7 +1,7 @@ { "announcements": [ ["Some of Code School's courses are no longer free. We're switching to NodeSchool.io for our Node.js and Express.js challenges.", "http://freecodecamp.com/nodeschool-challenges"], - ["Screen Hero is now free on Windows and Mac! Follow these special instructions to install it.", "http://freecodecamp.com/install-screenhero"] + ["Screenhero is now free on Windows and Mac! Follow these special instructions to install it.", "http://freecodecamp.com/install-screenhero"] ], "questions": [{ "question": "Time Complexity of Accessing Array Index (int a = ARR[5];)", @@ -220,4 +220,4 @@ "With coding power comes sharing responsibility", "Have you told your friends of your coding powers?" ] -} \ No newline at end of file +} diff --git a/server/views/partials/challenge-modals.jade b/server/views/partials/challenge-modals.jade index ba8dc1becd7889..f1d210b30a2498 100644 --- a/server/views/partials/challenge-modals.jade +++ b/server/views/partials/challenge-modals.jade @@ -6,7 +6,7 @@ .modal-body.text-center h3 This will take you to our pair programming room where you can request a pair. h3 You'll need   - a(href='/field-guide/how-do-i-install-screenhero' target='_blank') Screen Hero + a(href='/field-guide/how-do-i-install-screenhero' target='_blank') Screenhero | . h3 Other campers may then message you about pair programming. a.btn.btn-lg.btn-primary.btn-block(href='https://gitter.im/FreeCodeCamp/LetsPair', data-dismiss='modal', aria-hidden='true' target='_blank') Take me to the pair programming room @@ -19,7 +19,7 @@ a.close.closing-x(href='#', data-dismiss='modal', aria-hidden='true') × .modal-body.text-center h3 This will open our GitHub Issues page. - h3 Please tell us how to reproduce the bug and link us to screen shots if possible. + h3 Please tell us how to reproduce the bug and link us to screenshots if possible. a.btn.btn-lg.btn-primary.btn-block#report-issue(name='_csrf', value=_csrf) Create my GitHub issue a.btn.btn-lg.btn-info.btn-block(href='#', data-dismiss='modal', aria-hidden='true') Cancel