Merge branch '3.0' into 3.1

weaverryan · weaverryan · commit 3decef6ee55c · 2019-02-02T22:25:37.000-05:00
* 3.0:
  Fixing build
diff --git a/bundles.rst b/bundles.rst
@@ -181,4 +181,4 @@ Learn more
 
     bundles/*
 
-_`third-party bundles`: http://knpbundles.com
+.. _`third-party bundles`: http://knpbundles.com
diff --git a/changelog.rst b/changelog.rst
@@ -933,7 +933,7 @@ Minor Documentation Changes
 * `#5911 <https://github.com/symfony/symfony-docs/pull/5911>`_ Wrap all strings containing @ in quotes in Yaml (WouterJ)
 * `#5889 <https://github.com/symfony/symfony-docs/pull/5889>`_ Always use "main" as the default firewall name (to match Symfony Standard Edition) (javiereguiluz)
 * `#5888 <https://github.com/symfony/symfony-docs/pull/5888>`_ Removed the use of ContainerAware class (javiereguiluz)
-* `#5625 <https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT (nicolas-grekas)
+* `#5625 <https://github.com/symfony/symfony-docs/pull/5625>`_ Tell about ``SYMFONY__TEMPLATING__HELPER__CODE__FILE_LINK_FORMAT`` (nicolas-grekas)
 * `#5896 <https://github.com/symfony/symfony-docs/pull/5896>`_ [Book][Templating] Update absolute URL asset to match 2.7 (lemoinem)
 * `#5828 <https://github.com/symfony/symfony-docs/pull/5828>`_ move the getEntityManager, only get it if needed (OskarStark)
 * `#5900 <https://github.com/symfony/symfony-docs/pull/5900>`_ Added new security advisories to the docs (fabpot)
diff --git a/getting_started/index.rst b/getting_started/index.rst
@@ -4,9 +4,9 @@ Getting Started
 .. toctree::
     :maxdepth: 1
 
-    ../setup
-    ../page_creation
-    ../routing
-    ../controller
-    ../templating
-    ../configuration
+    /setup
+    /page_creation
+    /routing
+    /controller
+    /templating
+    /configuration
diff --git a/reference/forms/types/options/choice_value.rst.inc b/reference/forms/types/options/choice_value.rst.inc
@@ -14,7 +14,7 @@ If ``null`` is used, an incrementing integer is used as the name.
 .. caution::
 
     In Symfony 2.7, there was a small backwards-compatibility break with how the
-    `value` attribute of options is generated. This is not a problem unless you
+    ``value`` attribute of options is generated. This is not a problem unless you
     rely on the option values in JavaScript. See `issue #14825`_ for details.
 
 .. _`issue #14825`: https://github.com/symfony/symfony/pull/14825

Original file line number	Diff line number	Diff line change
`@@ -181,4 +181,4 @@ Learn more`
`181`	`181`
`182`	`182`	`bundles/*`
`183`	`183`
`184`		-_`third-party bundles`: http://knpbundles.com
	`184`	+.. _`third-party bundles`: http://knpbundles.com