Fix code blocks in common guides.

Author: hramos

.rvmrc

@@ -0,0 +1 @@
+rvm use 2.2.0

_app/main.js

@@ -654,8 +654,8 @@ App.Views = {};
 			if (this.platform === "ios" || this.platform === "osx" || this.platform === "macos") {
 				new App.Views.Docs.Toggle({
 					parent: this.scrollContent,
-					opt1: 'objectivec', // was objc
-					opt2: 'swift', // was swift
+					opt1: 'objectivec',
+					opt2: 'swift',
 					label1: 'Objective-C',
 					label2: 'Swift',
 					onChange: this.handleToggleChange.bind(this)
@@ -700,23 +700,16 @@ App.Views = {};
 			$('.common-lang-block').hide();
 			switch (this.platform) {
 				case 'ios':
-					$('.common-lang-block.objc').show();
-					$('.common-lang-block.swift').show();
-					break;
-				case 'osx':
-					$('.common-lang-block.objc').show();
+        case 'osx':
+        case 'macos':
+					$('.common-lang-block.objectivec').show();
 					$('.common-lang-block.swift').show();
 					break;
 				case 'android':
 					$('.common-lang-block.java').show();
 					break;
-				case 'js':
-					$('.common-lang-block.js').show();
-					break;
 				case 'dotnet':
-					$('.common-lang-block.csharp').show();
-					break;
-				case 'unity':
+        case 'unity':
 					$('.common-lang-block.csharp').show();
 					break;
 				case 'php':
@@ -726,12 +719,11 @@ App.Views = {};
 					$('.common-lang-block.bash').show();
 					$('.common-lang-block.python').show();
 					break;
-				case 'cloudcode':
-					$('.common-lang-block.js').show();
-					break;
 				case 'arduino':
 					$('.common-lang-block.cpp').show();
 					break;
+        case 'cloudcode':
+				case 'js':
 				default:
 					$('.common-lang-block.js').show();
 			}

_includes/android/getting-started.md

@@ -1,7 +1,3 @@
 # Getting Started
 
-If you haven't installed the SDK yet, please [head over to the QuickStart guide]({{ page.quickstart }}#parse_data/mobile/android/native/new) to get our SDK up and running in Android Studio. Note that we support Android 2.3 and higher. You can also check out our [API Reference](https://parse.com/docs/android/api/) for more detailed information about our SDK.
-
-The Parse platform provides a complete backend solution for your mobile application. Our goal is to totally eliminate the need for writing server code or maintaining servers. If you're familiar with web frameworks like Ruby on Rails, we've taken many of the same principles and applied them to our platform. In particular, our SDK is ready to use out of the box with minimal configuration on your part.
-
-On Parse, you create an App for each of your mobile applications. Each App has its own application id and client key that you apply to your SDK install. Your account on Parse can accommodate multiple Apps. This is useful even if you have one application, since you can deploy different versions for test and production.
+If you haven't installed the SDK yet, please [head over to the QuickStart guide]({{ page.quickstart }}#parse_data/mobile/android/native/new) to get our SDK up and running in Android Studio. Note that we support Android 2.3 and higher. You can also check out our [API Reference](/Parse-SDK-Android/api/) for more detailed information about our SDK.

_includes/arduino/getting-started.md

@@ -6,11 +6,9 @@ The Parse platform provides a complete backend solution for your hardware device
 
 Note that the Arduino SDK only contains a subset of Parse features found in mobile and desktop. This allows the SDK to be smaller in size and more performant, making it suitable for constrained embedded environments. The Arduino SDK is fully open source, and anyone can contribute to make it better, or make their own changes if necessary. Check out the[ GitHub repository](https://github.com/ParsePlatform/parse-embedded-sdks) for more information.
 
-On Parse, you create an App for each of your mobile and embedded applications. Each App has its own application id and client key that you apply to your SDK install. Your account on Parse can accommodate multiple Apps. This is useful even if you have one application, since you can deploy different versions for test and production.
-
 ## Initialization
 
-In order for Parse to know which app is associated with the Arduino device, simply specify the application ID and client key in your`setup` function:
+In order for Parse to know which app is associated with the Arduino device, simply specify the application ID and client key in your `setup` function:
 
 ```cpp
 void setup() {
@@ -19,4 +17,4 @@ void setup() {
 }
 ```
 
-After this, all calls to the Parse cloud will use the specified app.
+After this, all calls to the Parse Server will use the specified app.

_includes/common/data.md

@@ -36,7 +36,7 @@ You may import data into your Parse app by using CSV or JSON files. To create a
 
 The JSON format is an array of objects in our REST format or a JSON object with a `results` that contains an array of objects. It must adhere to the [JSON standard](http://json.org/). A file containing regular objects could look like:
 
-<pre><code class="javascript">
+```js
 { "results": [
   {
     "score": 1337,
@@ -47,7 +47,7 @@ The JSON format is an array of objects in our REST format or a JSON object with
     "objectId": "fchpZwSuGG"
   }]
 }
-</code></pre>
+```
 
 Objects in either format should contain keys and values that also satisfy the following:
 
@@ -63,7 +63,7 @@ In addition to the exposed fields, objects in the Parse User class can also have
 
 A file containing a `User` object could look like:
 
-<pre><code class="javascript">
+```js
 { "results":
   [{
     "username": "cooldude",
@@ -74,7 +74,7 @@ A file containing a `User` object could look like:
     "bcryptPassword": "$2a$10$ICV5UeEf3lICfnE9W9pN9.O9Ved/ozNo7G83Qbdk5rmyvY8l16MIK"
   }]
 }
-</code></pre>
+```
 
 Note that in CSV the import field types are limited to `String`, `Boolean`, and `Number`.
 

_includes/common/performance.md

@@ -50,7 +50,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"GameScore"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("GameScore")
 query.whereKey("score", equalTo: 50)
 query.whereKey("playerName", containedIn: ["Jonathan Walsh", "Dario Wunsch", "Shawn Simon"])
@@ -96,7 +96,7 @@ query.equalTo("cheatMode", false);
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("cheatMode", equalTo: false)
 ```
 {: .common-lang-block .swift }
@@ -172,7 +172,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"GameScore"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("GameScore")
 query.whereKey("playerName", notEqualTo: "Michael Yabuti")
 query.findObjectsInBackgroundWithBlock {
@@ -233,7 +233,7 @@ PFQuery *query = [PFUser query];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 var query = PFUser.query()
 query.whereKey("state", notEqualTo: "Invited")
 ```
@@ -274,7 +274,7 @@ query.containedIn("state", ["SignedUp", "Verified"]);
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("state", containedIn: ["SignedUp", "Verified"])
 ```
 {: .common-lang-block .swift }
@@ -324,7 +324,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"GameScore"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("GameScore")
 // Previously retrieved highScore for Michael Yabuti
 query.whereKey("score", greaterThan: highScore)
@@ -388,7 +388,7 @@ PFQuery *query = [PFUser query];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 var query = PFUser.query()
 query.whereKey("state", notContainedIn: ["Invited", "Blocked"])
 ```
@@ -428,7 +428,7 @@ query.containedIn("state", ["SignedUp", "Verified"]);
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("state", containedIn: ["SignedUp", "Verified"])
 ```
 {: .common-lang-block .swift }
@@ -471,7 +471,7 @@ query.matches("playerName", "Michael", “i”);
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("playerName", matchesRegex: "Michael", modifiers: "i")
 ```
 {: .common-lang-block .swift }
@@ -508,7 +508,7 @@ query.contains("playerName", "Michael");
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("playerName", containsString: "Michael")
 ```
 {: .common-lang-block .swift }
@@ -545,7 +545,7 @@ query.startsWith("playerName", "Michael");
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("playerName", hasPrefix: "Michael")
 ```
 {: .common-lang-block .swift }
@@ -584,7 +584,7 @@ query.matches("playerName", "^Michael");
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.whereKey("playerName", matchesRegex: "^Michael")
 ```
 {: .common-lang-block .swift }
@@ -627,7 +627,7 @@ query.limit = 10; // limit to at most 10 results
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 query.limit = 10 // limit to at most 10 results
 ```
 {: .common-lang-block .swift }
@@ -674,7 +674,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"Place"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("Place")
 query.whereKey("location", nearGeoPoint: userGeoPoint, withinMiles: 10.0)
 query.findObjectsInBackgroundWithBlock {
@@ -740,7 +740,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"GameScore"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("GameScore")
 query.selectKeys(["score", "playerName"])
 query.findObjectsInBackgroundWithBlock {
@@ -835,7 +835,7 @@ Parse.Cloud.run("averageStars", { "movie": "The Matrix" }).then(function(ratings
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 PFCloud.callFunctionInBackground("averageStars", withParameters: ["movie": "The Matrix"]) {
   (ratings, error) in
   if !error {
@@ -913,7 +913,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"Review"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("Review")
 // movieId corresponds to a given movie's id
 query.whereKey("movie", equalTo: movieId)
@@ -1001,7 +1001,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"Movie"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("Movie")
 query.findObjectsInBackgroundWithBlock {
   (objects, error) in
@@ -1098,7 +1098,7 @@ PFQuery *query = [PFQuery queryWithClassName:@"Post"];
 ```
 {: .common-lang-block .objc }
 
-```swift
+<pre><code class="swift">
 let query = PFQuery.queryWithClassName("Post")
 query.whereKey("hashtags", containsAllObjectsInArray: ["#parse", "#ftw"])
 query.findObjectsInBackgroundWithBlock {