Skip to content

Commit dc97c65

Browse files
authored
Merge pull request symfony#46 from sensiolabs/fix_references
Fix all references
2 parents f45eff4 + 91805f1 commit dc97c65

File tree

157 files changed

+434
-439
lines changed

Some content is hidden

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

157 files changed

+434
-439
lines changed

assetic/asset_management.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ To include an image you can use the ``image`` tag.
181181
<?php endforeach ?>
182182

183183
You can also use Assetic for image optimization. More information in
184-
:doc:`/cookbook/assetic/jpeg_optimize`.
184+
:doc:`/assetic/jpeg_optimize`.
185185

186186
.. tip::
187187

@@ -441,7 +441,7 @@ into your template:
441441
<?php endforeach ?>
442442
443443
A more detailed guide about configuring and using Assetic filters as well as
444-
details of Assetic's debug mode can be found in :doc:`/cookbook/assetic/uglifyjs`.
444+
details of Assetic's debug mode can be found in :doc:`/assetic/uglifyjs`.
445445

446446
Controlling the URL Used
447447
------------------------

assetic/yuicompressor.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ How to Minify JavaScripts and Stylesheets with YUI Compressor
88

99
The YUI Compressor is `no longer maintained by Yahoo`_. That's why you are
1010
**strongly advised to avoid using YUI utilities** unless strictly necessary.
11-
Read :doc:`/cookbook/assetic/uglifyjs` for a modern and up-to-date alternative.
11+
Read :doc:`/assetic/uglifyjs` for a modern and up-to-date alternative.
1212

1313
Yahoo! provides an excellent utility for minifying JavaScripts and stylesheets
1414
so they travel over the wire faster, the `YUI Compressor`_. Thanks to Assetic,

best_practices/configuration.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ add an extra layer of configuration that's not needed because you don't need
7878
or want these configuration values to change on each server.
7979

8080
The configuration options defined in the ``config.yml`` file usually vary from
81-
one :doc:`environment </cookbook/configuration/environments>` to another. That's
81+
one :doc:`environment </configuration/environments>` to another. That's
8282
why Symfony already includes ``app/config/config_dev.yml`` and ``app/config/config_prod.yml``
8383
files so that you can override specific values for each environment.
8484

@@ -160,7 +160,7 @@ Semantic Configuration: Don't Do It
160160

161161
Don't define a semantic dependency injection configuration for your bundles.
162162

163-
As explained in :doc:`/cookbook/bundles/extension` article, Symfony bundles
163+
As explained in :doc:`/bundles/extension` article, Symfony bundles
164164
have two choices on how to handle configuration: normal service configuration
165165
through the ``services.yml`` file and semantic configuration through a special
166166
``*Extension`` class.
@@ -176,7 +176,7 @@ Moving Sensitive Options Outside of Symfony Entirely
176176
When dealing with sensitive options, like database credentials, we also recommend
177177
that you store them outside the Symfony project and make them available
178178
through environment variables. Learn how to do it in the following article:
179-
:doc:`/cookbook/configuration/external_parameters`
179+
:doc:`/configuration/external_parameters`.
180180

181181
.. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
182182
.. _`constant() function`: http://twig.sensiolabs.org/doc/functions/constant.html

best_practices/controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,6 @@ Pre and Post Hooks
208208

209209
If you need to execute some code before or after the execution of your controllers,
210210
you can use the EventDispatcher component to
211-
:doc:`set up before and after filters </cookbook/event_dispatcher/before_after_filters>`.
211+
:doc:`set up before and after filters </event_dispatcher/before_after_filters>`.
212212

213213
.. _`ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html

best_practices/creating-the-project.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Installer**, which has to be installed before creating your first project.
1212

1313
Use the Symfony Installer to create new Symfony-based projects.
1414

15-
Read the :doc:`installation chapter </book/installation>` of the Symfony Book to
15+
Read the :doc:`installation chapter </installation>` of the Symfony Book to
1616
learn how to install and use the Symfony Installer.
1717

1818
.. _linux-and-mac-os-x-systems:
@@ -119,7 +119,7 @@ Symfony documentation uses the AppBundle name.
119119
.. note::
120120

121121
Another reason to create a new bundle is when you're overriding something
122-
in a vendor's bundle (e.g. a controller). See :doc:`/cookbook/bundles/inheritance`.
122+
in a vendor's bundle (e.g. a controller). See :doc:`/bundles/inheritance`.
123123

124124
All in all, this is the typical directory structure of a Symfony application
125125
that follows these best practices:
@@ -154,7 +154,7 @@ Extending the Directory Structure
154154

155155
If your project or infrastructure requires some changes to the default directory
156156
structure of Symfony, you can
157-
:doc:`override the location of the main directories </cookbook/configuration/override_dir_structure>`:
157+
:doc:`override the location of the main directories </configuration/override_dir_structure>`:
158158
``cache/``, ``logs/`` and ``web/``.
159159

160160
In addition, Symfony3 will use a slightly different directory structure when
@@ -181,4 +181,4 @@ the Symfony directory structure.
181181
.. _`Composer`: https://getcomposer.org/
182182
.. _`Phar extension`: http://php.net/manual/en/intro.phar.php
183183
.. _`public checksums repository`: https://github.com/sensiolabs/checksums
184-
.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html
184+
.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html

best_practices/forms.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ all of the fields:
171171

172172
If you need more control over how your fields are rendered, then you should
173173
remove the ``form_widget(form)`` function and render your fields individually.
174-
See the :doc:`/cookbook/form/form_customization` cookbook article for more information
174+
See the :doc:`/form/form_customization` cookbook article for more information
175175
on this and how you can control *how* the form renders at a global level
176176
using form theming.
177177

best_practices/security.rst

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Authentication and Firewalls (i.e. Getting the User's Credentials)
55
------------------------------------------------------------------
66

77
You can configure Symfony to authenticate your users using any method you
8-
want and to load user information from any source. This is a complex topic,
9-
but the :doc:`Security Cookbook Section </cookbook/security/index>` has a
10-
lot of information about this.
8+
want and to load user information from any source. This is a complex topic, but
9+
the :doc:`Security Cookbook Section </security>` has a lot of information about
10+
this.
1111

1212
Regardless of your needs, authentication is configured in ``security.yml``,
1313
primarily under the ``firewalls`` key.
@@ -127,7 +127,7 @@ Using ``@Security``, this looks like:
127127
Using Expressions for Complex Security Restrictions
128128
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
129129

130-
If your security logic is a little bit more complex, you can use an `expression`_
130+
If your security logic is a little bit more complex, you can use an :doc:`expression </components/expression_language>`
131131
inside ``@Security``. In the following example, a user can only access the
132132
controller if their email matches the value returned by the ``getAuthorEmail``
133133
method on the ``Post`` object:
@@ -254,7 +254,7 @@ Security Voters
254254

255255
If your security logic is complex and can't be centralized into a method
256256
like ``isAuthor()``, you should leverage custom voters. These are an order
257-
of magnitude easier than :doc:`ACLs </cookbook/security/acl>` and will give
257+
of magnitude easier than :doc:`ACLs </security/acl>` and will give
258258
you the flexibility you need in almost all cases.
259259

260260
First, create a voter class. The following example shows a voter that implements
@@ -358,18 +358,17 @@ The `FOSUserBundle`_, developed by the Symfony community, adds support for a
358358
database-backed user system in Symfony. It also handles common tasks like
359359
user registration and forgotten password functionality.
360360

361-
Enable the :doc:`Remember Me feature </cookbook/security/remember_me>` to
361+
Enable the :doc:`Remember Me feature </security/remember_me>` to
362362
allow your users to stay logged in for a long period of time.
363363

364364
When providing customer support, sometimes it's necessary to access the application
365365
as some *other* user so that you can reproduce the problem. Symfony provides
366-
the ability to :doc:`impersonate users </cookbook/security/impersonating_user>`.
366+
the ability to :doc:`impersonate users </security/impersonating_user>`.
367367

368368
If your company uses a user login method not supported by Symfony, you can
369-
develop :doc:`your own user provider </cookbook/security/custom_provider>` and
370-
:doc:`your own authentication provider </cookbook/security/custom_authentication_provider>`.
369+
develop :doc:`your own user provider </security/custom_provider>` and
370+
:doc:`your own authentication provider </security/custom_authentication_provider>`.
371371

372372
.. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
373373
.. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
374-
.. _`expression`: http://symfony.com/doc/current/components/expression_language/introduction.html
375374
.. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle

best_practices/web-assets.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ tools like GruntJS.
4949
Use Assetic to compile, combine and minimize web assets, unless you're
5050
comfortable with frontend tools like GruntJS.
5151

52-
:doc:`Assetic </cookbook/assetic/asset_management>` is an asset manager capable
52+
:doc:`Assetic </assetic/asset_management>` is an asset manager capable
5353
of compiling assets developed with a lot of different frontend technologies
5454
like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
5555
matter of wrapping all the assets with a single Twig tag:
@@ -87,8 +87,8 @@ Learn More about Assetic
8787
------------------------
8888

8989
Assetic can also minimize CSS and JavaScript assets
90-
:doc:`using UglifyCSS/UglifyJS </cookbook/assetic/uglifyjs>` to speed up your
91-
websites. You can even :doc:`compress images </cookbook/assetic/jpeg_optimize>`
90+
:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
91+
websites. You can even :doc:`compress images </assetic/jpeg_optimize>`
9292
with Assetic to reduce their size before serving them to the user. Check out
9393
the `official Assetic documentation`_ to learn more about all the available
9494
features.

bundles.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ in your application and to optimize them the way you want.
1616

1717
.. note::
1818

19-
While you'll learn the basics here, an entire cookbook entry is devoted
20-
to the organization and best practices of :doc:`bundles </cookbook/bundles/best_practices>`.
19+
While you'll learn the basics here, an entire cookbook entry is devoted
20+
to the organization and best practices of :doc:`bundles </bundles/best_practices>`.
2121

2222
A bundle is simply a structured set of files within a directory that implement
2323
a single feature. You might create a BlogBundle, a ForumBundle or

bundles/best_practices.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ Templates ``Resources/views/`` Yes
131131
Unit and Functional Tests ``Tests/`` No
132132
=============================== ============================= ================
133133

134-
[1] See :doc:`/cookbook/doctrine/mapping_model_classes` for how to handle the
134+
[1] See :doc:`/doctrine/mapping_model_classes` for how to handle the
135135
mapping with a compiler pass.
136136

137137
Classes
@@ -362,7 +362,7 @@ Retrieve the configuration parameters in your code from the container::
362362
$container->getParameter('acme_blog.author.email');
363363

364364
Even if this mechanism is simple enough, you should consider using the more
365-
advanced :doc:`semantic bundle configuration </cookbook/bundles/configuration>`.
365+
advanced :doc:`semantic bundle configuration </bundles/configuration>`.
366366

367367
Versioning
368368
----------
@@ -381,7 +381,7 @@ be :ref:`defined as private <container-private-services>`.
381381
.. seealso::
382382

383383
You can learn much more about service loading in bundles reading this article:
384-
:doc:`How to Load Service Configuration inside a Bundle </cookbook/bundles/extension>`.
384+
:doc:`How to Load Service Configuration inside a Bundle </bundles/extension>`.
385385

386386
Composer Metadata
387387
-----------------
@@ -466,7 +466,7 @@ API is being used. The following code, would work for *all* users::
466466
Learn more from the Cookbook
467467
----------------------------
468468

469-
* :doc:`/cookbook/bundles/extension`
469+
* :doc:`/bundles/extension`
470470

471471
.. _`PSR-0`: http://www.php-fig.org/psr/psr-0/
472472
.. _`PSR-4`: http://www.php-fig.org/psr/psr-4/

0 commit comments

Comments
 (0)