Skip to content

Commit

Permalink
Various spelling fixes. Probably missed a bunch.
Browse files Browse the repository at this point in the history
  • Loading branch information
JesseObrien committed Jan 10, 2013
1 parent dc57470 commit cae116f
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions artisan.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ To view a list of all available Artisan commands, you may use the `list` command

php artisan list

Every command also includes a "help" screen which displays and describes the command's available argumnets and options. To view a help screen, simply preceed the name of the command with `help`:
Every command also includes a "help" screen which displays and describes the command's available arguments and options. To view a help screen, simply preceed the name of the command with `help`:

**Viewing The Help Screen For A Command**

Expand All @@ -33,4 +33,4 @@ You may also view the current version of your Laravel installation using the `--

**Displaying Your Current Laravel Version**

php artisan --version
php artisan --version
4 changes: 2 additions & 2 deletions cache.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ The cache configuration file also contains various other options, which are docu

Cache::forever('key', 'value');

Sometimes you may wish to retrieve an item from the cache, but also store a default value if the requested item doens't exist. You may do this using the `Cache::remember` method:
Sometimes you may wish to retrieve an item from the cache, but also store a default value if the requested item doesn't exist. You may do this using the `Cache::remember` method:

$value = Cache::remember('users', $minutes, function()
{
Expand Down Expand Up @@ -62,4 +62,4 @@ When using the `database` cache driver, you will need to setup a table to contai
$t->string('key')->unique();
$t->text('value');
$t->integer('expiration');
});
});
4 changes: 2 additions & 2 deletions commands.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ When defining `arguments`, the array definition values represent the following:

array($name, $mode, $description, $defaultValue)

The argument `mode` may be any of the following: `InputArgument::REQUIRED` or `InputArgumnet::OPTIONAL`.
The argument `mode` may be any of the following: `InputArgument::REQUIRED` or `InputArgument::OPTIONAL`.

When defining `options`, the array definition values represent the following:

Expand Down Expand Up @@ -128,4 +128,4 @@ Sometimes you may wish to call other commands from your command. You may do so u

**Calling Another Command**

$this->call('command.name', array('argument' => 'foo', '--option' => 'bar'))
$this->call('command.name', array('argument' => 'foo', '--option' => 'bar'))
4 changes: 2 additions & 2 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Pull requests for bugs may be sent without creating any proposal issue. If you b

If you have an idea for a new feature you would like to see added to Laravel, you may create an issue on Github with `[Request]` in the title. The feature request will then be reviewed by a core contributor.

<a name="coding-guidelins"></a>
<a name="coding-guidelines"></a>
## Coding Guidelines

Laravel follows the [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md) and [PSR-1](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-1-basic-coding-standard.md) coding standards. In addition to these standards, below is a list of other coding standards that should be followed:
Expand All @@ -29,4 +29,4 @@ Laravel follows the [PSR-0](https://github.com/php-fig/fig-standards/blob/master
- Class opening `{` should be on the same line as the class name.
- Function and control structure opening `{` should be on a separate line.
- Always use `and` and `or`. Never use `&&` or `||`.
- Interface names are suffixed with `Interface` (`FooInterface`)
- Interface names are suffixed with `Interface` (`FooInterface`)
8 changes: 4 additions & 4 deletions eloquent.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ If you need to add further constraints to which posts are retrieved, you may cal

$comments = Post::find(1)->comments()->where('title', '=', 'foo')->first();

Again, you may override the conventional foreign key by passing a second argumnet to the `hasMany` method:
Again, you may override the conventional foreign key by passing a second argument to the `hasMany` method:

return $this->hasMany('Comment', 'custom_key');

Expand Down Expand Up @@ -258,7 +258,7 @@ You may also override the conventional associated keys:
<a name="polymorphic-relations"></a>
### Polymorphic Relations

Poymorphic relations allow a model to belongs to more than one other model, on a single association. For example, you might ahve a photo model that belongs to either a staff model or an order model. We would define this relation like so:
Poymorphic relations allow a model to belongs to more than one other model, on a single association. For example, you might have a photo model that belongs to either a staff model or an order model. We would define this relation like so:

class Photo extends Eloquent {

Expand Down Expand Up @@ -308,7 +308,7 @@ However, the true "polymorphic" magic is when you access the staff or order from

The `imageable` relation on the `Photo` model will return either a `Staff` or `Order` instance, depending on which type of model owns the photo.

To help understand how this works, let's explore the databsae structure for a polymorphic relation:
To help understand how this works, let's explore the database structure for a polymorphic relation:

**Polymorphic Relation Table Structure**

Expand Down Expand Up @@ -608,4 +608,4 @@ Sometimes you may wish to limit the attributes that are included in your model's

protected $hidden = ['password'];

}
}
4 changes: 2 additions & 2 deletions errors.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ This is the most basic error handler. However, you may specify more handlers if
// Handle the exception...
});

If an excpetion handler returns a response, that response will be sent to the browser and no other error handlers will be called:
If an exception handler returns a response, that response will be sent to the browser and no other error handlers will be called:

App::error(function(InvalidUserException $exception)
{
Expand Down Expand Up @@ -59,4 +59,4 @@ The logger provides the seven logging levels defined in [RFC 5424](http://tools.

Monolog has a variety of additional handlers you may use for logging. If needed, you may access the underlying Monolog instance being used by Laravel:

$monolog = Log::getMonolog();
$monolog = Log::getMonolog();
8 changes: 4 additions & 4 deletions ioc.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ The IoC container is powerful enough to resolve classes without any configuratio

class FooBar {

public function __contruct(Baz $baz)
public function __construct(Baz $baz)
{
$this->baz = $baz;
}
Expand Down Expand Up @@ -112,7 +112,7 @@ Laravel provides several opportunities to use the IoC container to increase the

}

In this example, the `OrderRepository` class will automatically be injected into the controller. This means that when [unit testing](/docs/testing) a "mock" `OrderRepository` may be bound into the container and injected into the conroller, allowing for painless stubbing of database layer interaction.
In this example, the `OrderRepository` class will automatically be injected into the controller. This means that when [unit testing](/docs/testing) a "mock" `OrderRepository` may be bound into the container and injected into the controller, allowing for painless stubbing of database layer interaction.

[Filters](/docs/routing#route-filters), [composers](/docs/responses#view-composers), and [event handlers](/docs/events#using-classes-as-listeners) may also be resolved out of the IoC container. When registering them, simply give the name of the class that should be used:

Expand All @@ -122,7 +122,7 @@ In this example, the `OrderRepository` class will automatically be injected into

View::composer('foo', 'FooComposer');

Event::listne('foo', 'FooHandler');
Event::listen('foo', 'FooHandler');

<a name="service-providers"></a>
## Service Providers
Expand All @@ -147,4 +147,4 @@ To create a service provider, simply extend the `Illuminate\Support\ServiceProvi

}

Note that in the `register` method, the application IoC container is available to you via the `$this->app` property. Once you have created a provider and are ready to register it with your application, simply add it to the `providers` array in your `app` configuration file.
Note that in the `register` method, the application IoC container is available to you via the `$this->app` property. Once you have created a provider and are ready to register it with your application, simply add it to the `providers` array in your `app` configuration file.
4 changes: 2 additions & 2 deletions lifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The Laravel request lifecycle is fairly simple. A request enter your application

Your application's start files are stored at `app/start`. By default, three are included with your application: `global.php`, `local.php`, and `artisan.php`. For more information about `artisan.php`, refer to the documentation on the [Artisan command line](/docs/commands#registering-commands).

The `global.php` start file contains a few basic items by default, such as the registration of the [Logger](/docs/errors) and the includion of your `app/filters.php` file. However, you are free to add anything to this file that you wish. It will be automatically included on `every` requset to your application, regardless of environment. The `local.php` file, on the other hand, is only called when the application is executing in the `local` environment. For more information on environments, check out the [configuration](/docs/configuration) documentation.
The `global.php` start file contains a few basic items by default, such as the registration of the [Logger](/docs/errors) and the inclusion of your `app/filters.php` file. However, you are free to add anything to this file that you wish. It will be automatically included on `every` request to your application, regardless of environment. The `local.php` file, on the other hand, is only called when the application is executing in the `local` environment. For more information on environments, check out the [configuration](/docs/configuration) documentation.

Of course, if you have other environments in addition to `local`, you may create start files for those environments as well. They will be automatically included when your application is running in that environment.

Expand All @@ -35,4 +35,4 @@ You may also do pre and post request processing by registering `before` and `aft
//
});

Listeners to these events will be run `before` and `after` each request to your application.
Listeners to these events will be run `before` and `after` each request to your application.
6 changes: 3 additions & 3 deletions localization.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ You may also define place-holders in your language lines:

'welcome' => 'Welcome, :name',

Then, pass a second argument of replacemnets to the `Lang::get` method:
Then, pass a second argument of replacements to the `Lang::get` method:

echo Lang::get('messages.welcome', ['name' => 'Dayle']);

Expand All @@ -68,6 +68,6 @@ You may then use the `Lang::choice` method to retrieve the line:

echo Lang::choice('messages.apples', 10);

Since the Laravel translator is powered by the Symfony Translation component, you may also create more explicit plurilization rules easily:
Since the Laravel translator is powered by the Symfony Translation component, you may also create more explicit pluralization rules easily:

'apples' => '{0} There are none|[1,19] There are some|[20,Inf] There are many',
'apples' => '{0} There are none|[1,19] There are some|[20,Inf] There are many',
4 changes: 2 additions & 2 deletions validation.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ The field under validation must be _yes_, _on_, or _1_. This is useful for valid
<a name="rule-active-url"></a>
#### active_url

The field under validation must be a valid URL according to the `checkdnsr` PHP function.
The field under validation must be a valid URL according to the `checkdnsrr` PHP function.

<a name="rule-after"></a>
#### after:_date_
Expand Down Expand Up @@ -399,4 +399,4 @@ When creating a custom validation rules, you may sometimes need to define custom
protected function replaceFoo($message, $attribute, $rule, $parameters)
{
return str_replace(':foo', $parameters[0], $message);
}
}

0 comments on commit cae116f

Please sign in to comment.