ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/config/application.php
View File

@@ -8,7 +8,7 @@ return array(
|--------------------------------------------------------------------------
|
| 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 @@ return array(
|
| 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 @@ return array(
| 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 @@ return array(
| 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.
|

2
application/config/cache.php
View File

@@ -29,7 +29,7 @@ return array(
| 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.
|
*/

4
application/config/database.php
View File

@@ -35,7 +35,7 @@ return array(
| 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 @@ return array(
| 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.
|
*/

4
application/config/error.php
View File

@@ -9,7 +9,7 @@ return array(
|
| 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 @@ return array(
| 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.
|
*/

2
application/config/session.php
View File

@@ -23,7 +23,7 @@ return array(
| 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.
|

2
application/config/strings.php
View File

@@ -8,7 +8,7 @@ return array(
|--------------------------------------------------------------------------
|
| 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.