Merge pull request #6 from laravel-tr/4.2

4.2

Author: sineld

facades.md

@@ -136,7 +136,7 @@ Input  |  [Illuminate\Http\Request](http://laravel.com/api/4.1/Illuminate/Http/R
 Lang  |  [Illuminate\Translation\Translator](http://laravel.com/api/4.1/Illuminate/Translation/Translator.html)  |  `translator`
 Log  |  [Illuminate\Log\Writer](http://laravel.com/api/4.1/Illuminate/Log/Writer.html)  |  `log`
 Mail  |  [Illuminate\Mail\Mailer](http://laravel.com/api/4.1/Illuminate/Mail/Mailer.html)  |  `mailer`
-Paginator  |  [Illuminate\Pagination\Factory](http://laravel.com/api/4.1/Illuminate/Pagination/Factory.html)  |  `paginator`
+Paginator  |  [Illuminate\Pagination\Environment](http://laravel.com/api/4.1/Illuminate/Pagination/Environment.html)  |  `paginator`
 Paginator (Olgu)  |  [Illuminate\Pagination\Paginator](http://laravel.com/api/4.1/Illuminate/Pagination/Paginator.html)  |
 Password  |  [Illuminate\Auth\Reminders\PasswordBroker](http://laravel.com/api/4.1/Illuminate/Auth/Reminders/PasswordBroker.html)  |  `auth.reminder`
 Queue  |  [Illuminate\Queue\QueueManager](http://laravel.com/api/4.1/Illuminate/Queue/QueueManager.html)  |  `queue`
@@ -155,5 +155,5 @@ SSH (Olgu)  |  [Illuminate\Remote\Connection](http://laravel.com/api/4.1/Illumin
 URL  |  [Illuminate\Routing\UrlGenerator](http://laravel.com/api/4.1/Illuminate/Routing/UrlGenerator.html)  |  `url`
 Validator  |  [Illuminate\Validation\Factory](http://laravel.com/api/4.1/Illuminate/Validation/Factory.html)  |  `validator`
 Validator (Olgu)  |  [Illuminate\Validation\Validator](http://laravel.com/api/4.1/Illuminate/Validation/Validator.html)
-View  |  [Illuminate\View\Factory](http://laravel.com/api/4.1/Illuminate/View/Factory.html)  |  `view`
+View  |  [Illuminate\View\Environment](http://laravel.com/api/4.1/Illuminate/View/Environment.html)  |  `view`
 View (Olgu)  |  [Illuminate\View\View](http://laravel.com/api/4.1/Illuminate/View/View.html)  |

upgrade.md

@@ -1,9 +1,9 @@
 # Yükseltme Rehberi
 
-- [4.1'den 4.2'ye Yükseltme](#upgrade-4.2)
 - [4.1.25 ve Öncesinden 4.1.26'ye Yükseltme](#upgrade-4.1.26)
 - [4.0'dan 4.1'e Yükseltme](#upgrade-4.1)
 
+<<<<<<< HEAD
 <a name="upgrade-4.2"></a>
 ## 4.1'den 4.2'ye Yükseltme
 
@@ -49,6 +49,8 @@ Eğer `Illuminate\Pagination\Presenter` sınıfını genişletiyorsanız, `getPa
 
 	abstract public function getPageLinkWrapper($url, $page, $rel = null);
 
+=======
+>>>>>>> origin/4.1
 <a name="upgrade-4.1.26"></a>
 ## 4.1.25 ve Öncesinden 4.1.26'ye Yükseltme