fixing merge issues

application/config/application.php

@@ -8,7 +8,7 @@
 	|--------------------------------------------------------------------------
 	|
 	| The URL used to access your application without a trailing slash. The URL
-	| does not have to be set. If it isn't we'll try our best to guess the URL
+	| does not have to be set. If it isn't, we'll try our best to guess the URL
 	| of your application.
 	|
 	*/
@@ -48,7 +48,7 @@
 	|
 	| This key is used by the encryption and cookie classes to generate secure
 	| encrypted strings and hashes. It is extremely important that this key
-	| remain secret and should not be shared with anyone. Make it about 32
+	| remains secret and it should not be shared with anyone. Make it about 32
 	| characters of random gibberish.
 	|
 	*/
@@ -63,7 +63,7 @@
 	| Laravel includes a beautiful profiler toolbar that gives you a heads
 	| up display of the queries and logs performed by your application.
 	| This is wonderful for development, but, of course, you should
-	| disable the toolbar for production applications..
+	| disable the toolbar for production applications.
 	|
 	*/
 
@@ -112,7 +112,7 @@
 	| SSL Link Generation
 	|--------------------------------------------------------------------------
 	|
-	| Many sites use SSL to protect their users data. However, you may not be
+	| Many sites use SSL to protect their users' data. However, you may not be
 	| able to use SSL on your development machine, meaning all HTTPS will be
 	| broken during development.
 	|

application/config/cache.php

@@ -29,7 +29,7 @@
 	| This key will be prepended to item keys stored using Memcached and APC
 	| to prevent collisions with other applications on the server. Since the
 	| memory based stores could be shared by other applications, we need to
-	| be polite and use a prefix to uniquely identifier our items.
+	| be polite and use a prefix to uniquely identify our items.
 	|
 	*/
 

application/config/database.php

@@ -35,7 +35,7 @@
 	| Default Database Connection
 	|--------------------------------------------------------------------------
 	|
-	| The name of your default database connection. This connection will used
+	| The name of your default database connection. This connection will be used
 	| as the default for all database operations unless a different name is
 	| given when performing said operation. This connection name should be
 	| listed in the array of connections below.
@@ -54,7 +54,7 @@
 	| the freedom to specify as many connections as you can handle.
 	|
 	| All database work in Laravel is done through the PHP's PDO facilities,
-	| so make sure you have the PDO drivers for your particlar database of
+	| so make sure you have the PDO drivers for your particular database of
 	| choice installed on your machine.
 	|
 	*/

application/config/error.php

@@ -9,7 +9,7 @@
 	|
 	| Here you simply specify the error levels that should be ignored by the
 	| Laravel error handler. These levels will still be logged; however, no
-	| information about about them will be displayed.
+	| information about them will be displayed.
 	|
 	*/
 
@@ -56,7 +56,7 @@
 	| logging is enabled. 
 	|
 	| You may log the error message however you like; however, a simple log
-	| solution has been setup for you which will log all error messages to
+	| solution has been set up for you which will log all error messages to
 	| text files within the application storage directory.
 	|
 	*/

application/config/session.php

@@ -23,7 +23,7 @@
 	| Session Database
 	|--------------------------------------------------------------------------
 	|
-	| The database table on which the session should be stored. It probably
+	| The database table in which the session should be stored. It probably
 	| goes without saying that this option only matters if you are using
 	| the super slick database session driver.
 	|

application/config/strings.php

@@ -8,7 +8,7 @@
 	|--------------------------------------------------------------------------
 	|
 	| This array contains the singular and plural forms of words. It's used by
-	| the "singular" and "plural" methods on the Str class to convert a given
+	| the "singular" and "plural" methods in the Str class to convert a given
 	| word from singular to plural and vice versa.
 	|
 	| Note that the regular expressions are only for inflecting English words.

bundles/docs/routes.php

@@ -38,7 +38,7 @@ function document_exists($page)
 }
 
 /**
- * Attach the sidebar to the documentatoin template.
+ * Attach the sidebar to the documentation template.
  */
 View::composer('docs::template', function($view)
 {
@@ -68,7 +68,7 @@ function document_exists($page)
 
 	// If no page was specified, but a "home" page exists for the section,
 	// we'll set the file to the home page so that the proper page is
-	// display back out to the client for the requested doc page.
+	// displayed back out to the client for the requested doc page.
 	if (is_null($page) and document_exists($file.'/home'))
 	{
 		$file .= '/home';

laravel/auth/drivers/driver.php

@@ -80,7 +80,7 @@ public function user()
 	}
 
 	/**
-	 * Get the a given application user by ID.
+	 * Get the given application user by ID.
 	 *
 	 * @param  int    $id
 	 * @return mixed
@@ -192,7 +192,7 @@ protected function cookie($name, $value, $minutes)
 	}
 
 	/**
-	 * Get session key name used to store the token.
+	 * Get the session key name used to store the token.
 	 *
 	 * @return string
 	 */

laravel/auth/drivers/fluent.php

@@ -11,7 +11,7 @@ class Fluent extends Driver {
 	 *
 	 * If the user is a guest, null should be returned.
 	 *
-	 * @param  int         $id
+	 * @param  int  $id
 	 * @return mixed|null
 	 */
 	public function retrieve($id)

laravel/blade.php

@@ -149,9 +149,9 @@ protected static function compile_layouts($value)
 			return $value;
 		}
 
-		// First we'll get the layout from the top of the template and remove it.
-		// Then it is replaced with @include and attached to the end.
-		// By convention it must be located on the first line of the template contents.
+		// First we'll split out the lines of the template so we can get the
+		// layout from the top of the template. By convention, it must be
+		// located on the first line of the template contents.
 		preg_replace_callback(
 			'/^@layout(\s*?\(.+?\))(\r?\n)?/',
 			function($matches) use (&$value)
@@ -211,7 +211,7 @@ protected static function compile_echos($value)
 	protected static function compile_forelse($value)
 	{
 		preg_match_all('/@forelse\s*?\(\s*?\$(.+?)\s*?as\s*?\$(.+?)\s*?\)/', $value, $matches, PREG_SET_ORDER );
-		
+
 		if ( count($matches) < 1 ) return $value;
 
 		foreach ($matches as $forelse)
@@ -452,7 +452,7 @@ protected static function compile_extensions($value)
 		}
 
 		return $value;
-	}	
+	}
 
 	/**
 	 * Get the regular expression for a generic Blade function.

laravel/bundle.php

@@ -46,7 +46,7 @@ public static function register($bundle, $config = array())
 
 		// If the given configuration is actually a string, we will assume it is a
 		// location and set the bundle name to match it. This is common for most
-		// bundles who simply live in the root bundle directory.
+		// bundles that simply live in the root bundle directory.
 		if (is_string($config))
 		{
 			$bundle = $config;
@@ -55,7 +55,7 @@ public static function register($bundle, $config = array())
 		}
 
 		// If no location is set, we will set the location to match the name of
-		// the bundle. This is for bundles who are installed to the root of
+		// the bundle. This is for bundles that are installed on the root of
 		// the bundle directory so a location was not set.
 		if ( ! isset($config['location']))
 		{
@@ -74,7 +74,7 @@ public static function register($bundle, $config = array())
 	}
 
 	/**
-	 * Load a bundle by running it's start-up script.
+	 * Load a bundle by running its start-up script.
 	 *
 	 * If the bundle has already been started, no action will be taken.
 	 *
@@ -124,7 +124,7 @@ public static function routes($bundle)
 
 		$path = static::path($bundle).'routes'.EXT;
 
-		// By setting the bundle property on the router the router knows what
+		// By setting the bundle property on the router, the router knows what
 		// value to replace the (:bundle) place-holder with when the bundle
 		// routes are added, keeping the routes flexible.
 		Router::$bundle = static::option($bundle, 'handles');
@@ -372,7 +372,7 @@ public static function resolve($bundle)
 	}
 
 	/**
-	 * Parse a element identifier and return the bundle name and element.
+	 * Parse an element identifier and return the bundle name and element.
 	 *
 	 * <code>
 	 *		// Returns array(null, 'admin.user')

laravel/cli/artisan.php

@@ -34,7 +34,7 @@
  * We will wrap the command execution in a try / catch block and
  * simply write out any exception messages we receive to the CLI
  * for the developer. Note that this only writes out messages
- * for the CLI exceptions. All others will be not be caught
+ * for the CLI exceptions. All others will not be caught
  * and will be totally dumped out to the CLI.
  */
 try

laravel/cli/command.php

@@ -121,7 +121,7 @@ public static function resolve($bundle, $task)
 		}
 
 		// If the task file exists, we'll format the bundle and task name
-		// into a task class name and resolve an instance of the so that
+		// into a task class name and resolve an instance of the class so that
 		// the requested method may be executed.
 		if (file_exists($path = Bundle::path($bundle).'tasks/'.$task.EXT))
 		{

laravel/cli/tasks/migrate/migrator.php

@@ -151,7 +151,7 @@ public function install()
 			$table->create();
 
 			// Migrations can be run for a specific bundle, so we'll use
-			// the bundle name and string migration name as an unique ID
+			// the bundle name and string migration name as a unique ID
 			// for the migrations, allowing us to easily identify which
 			// migrations have been run for each bundle.
 			$table->string('bundle', 50);

laravel/config.php

@@ -73,7 +73,7 @@ public static function get($key, $default = null)
 		$items = static::$items[$bundle][$file];
 
 		// If a specific configuration item was not requested, the key will be null,
-		// meaning we'll to return the entire array of configuration item from the
+		// meaning we'll return the entire array of configuration items from the
 		// requested configuration file. Otherwise we can return the item.
 		if (is_null($item))
 		{
@@ -175,7 +175,7 @@ public static function load($bundle, $file)
 		// requested. This allows many types of config "drivers".
 		$config = Event::first(static::loader, func_get_args());
 
-		// If configuration items were actually found for the bundle and file we
+		// If configuration items were actually found for the bundle and file, we
 		// will add them to the configuration array and return true, otherwise
 		// we will return false indicating the file was not found.
 		if (count($config) > 0)

laravel/cookie.php

@@ -3,7 +3,7 @@
 class Cookie {
 
 	/**
-	 * How long is forever (in minutes).
+	 * How long is forever (in minutes)?
 	 *
 	 * @var int
 	 */

laravel/core.php

@@ -147,7 +147,7 @@
 | Determine The Application Environment
 |--------------------------------------------------------------------------
 |
-| Next we're ready to determine the application environment. This may be
+| Next, we're ready to determine the application environment. This may be
 | set either via the command line options or via the mapping of URIs to
 | environments that lives in the "paths.php" file for the application
 | and is parsed. When determining the CLI environment, the "--env"
@@ -178,7 +178,7 @@
 |
 | Once we have determined the application environment, we will set it on
 | the global server array of the HttpFoundation request. This makes it
-| available throughout the application, thought it is mainly only
+| available throughout the application, though it is mainly only
 | used to determine which configuration files to merge in.
 |
 */
@@ -216,7 +216,7 @@
 |--------------------------------------------------------------------------
 |
 | Finally we will register all of the bundles that have been defined for
-| the application. None of them will be started yet, but will be setup
+| the application. None of them will be started yet, but will be set up
 | so that they may be started by the developer at any time.
 |
 */

laravel/database/connection.php

@@ -209,7 +209,7 @@ public function query($sql, $bindings = array())
 	/**
 	 * Execute a SQL query against the connection.
 	 *
-	 * The PDO statement and boolean result will be return in an array.
+	 * The PDO statement and boolean result will be returned in an array.
 	 *
 	 * @param  string  $sql
 	 * @param  array   $bindings
@@ -265,7 +265,7 @@ protected function execute($sql, $bindings = array())
 			throw $exception;
 		}
 
-		// Once we have execute the query, we log the SQL, bindings, and
+		// Once we have executed the query, we log the SQL, bindings, and
 		// execution time in a static array that is accessed by all of
 		// the connections actively being used by the application.
 		if (Config::get('database.profile'))

laravel/database/eloquent/model.php

@@ -753,7 +753,7 @@ public function __call($method, $parameters)
 	{
 		$meta = array('key', 'table', 'connection', 'sequence', 'per_page', 'timestamps');
 
-		// If the method is actually the name of a static property on the model we'll
+		// If the method is actually the name of a static property on the model, we'll
 		// return the value of the static property. This makes it convenient for
 		// relationships to access these values off of the instances.
 		if (in_array($method, $meta))

laravel/database/eloquent/query.php

@@ -141,7 +141,7 @@ public function hydrate($model, $results)
 			}
 		}
 
-		// The many to many relationships may have pivot table column on them
+		// The many to many relationships may have pivot table columns on them
 		// so we will call the "clean" method on the relationship to remove
 		// any pivot columns that are on the model.
 		if ($this instanceof Relationships\Has_Many_And_Belongs_To)
@@ -199,7 +199,7 @@ protected function nested_includes($relationship)
 		foreach ($this->model_includes() as $include => $constraints)
 		{
 			// To get the nested includes, we want to find any includes that begin
-			// the relationship and a dot, then we will strip off the leading
+			// the relationship with a dot, then we will strip off the leading
 			// nesting indicator and set the include in the array.
 			if (starts_with($include, $relationship.'.'))
 			{
@@ -278,4 +278,4 @@ public function __call($method, $parameters)
 		return $this;
 	}
 
-}
+}

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

@@ -44,7 +44,7 @@ public function __construct($model, $associated, $table, $foreign, $other)
 		$this->joining = $table ?: $this->joining($model, $associated);
 
 		// If the Pivot table is timestamped, we'll set the timestamp columns to be
-		// fetched when the pivot table models are fetched by the developer else
+		// fetched when the pivot table models are fetched by the developer, or else
 		// the ID will be the only "extra" column fetched in by default.
 		if (Pivot::$timestamps)
 		{
@@ -131,7 +131,7 @@ public function sync($ids)
 		}
 
 		// Next we will take the difference of the current and given IDs and detach
-		// all of the entities that exists in the current array but are not in
+		// all of the entities that exist in the current array but are not in
 		// the array of IDs given to the method, finishing the sync.
 		$detach = array_diff($current, $ids);
 

laravel/database/grammar.php

@@ -35,7 +35,7 @@ public function __construct(Connection $connection)
 	 */
 	public function wrap_table($table)
 	{
-		// Expressions should be injected into the query as raw strings so
+		// Expressions should be injected into the query as raw strings
 		// so we do not want to wrap them in any way. We will just return
 		// the string value from the expression to be included.
 		if ($table instanceof Expression)
@@ -64,7 +64,7 @@ public function wrap_table($table)
 	 */
 	public function wrap($value)
 	{
-		// Expressions should be injected into the query as raw strings so
+		// Expressions should be injected into the query as raw strings
 		// so we do not want to wrap them in any way. We will just return
 		// the string value from the expression to be included.
 		if ($value instanceof Expression)