Skip to content

Commit

Permalink
minor #90 Fixed doc build issues (javiereguiluz)
Browse files Browse the repository at this point in the history
This PR was merged into the 2.7 branch.

Discussion
----------

Fixed doc build issues

Commits
-------

2a40487 Fixed doc build issues
  • Loading branch information
javiereguiluz committed Jul 15, 2016
2 parents 9c13a68 + 2a40487 commit 2d355f3
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/console/helpers/formatterhelper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ messages and 2 spaces on the left and right).

The exact "style" you use in the block is up to you. In this case, you're using
the pre-defined ``error`` style, but there are other styles, or you can create
your own. See :ref:`components-console-coloring`.
your own. See :doc:`/console/coloring`.
3 changes: 1 addition & 2 deletions setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,10 @@ Learn More
setup/web_server_configuration
setup/composer
setup/*
install/*

.. _`Composer`: https://getcomposer.org/
.. _`Symfony Standard Edition`: https://github.com/symfony/symfony-standard
.. _`Symfony CMF Standard Edition`: https://github.com/symfony-cmf/symfony-cmf-standard
.. _`The Symfony CMF Standard Edition`: https://github.com/symfony-cmf/symfony-cmf-standard
.. _`Symfony CMF`: http://cmf.symfony.com/
.. _`Symfony REST Edition`: https://github.com/gimler/symfony-rest-edition
.. _`FOSRestBundle`: https://github.com/FriendsOfSymfony/FOSRestBundle
Expand Down
2 changes: 1 addition & 1 deletion setup/upgrade_major.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ There are a couple of steps to upgrading a major version:

During the lifecycle of a major release, new features are added and method
signatures and public API usages are changed. However,
:doc:`minor versions </install/upgrade_minor>` should not contain any
:doc:`minor versions </setup/upgrade_minor>` should not contain any
backwards incompatible changes. To accomplish this, the "old" (e.g. functions,
classes, etc) code still works, but is marked as *deprecated*, indicating that
it will be removed/changed in the future and that you should stop using it.
Expand Down
2 changes: 1 addition & 1 deletion setup/upgrade_patch.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ update.
It is recommended to update to a new patch version as soon as possible, as
important bugs and security leaks may be fixed in these new releases.

.. include:: /install/_update_all_packages.rst.inc
.. include:: /setup/_update_all_packages.rst.inc

0 comments on commit 2d355f3

Please sign in to comment.