diff --git a/middleman-cli/lib/middleman-cli.rb b/middleman-cli/lib/middleman-cli.rb index 512ab3ce..10efcd47 100644 --- a/middleman-cli/lib/middleman-cli.rb +++ b/middleman-cli/lib/middleman-cli.rb @@ -2,7 +2,7 @@ libdir = File.expand_path(File.dirname(__FILE__)) $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) -# Require thor since that's what the who CLI is built around +# Require Thor since that's what the whole CLI is built around require 'thor' require 'thor/group' @@ -11,7 +11,7 @@ module Middleman module Cli - # The base task from which everything else etends + # The base task from which everything else extends class Base < Thor class << self def start(*args) @@ -91,4 +91,4 @@ require 'middleman-cli/bundler' require 'middleman-cli/extension' require 'middleman-cli/server' require 'middleman-cli/build' -require 'middleman-cli/console' \ No newline at end of file +require 'middleman-cli/console' diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb b/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb index 65c43030..e1920f12 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/traversal.rb @@ -58,7 +58,7 @@ module Middleman parent.children.reject { |p| p == self } end - # Whether this resource either a directory index, or has the same name as an existing directory in the source + # Whether this resource is either a directory index, or has the same name as an existing directory in the source # @return [Boolean] def directory_index? path.include?(app.config[:index_file]) || path =~ /\/$/ || eponymous_directory? diff --git a/middleman-core/lib/middleman-core/sitemap/resource.rb b/middleman-core/lib/middleman-core/sitemap/resource.rb index 47d333c9..368f1e7b 100644 --- a/middleman-core/lib/middleman-core/sitemap/resource.rb +++ b/middleman-core/lib/middleman-core/sitemap/resource.rb @@ -73,7 +73,7 @@ module Middleman end # Merge in new metadata specific to this resource. - # @param [Hash] metadata A metadata block like provides_metadata_for_path takes + # @param [Hash] meta A metadata block like provides_metadata_for_path takes def add_metadata(meta={}) @local_metadata.deep_merge!(meta.dup) end diff --git a/middleman-core/lib/middleman-core/util.rb b/middleman-core/lib/middleman-core/util.rb index b4d919ca..71ce83f4 100644 --- a/middleman-core/lib/middleman-core/util.rb +++ b/middleman-core/lib/middleman-core/util.rb @@ -113,7 +113,7 @@ module Middleman end end - # Get a recusive list of files inside a set of paths. + # Get a recursive list of files inside a set of paths. # Works with symlinks. # # @param paths Some paths string or Pathname