Commit 3fb0c323 authored by Fabien Potencier's avatar Fabien Potencier

merged branch igorw/install-stable (PR #692)

This PR was merged into the master branch.

Discussion
----------

Update install instructions for v1.0.0

Commits
-------

15edf844 Update install instructions for v1.0.0
parents f478bcbd 15edf844
...@@ -30,7 +30,7 @@ run the `php composer.phar install` command to install it: ...@@ -30,7 +30,7 @@ run the `php composer.phar install` command to install it:
{ {
"require": { "require": {
"silex/silex": "1.0.*" "silex/silex": "~1.0"
} }
} }
......
{ {
"require": { "require": {
"silex/silex": "1.0.*", "silex/silex": "~1.0",
"symfony/browser-kit": "~2.1", "symfony/browser-kit": "~2.1",
"symfony/console": "~2.1", "symfony/console": "~2.1",
"symfony/config": "~2.1", "symfony/config": "~2.1",
......
{ {
"require": { "require": {
"silex/silex": "1.0.*" "silex/silex": "~1.0"
} }
} }
...@@ -25,7 +25,7 @@ If you want more flexibility, use Composer instead. Create a ...@@ -25,7 +25,7 @@ If you want more flexibility, use Composer instead. Create a
{ {
"require": { "require": {
"silex/silex": "1.0.*" "silex/silex": "~1.0"
} }
} }
...@@ -81,8 +81,8 @@ Then, you have to configure your web server (read the :doc:`dedicated chapter ...@@ -81,8 +81,8 @@ Then, you have to configure your web server (read the :doc:`dedicated chapter
.. tip:: .. tip::
If your application is hosted behind a reverse proxy at address $ip, and you If your application is hosted behind a reverse proxy at address $ip, and you
want Silex to trust the ``X-Forwarded-For*`` headers, you will need to run want Silex to trust the ``X-Forwarded-For*`` headers, you will need to run
your application like this:: your application like this::
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
...@@ -234,9 +234,9 @@ methods on your application: ``get``, ``post``, ``put``, ``delete``:: ...@@ -234,9 +234,9 @@ methods on your application: ``get``, ``post``, ``put``, ``delete``::
.. tip:: .. tip::
Forms in most web browsers do not directly support the use of other HTTP Forms in most web browsers do not directly support the use of other HTTP
methods. To use methods other than GET and POST you can utilize a special methods. To use methods other than GET and POST you can utilize a special
form field with a name of ``_method``. The form's ``method`` attribute must form field with a name of ``_method``. The form's ``method`` attribute must
be set to POST when using this field:: be set to POST when using this field::
<form action="/my/target/route/" method="post"> <form action="/my/target/route/" method="post">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment