Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 258bc68

Browse files
committed
Merge branch '3.1'
* 3.1: Update links to the documentation updated VENDORS for 3.1.6 updated VENDORS for 2.8.13 updated VENDORS for 2.7.20 updated VENDORS for 3.1.5 updated VENDORS for 2.8.12 updated VENDORS for 2.7.19 updated VENDORS for 2.8.11 updated VENDORS for 2.7.18
2 parents f81e1c4 + 3c55290 commit 258bc68

File tree

7 files changed

+65
-61
lines changed

7 files changed

+65
-61
lines changed

README.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,12 @@ released under the MIT or BSD license.
5858

5959
Enjoy!
6060

61-
[1]: https://symfony.com/doc/3.0/book/installation.html
61+
[1]: https://symfony.com/doc/3.1/setup.html
6262
[6]: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
63-
[7]: https://symfony.com/doc/3.0/book/doctrine.html
64-
[8]: https://symfony.com/doc/3.0/book/templating.html
65-
[9]: https://symfony.com/doc/3.0/book/security.html
66-
[10]: https://symfony.com/doc/3.0/cookbook/email.html
67-
[11]: https://symfony.com/doc/3.0/cookbook/logging/monolog.html
68-
[13]: https://symfony.com/doc/3.0/bundles/SensioGeneratorBundle/index.html
63+
[7]: https://symfony.com/doc/3.1/doctrine.html
64+
[8]: https://symfony.com/doc/3.1/templating.html
65+
[9]: https://symfony.com/doc/3.1/security.html
66+
[10]: https://symfony.com/doc/3.1/email.html
67+
[11]: https://symfony.com/doc/3.1/logging.html
68+
[12]: https://symfony.com/doc/3.1/assetic/asset_management.html
69+
[13]: https://symfony.com/doc/current/bundles/SensioGeneratorBundle/index.html

app/Resources/views/default/index.html.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</svg>
3737

3838
Read the documentation to learn
39-
<a href="http://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION')[:3] }}/book/page_creation.html">
39+
<a href="http://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION')[:3] }}/page_creation.html">
4040
How to create your first page in Symfony
4141
</a>
4242
</p>

app/config/security.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# To get started with security, check out the documentation:
2-
# http://symfony.com/doc/current/book/security.html
2+
# http://symfony.com/doc/current/security.html
33
security:
44

5-
# http://symfony.com/doc/current/book/security.html#where-do-users-come-from-user-providers
5+
# http://symfony.com/doc/current/security.html#b-configuring-how-users-are-loaded
66
providers:
77
in_memory:
88
memory: ~
@@ -18,7 +18,7 @@ security:
1818
# activate different ways to authenticate
1919

2020
# http_basic: ~
21-
# http://symfony.com/doc/current/book/security.html#a-configuring-how-your-users-will-authenticate
21+
# http://symfony.com/doc/current/security.html#a-configuring-how-your-users-will-authenticate
2222

2323
# form_login: ~
2424
# http://symfony.com/doc/current/cookbook/security/form_login_setup.html

app/config/services.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Learn more about services, parameters and containers at
2-
# http://symfony.com/doc/current/book/service_container.html
2+
# http://symfony.com/doc/current/service_container.html
33
parameters:
44
# parameter_name: value
55

bin/console

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ use Symfony\Component\Console\Input\ArgvInput;
66
use Symfony\Component\Debug\Debug;
77

88
// if you don't want to setup permissions the proper way, just uncomment the following PHP line
9-
// read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
9+
// read http://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
10+
// for more information
1011
//umask(0000);
1112

1213
set_time_limit(0);

composer.lock

Lines changed: 49 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

web/app_dev.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
use Symfony\Component\Debug\Debug;
55

66
// If you don't want to setup permissions the proper way, just uncomment the following PHP line
7-
// read http://symfony.com/doc/current/book/installation.html#checking-symfony-application-configuration-and-setup
7+
// read http://symfony.com/doc/current/setup.html#checking-symfony-application-configuration-and-setup
88
// for more information
99
//umask(0000);
1010

0 commit comments

Comments
 (0)