Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1aaff9f

Browse filesBrowse files
committed
Merge branch '3.4' into 4.3
* 3.4: Backported symfony#12892 changes to 3.4 some spelling updates
2 parents 23df135 + 39459bf commit 1aaff9f
Copy full SHA for 1aaff9f

File tree

4 files changed

+4
-18
lines changed
Filter options

4 files changed

+4
-18
lines changed

‎contributing/documentation/overview.rst

Copy file name to clipboardExpand all lines: contributing/documentation/overview.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ Why Do my Changes Take so Long to Be Reviewed and/or Merged?
292292

293293
Please be patient. It can take up to several days before your pull request can
294294
be fully reviewed. After merging the changes, it could take again several hours
295-
before your changes appear on the ``symfony.com`` website.
295+
before your changes appear on the Symfony website.
296296

297297
Why Should I Use the Oldest Maintained Branch Instead of the Master Branch?
298298
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

‎create_framework/introduction.rst

Copy file name to clipboardExpand all lines: create_framework/introduction.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Before You Start
6363
Reading about how to create a framework is not enough. You will have to follow
6464
along and actually type all the examples included in this tutorial. For that,
6565
you need a recent version of PHP (5.5.9 or later is good enough), a web server
66-
(like Apache, NGINX or PHP's built-in web server), a good knowledge of PHP and
66+
(like Apache, nginx or PHP's built-in web server), a good knowledge of PHP and
6767
an understanding of Object Oriented programming.
6868

6969
Ready to go? Read on!

‎setup/built_in_web_server.rst

Copy file name to clipboardExpand all lines: setup/built_in_web_server.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ How to Use PHP's built-in Web Server
1313
The PHP CLI SAPI comes with a `built-in web server`_. It can be used to run your
1414
PHP applications locally during development, for testing or for application
1515
demonstrations. This way, you don't have to bother configuring a full-featured
16-
web server such as :doc:`Apache or Nginx </setup/web_server_configuration>`.
16+
web server such as :doc:`Apache or nginx </setup/web_server_configuration>`.
1717

1818
.. caution::
1919

‎setup/symfony_server.rst

Copy file name to clipboardExpand all lines: setup/symfony_server.rst
+1-15Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ to override:
133133
Running Commands with Different PHP Versions
134134
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
135135

136-
When running different PHP versions it's useful to use the main ``symfony``
136+
When running different PHP versions, it is useful to use the main ``symfony``
137137
command as a wrapper for the ``php`` command. This allows you to always select
138138
the most appropriate PHP version according to the project which is running the
139139
commands. It also loads the env vars automatically, which is important when
@@ -148,20 +148,6 @@ running non-Symfony commands:
148148
# (or the default PHP version if the project didn't select one)
149149
$ symfony php -r "..."
150150
151-
If you are using this wrapper frequently, consider aliasing the ``php`` command
152-
to it:
153-
154-
.. code-block:: terminal
155-
156-
$ cd ~/.symfony/bin
157-
$ cp symfony php
158-
# now you can run "php ..." and the "symfony" command will be executed instead
159-
160-
# other PHP commands can be wrapped too using this trick
161-
$ cp symfony php-config
162-
$ cp symfony pear
163-
$ cp symfony pecl
164-
165151
Local Domain Names
166152
------------------
167153

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.