Spelling

app/Http/Controllers/LinkController.php

@@ -72,7 +72,7 @@ public function performRedirect(Request $request, $short_url, $secret_key=false)
         $link_secret_key = $link->secret_key;
         if ($link_secret_key) {
         	if (!$secret_key) {
-        		// if we do not receieve a secret key
+        		// if we do not receive a secret key
         		// when we are expecting one, return a 403
         		return abort(403);
         	}

docs/developer-guide/api.md

@@ -232,7 +232,7 @@ Response:
 ```
 
 ## HTTP Error Codes
-The API will return an error code if your request was malformed or another error occured while processing your request.
+The API will return an error code if your request was malformed or another error occurred while processing your request.
 
 ### HTTP 400 Bad Request
 This status code is returned in the following circumstances:

docs/developer-guide/api_errors.md

@@ -2,7 +2,7 @@
 To diagnose an unexpected or unhandled error, turn on the `APP_DEBUG` flag by setting
 it to `true` in `.env`
 
-`SERVER_ERROR`: A generic, unhandled error has occured.
+`SERVER_ERROR`: A generic, unhandled error has occurred.
 
 `JSON_ONLY`: Only JSON-encoded data is available for this endpoint.
 
@@ -18,7 +18,7 @@ it to `true` in `.env`
 
 `CREATION_ERROR`: An error occurred while creating the object.
 
-`AUTH_ERROR`: An error occured while attempting to authenticate the user to the API.
+`AUTH_ERROR`: An error occurred while attempting to authenticate the user to the API.
 
 `QUOTA_EXCEEDED`: User's API usage has exceeded alloted quota.
 

public/js/AdminCtrl.js

@@ -261,7 +261,7 @@ polr.controller('AdminCtrl', function($scope, $compile, $timeout) {
             $('#new-user-form').clearForm();
             $scope.datatables['admin_users_table'].ajax.reload();
         }, function () {
-            toastr.error("An error occured while creating the user.", "Error");
+            toastr.error("An error occurred while creating the user.", "Error");
         });
     }
 

public/js/index.js

@@ -30,12 +30,12 @@ $(function() {
             } else if (msg == 'invalid') {
                 $('#link-availability-status').html('<span style="color:orange"><i class="fa fa-exclamation-triangle"></i> Invalid Custom URL Ending</span>');
             } else {
-                $('#link-availability-status').html(' <span style="color:red"><i class="fa fa-exclamation-circle"></i> An error occured. Try again</span>' + msg);
+                $('#link-availability-status').html(' <span style="color:red"><i class="fa fa-exclamation-circle"></i> An error occurred. Try again</span>' + msg);
             }
         });
 
         request.fail(function(jqXHR, textStatus) {
-            $('#link-availability-status').html(' <span style="color:red"><i class="fa fa-exclamation-circle"></i> An error occured. Try again</span>' + textstatus);
+            $('#link-availability-status').html(' <span style="color:red"><i class="fa fa-exclamation-circle"></i> An error occurred. Try again</span>' + textstatus);
         });
     });
     min = 1;

resources/views/about.blade.php

@@ -22,7 +22,7 @@
     @endif
 
     <p>{{env('APP_NAME')}} is powered by Polr 2, an open source, minimalist link shortening platform. The Polr Project is in no way associated with this site.
-        Learn more at <a href='https://github.com/Cydrobolt/polr'>its Github page</a> or its <a href="//project.polr.me">project site</a>.
+        Learn more at <a href='https://github.com/Cydrobolt/polr'>its GitHub page</a> or its <a href="//project.polr.me">project site</a>.
         <br />Polr is licensed under the GNU GPL License.
     </p>
 </div>

resources/views/setup.blade.php

@@ -223,7 +223,7 @@
             </p>
             <select name='setting:acct_registration_recaptcha' class='form-control'>
                 <option value='false'>Do not require reCAPTCHA for registration</option>
-                <option value='true'>Require reCATPCHA for registration</option>
+                <option value='true'>Require reCAPTCHA for registration</option>
             </select>
 
             <p>
@@ -281,7 +281,7 @@
 
     <div>
         Polr Version {{env('VERSION')}} released {{env('VERSION_RELMONTH')}} {{env('VERSION_RELDAY')}}, {{env('VERSION_RELYEAR')}} -
-        <a href='//github.com/cydrobolt/polr' target='_blank'>Github</a>
+        <a href='//github.com/cydrobolt/polr' target='_blank'>GitHub</a>
 
         <div class='footer-well'>
             &copy; Copyright {{env('VERSION_RELYEAR')}}

tests/LinkControllerTest.php

@@ -8,7 +8,7 @@ class LinkControllerTest extends TestCase
      * @return void
      */
     public function testRequestGetNotExistShortUrl() {
-        $response = $this->call('GET', '/notexist');
+        $response = $this->call('GET', '/nonexistent');
         $this->assertTrue($response->isRedirection());
         $this->assertRedirectedTo(env('SETTING_INDEX_REDIRECT'));
     }

util/version.py

@@ -20,7 +20,7 @@
     setup_env_lines = re.sub(r'(?is)VERSION_RELDAY=\w+', 'VERSION_RELDAY={}'.format(now.day), setup_env_lines)
     setup_env_lines = re.sub(r'(?is)VERSION_RELYEAR=\w+', 'VERSION_RELYEAR={}'.format(now.year), setup_env_lines)
 
-    # Overwite existing file
+    # Overwrite existing file
     setup_env.seek(0)
     setup_env.write(setup_env_lines)
     setup_env.truncate()