Fix various typos and spelling errors in documentation, comments and code. (#4134)

8 files changed, 12 insertions, 12 deletions

diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php
index fedabea8e..c4258b8df 100644
--- a/app/Controllers/authController.php
+++ b/app/Controllers/authController.php
@@ -149,7 +149,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController {
 				]);
 				FreshRSS_Auth::giveAccess();
 
-				// Set cookie parameter if nedded.
+				// Set cookie parameter if needed.
 				if (Minz_Request::param('keep_logged_in')) {
 					FreshRSS_FormAuth::makeCookie($username, FreshRSS_Context::$user_conf->passwordHash);
 				} else {
diff --git a/app/Controllers/entryController.php b/app/Controllers/entryController.php
index 5afd24a91..29b87b927 100755
--- a/app/Controllers/entryController.php
+++ b/app/Controllers/entryController.php
@@ -152,7 +152,7 @@ class FreshRSS_entry_Controller extends FreshRSS_ActionController {
 	/**
 	 * This action optimizes database to reduce its size.
 	 *
-	 * This action shouldbe reached by a POST request.
+	 * This action should be reached by a POST request.
 	 *
 	 * @todo move this action in configure controller.
 	 * @todo call this action through web-cron when available
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index efb2684fe..d384afddb 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -255,7 +255,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController {
 	 *
 	 * @param string $article_file the JSON file content.
 	 * @param boolean $starred true if articles from the file must be starred.
-	 * @return boolean false if an error occured, true otherwise.
+	 * @return boolean false if an error occurred, true otherwise.
 	 */
 	private function importJson($article_file, $starred = false) {
 		$article_object = json_decode($article_file, true);
diff --git a/app/Controllers/indexController.php b/app/Controllers/indexController.php
index c6200f868..d9a59c5e3 100755
--- a/app/Controllers/indexController.php
+++ b/app/Controllers/indexController.php
@@ -9,10 +9,10 @@ class FreshRSS_index_Controller extends FreshRSS_ActionController {
 	 * This action only redirect on the default view mode (normal or global)
 	 */
 	public function indexAction() {
-		$prefered_output = FreshRSS_Context::$user_conf->view_mode;
+		$preferred_output = FreshRSS_Context::$user_conf->view_mode;
 		Minz_Request::forward(array(
 			'c' => 'index',
-			'a' => $prefered_output
+			'a' => $preferred_output
 		));
 	}
 
diff --git a/app/Controllers/subscriptionController.php b/app/Controllers/subscriptionController.php
index 7545035cc..eb0d86c3b 100644
--- a/app/Controllers/subscriptionController.php
+++ b/app/Controllers/subscriptionController.php
@@ -72,7 +72,7 @@ class FreshRSS_subscription_Controller extends FreshRSS_ActionController {
 	 *
 	 * It displays the feed configuration page.
 	 * If this action is reached through a POST request, it stores all new
-	 * configuraiton values then sends a notification to the user.
+	 * configuration values then sends a notification to the user.
 	 *
 	 * The options available on the page are:
 	 *   - name
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 4b781d5db..6814c8521 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -542,7 +542,7 @@ SQL;
 
 	/**
 	 * Mark all the articles in a tag as read.
-	 * @param integer $id tag ID, or empty for targetting any tag
+	 * @param integer $id tag ID, or empty for targeting any tag
 	 * @param integer $idMax max article ID
 	 * @return integer|false affected rows
 	 */
diff --git a/app/Models/EntryDAOSQLite.php b/app/Models/EntryDAOSQLite.php
index 649536bdf..51bf9635f 100644
--- a/app/Models/EntryDAOSQLite.php
+++ b/app/Models/EntryDAOSQLite.php
@@ -242,7 +242,7 @@ DROP TABLE IF EXISTS `tmp`;
 
 	/**
 	 * Mark all the articles in a tag as read.
-	 * @param integer $id tag ID, or empty for targetting any tag
+	 * @param integer $id tag ID, or empty for targeting any tag
 	 * @param integer $idMax max article ID
 	 * @return integer|false affected rows
 	 */
diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php
index 4cc38c15c..f995a3dd7 100644
--- a/app/Services/ImportService.php
+++ b/app/Services/ImportService.php
@@ -26,7 +26,7 @@ class FreshRSS_Import_Service {
 	 * This method parses and imports an OPML file.
 	 *
 	 * @param string $opml_file the OPML file content.
-	 * @return boolean false if an error occured, true otherwise.
+	 * @return boolean false if an error occurred, true otherwise.
 	 */
 	public function importOpml($opml_file) {
 		$opml_array = array();
@@ -51,7 +51,7 @@ class FreshRSS_Import_Service {
 	 *
 	 * @param array $opml_elements an OPML element (body or outline).
 	 * @param string $parent_cat the name of the parent category.
-	 * @return boolean false if an error occured, true otherwise.
+	 * @return boolean false if an error occurred, true otherwise.
 	 */
 	private function addOpmlElements($opml_elements, $parent_cat = null) {
 		$isOkStatus = true;
@@ -108,7 +108,7 @@ class FreshRSS_Import_Service {
 	 *
 	 * @param array $feed_elt an OPML element (must be a feed element).
 	 * @param string $parent_cat the name of the parent category.
-	 * @return boolean false if an error occured, true otherwise.
+	 * @return boolean false if an error occurred, true otherwise.
 	 */
 	private function addFeedOpml($feed_elt, $parent_cat) {
 		if ($parent_cat == null) {
@@ -185,7 +185,7 @@ class FreshRSS_Import_Service {
 	 * @param string $parent_cat the name of the parent category.
 	 * @param boolean $cat_limit_reached indicates if category limit has been reached.
 	 *                if yes, category is not added (but we try for feeds!)
-	 * @return boolean false if an error occured, true otherwise.
+	 * @return boolean false if an error occurred, true otherwise.
 	 */
 	private function addCategoryOpml($cat_elt, $parent_cat, $cat_limit_reached) {
 		// Create a new Category object