Skip to content

Commit 7c7656b

Browse files
committed
Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts: upgrade.md
2 parents c4ccc27 + 36a0787 commit 7c7656b

File tree

5 files changed

+5
-363
lines changed

5 files changed

+5
-363
lines changed

billing.md

-231
This file was deleted.

documentation.md

-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
- Başlangıç
77
- [Kurulum](/docs/installation)
88
- [Yapılandırma](/docs/configuration)
9-
- [Homestead](/docs/homestead)
109
- [İstek Yaşam Döngüsü](/docs/lifecycle)
1110
- [Rotalar](/docs/routing)
1211
- [İstekler (Requests) ve Girdi (Input)](/docs/requests)
@@ -15,7 +14,6 @@
1514
- [Hatalar ve Günlüğe Ekleme](/docs/errors)
1615
- Detaylı Öğrenim
1716
- [Kimlik Doğrulama](/docs/security)
18-
- [Faturalama](/docs/billing)
1917
- [Önbellekleme (Cache)](/docs/cache)
2018
- [Framework'ün Genişletilmesi](/docs/extending)
2119
- [Olaylar (Events)](/docs/events)

facades.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Input | [Illuminate\Http\Request](http://laravel.com/api/4.1/Illuminate/Http/R
136136
Lang | [Illuminate\Translation\Translator](http://laravel.com/api/4.1/Illuminate/Translation/Translator.html) | `translator`
137137
Log | [Illuminate\Log\Writer](http://laravel.com/api/4.1/Illuminate/Log/Writer.html) | `log`
138138
Mail | [Illuminate\Mail\Mailer](http://laravel.com/api/4.1/Illuminate/Mail/Mailer.html) | `mailer`
139-
Paginator | [Illuminate\Pagination\Factory](http://laravel.com/api/4.1/Illuminate/Pagination/Factory.html) | `paginator`
139+
Paginator | [Illuminate\Pagination\Environment](http://laravel.com/api/4.1/Illuminate/Pagination/Environment.html) | `paginator`
140140
Paginator (Olgu) | [Illuminate\Pagination\Paginator](http://laravel.com/api/4.1/Illuminate/Pagination/Paginator.html) |
141141
Password | [Illuminate\Auth\Reminders\PasswordBroker](http://laravel.com/api/4.1/Illuminate/Auth/Reminders/PasswordBroker.html) | `auth.reminder`
142142
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
155155
URL | [Illuminate\Routing\UrlGenerator](http://laravel.com/api/4.1/Illuminate/Routing/UrlGenerator.html) | `url`
156156
Validator | [Illuminate\Validation\Factory](http://laravel.com/api/4.1/Illuminate/Validation/Factory.html) | `validator`
157157
Validator (Olgu) | [Illuminate\Validation\Validator](http://laravel.com/api/4.1/Illuminate/Validation/Validator.html)
158-
View | [Illuminate\View\Factory](http://laravel.com/api/4.1/Illuminate/View/Factory.html) | `view`
158+
View | [Illuminate\View\Environment](http://laravel.com/api/4.1/Illuminate/View/Environment.html) | `view`
159159
View (Olgu) | [Illuminate\View\View](http://laravel.com/api/4.1/Illuminate/View/View.html) |

homestead.md

-127
This file was deleted.

0 commit comments

Comments
 (0)