1
0
mirror of synced 2025-02-02 13:31:45 +03:00

Merge pull request #784 from eventhorizonpl/fix_docs

fix documentation warnings p1
Conflicts:
	docs/en/reference/advanced-configuration.rst
This commit is contained in:
Marco Pivetta 2013-09-10 15:54:40 -07:00 committed by Guilherme Blanco
parent 2a9a53ae9d
commit 63c5758070
5 changed files with 13 additions and 8 deletions

View File

@ -14,7 +14,7 @@ Doctrine ORM don't panic. You can get help from different sources:
- There is a :doc:`FAQ <reference/faq>` with answers to frequent questions. - There is a :doc:`FAQ <reference/faq>` with answers to frequent questions.
- The `Doctrine Mailing List <http://groups.google.com/group/doctrine-user>`_ - The `Doctrine Mailing List <http://groups.google.com/group/doctrine-user>`_
- Internet Relay Chat (IRC) in `#doctrine on Freenode <irc://irc.freenode.net/doctrine>`_ - Internet Relay Chat (IRC) in #doctrine on Freenode
- Report a bug on `JIRA <http://www.doctrine-project.org/jira>`_. - Report a bug on `JIRA <http://www.doctrine-project.org/jira>`_.
- On `Twitter <https://twitter.com/search/%23doctrine2>`_ with ``#doctrine2`` - On `Twitter <https://twitter.com/search/%23doctrine2>`_ with ``#doctrine2``
- On `StackOverflow <http://stackoverflow.com/questions/tagged/doctrine2>`_ - On `StackOverflow <http://stackoverflow.com/questions/tagged/doctrine2>`_
@ -120,3 +120,4 @@ Cookbook
:doc:`MySQL Enums <cookbook/mysql-enums>` :doc:`MySQL Enums <cookbook/mysql-enums>`
:doc:`Advanced Field Value Conversion <cookbook/advanced-field-value-conversion-using-custom-mapping-types>` :doc:`Advanced Field Value Conversion <cookbook/advanced-field-value-conversion-using-custom-mapping-types>`
.. include:: toc.rst

View File

@ -106,7 +106,7 @@ Redis
In order to use the Redis cache driver you must have it compiled In order to use the Redis cache driver you must have it compiled
and enabled in your php.ini. You can read about what is Redis and enabled in your php.ini. You can read about what is Redis
`from here <http://redis.io/>`_. Also check `from here <http://redis.io/>`_. Also check
`here <https://github.com/nicolasff/phpredis/>`_ for how you can use `A PHP extension for Redis <https://github.com/nicolasff/phpredis/>`_ for how you can use
and install Redis PHP extension. and install Redis PHP extension.
Below is a simple example of how you could use the Redis cache Below is a simple example of how you could use the Redis cache

View File

@ -100,7 +100,7 @@ Doctrine ships with a number of command line tools that are very helpful
during development. You can call this command from the Composer binary during development. You can call this command from the Composer binary
directory: directory:
.. code-block:: .. code-block:: sh
$ php vendor/bin/doctrine $ php vendor/bin/doctrine

View File

@ -143,7 +143,7 @@ See the documentation chapter on :doc:`inheritance mapping <inheritance-mapping>
the details. the details.
Why does Doctrine not create proxy objects for my inheritance hierarchy? Why does Doctrine not create proxy objects for my inheritance hierarchy?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you set a many-to-one or one-to-one association target-entity to any parent class of If you set a many-to-one or one-to-one association target-entity to any parent class of
an inheritance hierarchy Doctrine does not know what PHP class the foreign is actually of. an inheritance hierarchy Doctrine does not know what PHP class the foreign is actually of.

View File

@ -8,12 +8,14 @@ Tutorials
:maxdepth: 1 :maxdepth: 1
tutorials/getting-started tutorials/getting-started
tutorials/getting-started-database
tutorials/getting-started-models
tutorials/working-with-indexed-associations tutorials/working-with-indexed-associations
tutorials/extra-lazy-associations tutorials/extra-lazy-associations
tutorials/composite-primary-keys tutorials/composite-primary-keys
tutorials/ordered-associations tutorials/ordered-associations
tutorials/in-ten-quick-steps
tutorials/override-field-association-mappings-in-subclasses tutorials/override-field-association-mappings-in-subclasses
tutorials/pagination.rst
Reference Guide Reference Guide
--------------- ---------------
@ -22,9 +24,9 @@ Reference Guide
:maxdepth: 1 :maxdepth: 1
:numbered: :numbered:
reference/introduction
reference/architecture reference/architecture
reference/configuration reference/installation
reference/configuration.rst
reference/faq reference/faq
reference/basic-mapping reference/basic-mapping
reference/association-mapping reference/association-mapping
@ -51,9 +53,9 @@ Reference Guide
reference/metadata-drivers reference/metadata-drivers
reference/best-practices reference/best-practices
reference/limitations-and-known-issues reference/limitations-and-known-issues
tutorials/pagination.rst
reference/filters.rst reference/filters.rst
reference/namingstrategy.rst reference/namingstrategy.rst
reference/advanced-configuration.rst
Cookbook Cookbook
@ -63,6 +65,7 @@ Cookbook
:maxdepth: 1 :maxdepth: 1
cookbook/aggregate-fields cookbook/aggregate-fields
cookbook/custom-mapping-types
cookbook/decorator-pattern cookbook/decorator-pattern
cookbook/dql-custom-walkers cookbook/dql-custom-walkers
cookbook/dql-user-defined-functions cookbook/dql-user-defined-functions
@ -70,6 +73,7 @@ Cookbook
cookbook/implementing-the-notify-changetracking-policy cookbook/implementing-the-notify-changetracking-policy
cookbook/implementing-wakeup-or-clone cookbook/implementing-wakeup-or-clone
cookbook/integrating-with-codeigniter cookbook/integrating-with-codeigniter
cookbook/resolve-target-entity-listener
cookbook/sql-table-prefixes cookbook/sql-table-prefixes
cookbook/strategy-cookbook-introduction cookbook/strategy-cookbook-introduction
cookbook/validation-of-entities cookbook/validation-of-entities