Skip to content

Commit

Permalink
Implemented the changes suggested by reviewers
Browse files Browse the repository at this point in the history
  • Loading branch information
javiereguiluz committed Jun 23, 2015
1 parent 9064ffc commit c1a0059
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions cookbook/assetic/asset_management.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ To include JavaScript files, use the ``javascripts`` tag in any template:

You can also include CSS Stylesheets: see :ref:`cookbook-assetic-including-css`.

In this example, all the files in the ``Resources/public/js/`` directory
of the ``AcmeFooBundle`` will be loaded and served from a different location.
The actual rendered tag might simply look like:
In this example, all files in the ``Resources/public/js/`` directory of the
``AcmeFooBundle`` will be loaded and served from a different location. The
actual rendered tag might simply look like:

.. code-block:: html

Expand Down
12 changes: 6 additions & 6 deletions cookbook/cache/varnish.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ To ensure that the Symfony Router generates URLs correctly with Varnish,
an ``X-Forwarded-Port`` header must be present for Symfony to use the
correct port number.

This port depends on your setup. Let's say that external connections come in
on the default HTTP port 80. For HTTPS connections, there is another proxy
(as Varnish does not do HTTPS itself) on the default HTTPS port 443 that
handles the SSL termination and forwards the requests as HTTP requests to
Varnish with an ``X-Forwarded-Proto`` header. In this case, you need to add
the following configuration snippet:
This port number corresponds to the port your setup is using to receive external
connections (``80`` is the default value for HTTP connections). If the application
also accepts HTTPS connections, there could be another proxy (as Varnish does
not do HTTPS itself) on the default HTTPS port 443 that handles the SSL termination
and forwards the requests as HTTP requests to Varnish with an ``X-Forwarded-Proto``
header. In this case, you need to add the following configuration snippet:

.. code-block:: varnish4
Expand Down

0 comments on commit c1a0059

Please sign in to comment.