diff --git a/docs/en/index.rst b/docs/en/index.rst index 5fd837f8274..a7979cb1a70 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -18,8 +18,8 @@ Doctrine ORM don't panic. You can get help from different sources: - Report a bug on `GitHub `_. - On `StackOverflow `_ -If you need more structure over the different topics you can browse the :doc:`table -of contents `. +If you need more structure over the different topics you can browse the table +of contents. Getting Started --------------- @@ -124,5 +124,3 @@ Cookbook * **Custom Datatypes** :doc:`MySQL Enums ` :doc:`Advanced Field Value Conversion ` - -.. include:: toc.rst diff --git a/docs/en/toc.rst b/docs/en/toc.rst deleted file mode 100644 index fa92cf38021..00000000000 --- a/docs/en/toc.rst +++ /dev/null @@ -1,86 +0,0 @@ -Welcome to Doctrine 2 ORM's documentation! -========================================== - -Tutorials ---------- - -.. toctree:: - :maxdepth: 1 - - tutorials/getting-started - tutorials/getting-started-database - tutorials/getting-started-models - tutorials/working-with-indexed-associations - tutorials/extra-lazy-associations - tutorials/composite-primary-keys - tutorials/ordered-associations - tutorials/override-field-association-mappings-in-subclasses - tutorials/pagination.rst - tutorials/embeddables.rst - -Reference Guide ---------------- - -.. toctree:: - :maxdepth: 1 - :numbered: - - reference/architecture - reference/configuration.rst - reference/faq - reference/basic-mapping - reference/association-mapping - reference/inheritance-mapping - reference/working-with-objects - reference/working-with-associations - reference/events - reference/unitofwork - reference/unitofwork-associations - reference/transactions-and-concurrency - reference/batch-processing - reference/dql-doctrine-query-language - reference/query-builder - reference/native-sql - reference/change-tracking-policies - reference/partial-objects - reference/annotations-reference - reference/attributes-reference - reference/xml-mapping - reference/yaml-mapping - reference/php-mapping - reference/caching - reference/improving-performance - reference/tools - reference/metadata-drivers - reference/best-practices - reference/limitations-and-known-issues - tutorials/pagination - reference/filters - reference/namingstrategy - reference/advanced-configuration - reference/second-level-cache - reference/security - - -Cookbook --------- - -.. toctree:: - :maxdepth: 1 - - cookbook/aggregate-fields - cookbook/custom-mapping-types - cookbook/decorator-pattern - cookbook/dql-custom-walkers - cookbook/dql-user-defined-functions - cookbook/implementing-arrayaccess-for-domain-objects - cookbook/implementing-the-notify-changetracking-policy - cookbook/resolve-target-entity-listener - cookbook/sql-table-prefixes - cookbook/strategy-cookbook-introduction - cookbook/validation-of-entities - cookbook/working-with-datetime - cookbook/mysql-enums - cookbook/advanced-field-value-conversion-using-custom-mapping-types - cookbook/entities-in-session - diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index 023d89c211e..d6c4c816302 100644 --- a/docs/en/tutorials/getting-started.rst +++ b/docs/en/tutorials/getting-started.rst @@ -1343,8 +1343,7 @@ means the join details have already been defined on the owning side. Therefore we only have to specify the property on the Bug class that holds the owning sides. -Update your database schema by running: -:: +Update your database schema by running:: $ php bin/doctrine orm:schema-tool:update --force