diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2aacd83b..112ea26a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,7 +35,7 @@
* Fix for `+` in image filenames
* Fix for dot files causing issues with page processing
* Fix for Uri path detection on Windows platform
- * Fix for atlernative media resolutions
+ * Fix for alternative media resolutions
* Fix for modularTypes key properties
# v0.9.27
@@ -49,7 +49,7 @@
* Added a new `parseLinks` method to Plugins class
* Added `starts_with` and `ends_with` Twig filters
2. [](#improved)
- * Opitmized install of vendor libraries for speed improvement
+ * Optimized install of vendor libraries for speed improvement
* Improved configuration handling in preparation for admin plugin
* Cache optimization: Don't cache Twig templates when you pass dynamic params
* Moved `Utils::rcopy` to `Folder::rcopy`
@@ -63,7 +63,7 @@
* Fix for URLs with trailing slashes
* Handle condition where certain errors resulted in blank page
* Fix for issue with theme name equal to base_url and asset pipeline
- * Fix to properly nomralize font rewrite path
+ * Fix to properly normalize font rewrite path
* Fix for absolute URLs below the current page
* Fix for `..` page references
@@ -81,7 +81,7 @@
2. [](#improved)
* Refactored media image handling to make it more flexible and support absolute paths
* Refactored page modification check process to make it faster
- * User account improvements in preparation for Admin plugin
+ * User account improvements in preparation for admin plugin
* Protect against timing attacks
* Reset default system expires time to 0 seconds (can override if you need to)
3. [](#bugfix)
@@ -209,7 +209,7 @@
* Improved the markdown Lightbox functionality to better mimic Twig version
* Fullsize Lightbox can now have filters applied
* Added a new `mergeConfig()` method to Plugin class to merge system + page header configuration
- * Added a new `disable()` method to Plugin class to programatically disable a plugin
+ * Added a new `disable()` method to Plugin class to programmatically disable a plugin
* Updated Parsedown and Parsedown Extra to address bugs
* Various PSR fixes
3. [](#bugfix)
@@ -262,7 +262,7 @@
* Added `publish_date` in page headers to automatically publish page
* Added `unpublish_date` in page headers to automatically unpublish page
* Added `dateRange()` capability for collections
- * Added ability to dynamically control Cache lifetime programatically
+ * Added ability to dynamically control Cache lifetime programmatically
* Added ability to sort by anything in the page header. E.g. `sort: header.taxonomy.year`
* Added various helper methods to collections: `copy, nonVisible, modular, nonModular, published, nonPublished, nonRoutable`
2. [](#improved)
@@ -437,7 +437,7 @@
* Broke cache types out into multiple directories in the cache folder
* Removed vendor libs from github repository
* Various PSR cleanup of code
- * Various Blueprint updates to support upcoming Admin plugin
+ * Various Blueprint updates to support upcoming admin plugin
* Added ability to filter page children for normal/modular/all
* Added `sort_by_key` twig filter
* Added `visible()` and `routable()` filters to page collections
@@ -510,7 +510,7 @@
* Addition of Dependency Injection Container
* Refactored plugins to use Symfony Event Dispatcher
* New Asset Manager to provide unified management of JavaScript and CSS
- * Asset Pipelining to provide unification, minify, and optimazation of JavaScript and CSS
+ * Asset Pipelining to provide unification, minify, and optimization of JavaScript and CSS
* Grav Media support directly in Markdown syntax
* Additional Grav Generator meta tag in default themes
* Added support for PHP Stream Wrapper for resource location
diff --git a/system/config/system.yaml b/system/config/system.yaml
index 4d59ee364..365a669c8 100644
--- a/system/config/system.yaml
+++ b/system/config/system.yaml
@@ -32,7 +32,7 @@ pages:
'<': 'lt'
types: 'txt|xml|html|json|rss|atom' # Pipe separated list of valid page types
expires: 0 # Page expires time in seconds (604800 seconds = 7 days)
- last_modified: false # Set the last modified date header based on file modifcation timestamp
+ last_modified: false # Set the last modified date header based on file modification timestamp
etag: false # Set the etag header tag
cache:
@@ -79,7 +79,7 @@ images:
debug: false # Show an overlay over images indicating the pixel depth of the image when working with retina for example
media:
- enable_media_timestamp: false # Enable media timetsamps
+ enable_media_timestamp: false # Enable media timestamps
upload_limit: 0 # Set maximum upload size in bytes (0 is unlimited)
security:
diff --git a/system/src/Grav/Common/Assets.php b/system/src/Grav/Common/Assets.php
index 3662f7d98..4028fa7db 100644
--- a/system/src/Grav/Common/Assets.php
+++ b/system/src/Grav/Common/Assets.php
@@ -47,7 +47,7 @@ class Assets
* Closure used by the pipeline to fetch assets.
*
* Useful when file_get_contents() function is not available in your PHP
- * instalation or when you want to apply any kind of preprocessing to
+ * installation or when you want to apply any kind of preprocessing to
* your assets before they get pipelined.
*
* The closure will receive as the only parameter a string with the path/URL of the asset and
@@ -509,7 +509,7 @@ class Assets
/**
- * Minifiy and concatenate CSS / JS files.
+ * Minify and concatenate CSS / JS files.
*
* @return string
*/
@@ -741,7 +741,7 @@ class Assets
/**
* Determine whether a link is local or remote.
*
- * Undestands both "http://" and "https://" as well as protocol agnostic links "//"
+ * Understands both "http://" and "https://" as well as protocol agnostic links "//"
*
* @param string $link
*
@@ -920,7 +920,7 @@ class Assets
*
* @param string $directory
* @param string $pattern (regex)
- * @param string $ltrim Will be trimed from the left of the file path
+ * @param string $ltrim Will be trimmed from the left of the file path
*
* @return array
*/
diff --git a/system/src/Grav/Common/Cache.php b/system/src/Grav/Common/Cache.php
index 4cddca65a..0aefc0727 100644
--- a/system/src/Grav/Common/Cache.php
+++ b/system/src/Grav/Common/Cache.php
@@ -271,7 +271,7 @@ class Cache extends Getters
/**
- * Set the cache lifetime programatically
+ * Set the cache lifetime programmatically
*
* @param int $future timestamp
*/
diff --git a/system/src/Grav/Common/Data/DataMutatorTrait.php b/system/src/Grav/Common/Data/DataMutatorTrait.php
index c2110fe50..707b5078a 100644
--- a/system/src/Grav/Common/Data/DataMutatorTrait.php
+++ b/system/src/Grav/Common/Data/DataMutatorTrait.php
@@ -32,7 +32,7 @@ trait DataMutatorTrait
}
/**
- * Sey value by using dot notation for nested arrays/objects.
+ * Set value by using dot notation for nested arrays/objects.
*
* @example $value = $data->set('this.is.my.nested.variable', true);
*
diff --git a/system/src/Grav/Common/GPM/GPM.php b/system/src/Grav/Common/GPM/GPM.php
index c33d8cbb5..a6eefce5a 100644
--- a/system/src/Grav/Common/GPM/GPM.php
+++ b/system/src/Grav/Common/GPM/GPM.php
@@ -361,7 +361,7 @@ class GPM extends Iterator
}
if ($found = $this->findPackage($search)) {
- // set override respository if provided
+ // set override repository if provided
if ($repository) {
$found->override_repository = $repository;
}
diff --git a/system/src/Grav/Common/GPM/Installer.php b/system/src/Grav/Common/GPM/Installer.php
index b153f9c82..e2ebd0ed2 100644
--- a/system/src/Grav/Common/GPM/Installer.php
+++ b/system/src/Grav/Common/GPM/Installer.php
@@ -158,7 +158,7 @@ class Installer
/**
- * Unnstalls one or more given package
+ * Uninstalls one or more given package
*
* @param string $path The slug of the package(s)
* @param array $options Options to use for uninstalling
diff --git a/system/src/Grav/Common/GPM/Upgrader.php b/system/src/Grav/Common/GPM/Upgrader.php
index 413665144..f9e3c0e81 100644
--- a/system/src/Grav/Common/GPM/Upgrader.php
+++ b/system/src/Grav/Common/GPM/Upgrader.php
@@ -65,7 +65,7 @@ class Upgrader
* Returns the changelog list for each version of Grav
* @param string $diff the version number to start the diff from
*
- * @return array return the chagenlog list for each version
+ * @return array return the changelog list for each version
*/
public function getChangelog($diff = null)
{
diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index dcf571564..8b0c4d144 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -23,7 +23,7 @@ trait ParsedownGravTrait
protected $twig_link_regex = '/\!*\[(?:.*)\]\((\{([\{%#])\s*(.*?)\s*(?:\2|\})\})\)/';
/**
- * Initialiazation function to setup key variables needed by the MarkdownGravLinkTrait
+ * Initialization function to setup key variables needed by the MarkdownGravLinkTrait
*
* @param $page
* @param $defaults
diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php
index bea2b10d6..f7cc644d3 100644
--- a/system/src/Grav/Common/Page/Medium/ImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php
@@ -216,7 +216,7 @@ class ImageMedium extends Medium
}
/**
- * Turn the current Medium inta a Link with lightbox enabled
+ * Turn the current Medium into a Link with lightbox enabled
*
* @param int $width
* @param int $height
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index 0eb0666ce..48912f3eb 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -339,7 +339,7 @@ class Medium extends Data implements RenderableInterface
}
/**
- * Turn the current Medium inta a Link with lightbox enabled
+ * Turn the current Medium into a Link with lightbox enabled
*
* @param int $width
* @param int $height
diff --git a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
index 3f40200cb..da635223d 100644
--- a/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
+++ b/system/src/Grav/Common/Page/Medium/ThumbnailImageMedium.php
@@ -90,7 +90,7 @@ class ThumbnailImageMedium extends ImageMedium
}
/**
- * Turn the current Medium inta a Link with lightbox enabled
+ * Turn the current Medium into a Link with lightbox enabled
*
* @param int $width
* @param int $height
diff --git a/system/src/Grav/Common/Taxonomy.php b/system/src/Grav/Common/Taxonomy.php
index ebd62f577..226b67d2c 100644
--- a/system/src/Grav/Common/Taxonomy.php
+++ b/system/src/Grav/Common/Taxonomy.php
@@ -76,7 +76,7 @@ class Taxonomy
*
* @param array $taxonomies taxonomies to search, eg ['tag'=>['animal','cat']]
* @param string $operator can be 'or' or 'and' (defaults to 'or')
- * @return Colleciton Collection object set to contain matches found in the taxonomy map
+ * @return Collection Collection object set to contain matches found in the taxonomy map
*/
public function findTaxonomy($taxonomies, $operator = 'and')
{
diff --git a/system/src/Grav/Common/TwigExtension.php b/system/src/Grav/Common/TwigExtension.php
index 742dc242b..6645100f4 100644
--- a/system/src/Grav/Common/TwigExtension.php
+++ b/system/src/Grav/Common/TwigExtension.php
@@ -108,7 +108,7 @@ class TwigExtension extends \Twig_Extension
* Truncate content by a limit.
*
* @param string $string
- * @param int $limit Nax number of characters.
+ * @param int $limit Max number of characters.
* @param string $break Break point.
* @param string $pad Appended padding to the end of the string.
* @return string
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 948c0fdfa..55e1ad806 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -384,7 +384,7 @@ class Uri
}
/**
- * Retrun the IP address of the current user
+ * Return the IP address of the current user
*
* @return string ip address
*/
diff --git a/system/src/Grav/Common/User/User.php b/system/src/Grav/Common/User/User.php
index 13dc5d8e8..b727fa19b 100644
--- a/system/src/Grav/Common/User/User.php
+++ b/system/src/Grav/Common/User/User.php
@@ -90,7 +90,7 @@ class User extends Data
}
/**
- * Checks user authorisation to the action.
+ * Checks user authorization to the action.
*
* @param string $action
* @return bool
diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
index 22ba7b7d0..7262c498c 100644
--- a/system/src/Grav/Common/Utils.php
+++ b/system/src/Grav/Common/Utils.php
@@ -92,7 +92,7 @@ abstract class Utils
if (strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
return $text;
}
- // splits all html-tags to scanable lines
+ // splits all html-tags to scannable lines
preg_match_all('/(<.+?>)?([^<>]*)/s', $text, $lines, PREG_SET_ORDER);
$total_length = strlen($ending);
$truncate = '';
@@ -157,7 +157,7 @@ abstract class Utils
}
// if the words shouldn't be cut in the middle...
if (!$exact) {
- // ...search the last occurance of a space...
+ // ...search the last occurrence of a space...
$spacepos = strrpos($truncate, ' ');
if (isset($spacepos)) {
// ...and cut the text in this position
diff --git a/system/src/Grav/Console/Cli/SandboxCommand.php b/system/src/Grav/Console/Cli/SandboxCommand.php
index 43cfc230c..a5a6ce126 100644
--- a/system/src/Grav/Console/Cli/SandboxCommand.php
+++ b/system/src/Grav/Console/Cli/SandboxCommand.php
@@ -281,7 +281,7 @@ class SandboxCommand extends Command
private function perms()
{
$this->output->writeln('');
- $this->output->writeln('Permisions Initializing');
+ $this->output->writeln('Permissions Initializing');
$dir_perms = 0755;
diff --git a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
index 5e8f51a04..9647470f1 100644
--- a/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
+++ b/system/src/Grav/Console/Gpm/SelfupgradeCommand.php
@@ -96,7 +96,7 @@ class SelfupgradeCommand extends Command
exit;
}
- // not used but pre-loaded just in case!
+ // not used but preloaded just in case!
new ArrayInput([]);
$questionHelper = $this->getHelper('question');
diff --git a/system/src/Grav/Console/Gpm/UpdateCommand.php b/system/src/Grav/Console/Gpm/UpdateCommand.php
index bc987d52e..eef10039b 100644
--- a/system/src/Grav/Console/Gpm/UpdateCommand.php
+++ b/system/src/Grav/Console/Gpm/UpdateCommand.php
@@ -160,7 +160,7 @@ class UpdateCommand extends Command
$commandExec = $installCommand->run($args, $this->output);
if ($commandExec != 0) {
- $this->output->writeln("Error: An error occured while trying to install the extensions");
+ $this->output->writeln("Error: An error occurred while trying to install the extensions");
exit;
}