Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork5.2k
Commit9f82c6f
committed
Merge branch '2.3' into 2.5
* 2.3: (33 commits) Fixing bad reference [#4743] parts -> part - subjective, but this sounds slightly better to me Update web_server_configuration.rst Update web_server_configuration.rst Update web_server_configuration.rst Add exception to console exception log [#4454] Re-wording section, but it may not actually be accurate More concrete explanation of validation groups Adding missing index/map documents [#4611] A few more tweaks and fixes Basically copying a section about upgrading other libraries down into the minor version section [#4611] Removing a few entries I meant to remove before [#4611] Making many tweaks thanks to guys like Javier, Wouter, Christian (xabbuh) and Stof Adding a guide about upgrading Fix typo and remove redundant sentence [Reference] Add default_locale config description Clarify tip for creating a new AppBundle Update forms.rst Rewroded some contents and fixed some lists of elements MAde some tweaks suggested by Wouter ...Conflicts:book/http_cache.rstFile tree
18 files changed
+523
-174
lines changed- best_practices
- book
- components
- dependency_injection
- yaml
- cookbook
- configuration
- console
- reference/configuration
18 files changed
+523
-174
lines changedLines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
152 | 152 |
| |
153 | 153 |
| |
154 | 154 |
| |
155 |
| - | |
156 |
| - | |
| 155 | + | |
157 | 156 |
| |
158 | 157 |
| |
159 | 158 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
13 | 13 |
| |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
17 |
| - | |
| 16 | + | |
| 17 | + | |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
|
Lines changed: 1 addition & 0 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
153 | 153 |
| |
154 | 154 |
| |
155 | 155 |
| |
| 156 | + | |
156 | 157 |
| |
157 | 158 |
| |
158 | 159 |
| |
|
Lines changed: 32 additions & 3 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
526 | 526 |
| |
527 | 527 |
| |
528 | 528 |
| |
| 529 | + | |
529 | 530 |
| |
530 | 531 |
| |
531 | 532 |
| |
| |||
541 | 542 |
| |
542 | 543 |
| |
543 | 544 |
| |
| 545 | + | |
544 | 546 |
| |
545 | 547 |
| |
546 | 548 |
| |
| 549 | + | |
547 | 550 |
| |
548 | 551 |
| |
549 | 552 |
| |
550 | 553 |
| |
551 | 554 |
| |
552 |
| - | |
| 555 | + | |
553 | 556 |
| |
554 |
| - | |
555 |
| - | |
556 | 557 |
| |
| 558 | + | |
| 559 | + | |
| 560 | + | |
| 561 | + | |
| 562 | + | |
| 563 | + | |
| 564 | + | |
| 565 | + | |
| 566 | + | |
| 567 | + | |
| 568 | + | |
| 569 | + | |
| 570 | + | |
| 571 | + | |
| 572 | + | |
| 573 | + | |
| 574 | + | |
| 575 | + | |
| 576 | + | |
| 577 | + | |
| 578 | + | |
| 579 | + | |
| 580 | + | |
| 581 | + | |
| 582 | + | |
557 | 583 |
| |
558 | 584 |
| |
559 | 585 |
| |
560 | 586 |
| |
| 587 | + | |
| 588 | + | |
| 589 | + | |
561 | 590 |
| |
562 | 591 |
| |
563 | 592 |
| |
|
Lines changed: 120 additions & 71 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
333 | 333 |
| |
334 | 334 |
| |
335 | 335 |
| |
336 |
| - | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
337 | 344 |
| |
338 | 345 |
| |
339 | 346 |
| |
| |||
399 | 406 |
| |
400 | 407 |
| |
401 | 408 |
| |
| 409 | + | |
402 | 410 |
| |
403 |
| - | |
404 |
| - | |
| 411 | + | |
| 412 | + | |
405 | 413 |
| |
406 | 414 |
| |
407 | 415 |
| |
| |||
418 | 426 |
| |
419 | 427 |
| |
420 | 428 |
| |
421 |
| - | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
422 | 432 |
| |
423 | 433 |
| |
424 | 434 |
| |
| |||
772 | 782 |
| |
773 | 783 |
| |
774 | 784 |
| |
775 |
| - | |
| 785 | + | |
776 | 786 |
| |
777 | 787 |
| |
778 | 788 |
| |
| |||
800 | 810 |
| |
801 | 811 |
| |
802 | 812 |
| |
803 |
| - | |
804 |
| - | |
| 813 | + | |
| 814 | + | |
| 815 | + | |
| 816 | + | |
| 817 | + | |
| 818 | + | |
| 819 | + | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
| 855 | + | |
| 856 | + | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
| 901 | + | |
| 902 | + | |
| 903 | + | |
| 904 | + | |
| 905 | + | |
| 906 | + | |
| 907 | + | |
| 908 | + | |
| 909 | + | |
| 910 | + | |
| 911 | + | |
| 912 | + | |
| 913 | + | |
| 914 | + | |
| 915 | + | |
| 916 | + | |
805 | 917 |
| |
806 | 918 |
| |
807 | 919 |
| |
| |||
1048 | 1160 |
| |
1049 | 1161 |
| |
1050 | 1162 |
| |
1051 |
| - | |
1052 |
| - | |
1053 |
| - | |
1054 |
| - | |
1055 |
| - | |
1056 |
| - | |
1057 |
| - | |
1058 |
| - | |
1059 |
| - | |
1060 |
| - | |
1061 |
| - | |
1062 |
| - | |
1063 |
| - | |
1064 |
| - | |
1065 |
| - | |
1066 |
| - | |
1067 |
| - | |
1068 |
| - | |
1069 |
| - | |
1070 |
| - | |
1071 |
| - | |
1072 |
| - | |
1073 |
| - | |
1074 |
| - | |
1075 |
| - | |
1076 |
| - | |
1077 |
| - | |
1078 |
| - | |
1079 |
| - | |
1080 |
| - | |
1081 |
| - | |
1082 |
| - | |
1083 |
| - | |
1084 |
| - | |
1085 |
| - | |
1086 |
| - | |
1087 |
| - | |
1088 |
| - | |
1089 |
| - | |
1090 |
| - | |
1091 |
| - | |
1092 |
| - | |
1093 |
| - | |
1094 |
| - | |
1095 |
| - | |
1096 |
| - | |
1097 |
| - | |
1098 |
| - | |
1099 |
| - | |
1100 |
| - | |
1101 |
| - | |
1102 |
| - | |
1103 |
| - | |
1104 |
| - | |
1105 |
| - | |
1106 |
| - | |
1107 |
| - | |
1108 |
| - | |
1109 |
| - | |
1110 |
| - | |
1111 |
| - | |
1112 |
| - | |
1113 |
| - | |
1114 |
| - | |
1115 | 1163 |
| |
1116 | 1164 |
| |
1117 | 1165 |
| |
| |||
1139 | 1187 |
| |
1140 | 1188 |
| |
1141 | 1189 |
| |
| 1190 | + |
Lines changed: 1 addition & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1141 | 1141 |
| |
1142 | 1142 |
| |
1143 | 1143 |
| |
1144 |
| - | |
1145 |
| - | |
| 1144 | + | |
1146 | 1145 |
| |
1147 | 1146 |
| |
1148 | 1147 |
| |
|
Lines changed: 29 additions & 1 deletion
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
817 | 817 |
| |
818 | 818 |
| |
819 | 819 |
| |
820 |
| - | |
| 820 | + | |
| 821 | + | |
| 822 | + | |
821 | 823 |
| |
822 | 824 |
| |
823 | 825 |
| |
824 | 826 |
| |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
825 | 853 |
| |
826 | 854 |
| |
827 | 855 |
| |
|
0 commit comments
Comments
(0)