Skip to content

Commit 5fd5e84

Browse files
committed
Merge branch '3.0' into 3.1
* 3.0: (119 commits) [KnpU] Making common 3.0 changes (e.g. app/console -> bin/console) using shorter command name fixing app/console Fixing heading styles that I just messed up! Minor tweaks! Tweaks! Fixed some misconfigured redirections Tweaks thanks to comments minor tweaks Completely updating the configuration main chapter to talk about parameters and a few other details more tweaks Moving configuration/configuration.rst -> configuration.rst Tweaks thanks to Javier Updating and massively shortening page creation Moving http_fundamentals into introduction Moving web server configuration out of configuration - it has nothing to do with Symfony configuration Fixing references Moving logging/monolog.rst to /logging.rst, removing some sections from it, rewriting others Another batch of build error fixes language tweak ...
2 parents 92983fe + 11149f4 commit 5fd5e84

File tree

492 files changed

+10928
-12064
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

492 files changed

+10928
-12064
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
/_build
1+
/_build/doctrees
2+
/_build/html
23
*.pyc

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
language: python
22

3-
python: "2.7"
3+
python: 2.7
44

55
sudo: false
6-
76
cache:
8-
directories:
9-
- $HOME/.cache/pip
10-
- _build
7+
directories: [$HOME/.cache/pip]
118

129
install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
1310

14-
script: sphinx-build -nW -b html -d _build/doctrees . _build/html
11+
script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
1512

1613
branches:
1714
except:
File renamed without changes.
File renamed without changes.

conf.py renamed to _build/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
# List of patterns, relative to source directory, that match files and
7777
# directories to ignore when looking for source files.
78-
exclude_patterns = ['_theme']
78+
exclude_patterns = ['_build']
7979

8080
# The reST default role (used for this markup: `text`) to use for all documents.
8181
#default_role = None
@@ -279,4 +279,3 @@
279279

280280
# Use PHP syntax highlighting in code examples by default
281281
highlight_language='php'
282-
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

_includes/_rewrite_rule_tip.rst.inc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.. tip::
2+
3+
By using rewrite rules in your
4+
:doc:`web server configuration </setup/web_server_configuration>`,
5+
the ``index.php`` won't be needed and you will have beautiful, clean URLs
6+
(e.g. ``/show``).

assetic.rst

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.. caution::
22

33
Starting from Symfony 2.8, Assetic is no longer included by default in the
4-
Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
4+
Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
55
to learn how to install and enable Assetic in your Symfony application.

cookbook/assetic/apply_to_option.rst renamed to assetic/apply_to_option.rst

Lines changed: 1 addition & 1 deletion

cookbook/assetic/asset_management.rst renamed to assetic/asset_management.rst

Lines changed: 2 additions & 2 deletions

cookbook/assetic/jpeg_optimize.rst renamed to assetic/jpeg_optimize.rst

Lines changed: 1 addition & 1 deletion

cookbook/assetic/php.rst renamed to assetic/php.rst

Lines changed: 1 addition & 1 deletion

cookbook/assetic/uglifyjs.rst renamed to assetic/uglifyjs.rst

Lines changed: 1 addition & 1 deletion

cookbook/assetic/yuicompressor.rst renamed to assetic/yuicompressor.rst

Lines changed: 2 additions & 2 deletions

best_practices/configuration.rst

Lines changed: 3 additions & 3 deletions

best_practices/controllers.rst

Lines changed: 1 addition & 1 deletion

best_practices/creating-the-project.rst

Lines changed: 4 additions & 4 deletions

best_practices/forms.rst

Lines changed: 1 addition & 1 deletion

best_practices/security.rst

Lines changed: 9 additions & 10 deletions

best_practices/web-assets.rst

Lines changed: 4 additions & 4 deletions

0 commit comments

Comments
 (0)