From a948cb49b8472ecf0d02361e0ba8027e5134f6a1 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 10 Sep 2013 22:36:03 +0200 Subject: [PATCH] Small fixes in basic-mapping.rst --- docs/en/reference/basic-mapping.rst | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/en/reference/basic-mapping.rst b/docs/en/reference/basic-mapping.rst index a95766afc..b8ded9338 100644 --- a/docs/en/reference/basic-mapping.rst +++ b/docs/en/reference/basic-mapping.rst @@ -52,8 +52,8 @@ mapping metadata: - :doc:`Docblock Annotations ` - :doc:`XML ` -- :doc:`YAML ` -- PHP code +- :doc:`YAML ` +- :doc:`PHP code ` This manual usually mentions docblock annotations in all the examples that are spread throughout all chapters, however for many examples alternative YAML and @@ -188,25 +188,25 @@ datetime type, but mapped to a column called ``posted_at``. The Column annotation has some more attributes. Here is a complete list: -- ``type``: (optional, defaults to 'string') The mapping type to - use for the column. -- ``name``: (optional, defaults to field name) The name of the - column in the database. -- ``length``: (optional, default 255) The length of the column in - the database. (Applies only if a string-valued column is used). -- ``unique``: (optional, default FALSE) Whether the column is a - unique key. -- ``nullable``: (optional, default FALSE) Whether the database - column is nullable. -- ``precision``: (optional, default 0) The precision for a decimal - (exact numeric) column. (Applies only if a decimal column is used.) -- ``scale``: (optional, default 0) The scale for a decimal (exact - numeric) column. (Applies only if a decimal column is used.) -- ``columnDefinition``: (optional) Allows to define a custom - DDL snippet that is used to create the column. Warning: This normally - confuses the SchemaTool to always detect the column as changed. +- ``type``: (optional, defaults to 'string') The mapping type to + use for the column. +- ``name``: (optional, defaults to field name) The name of the + column in the database. +- ``length``: (optional, default 255) The length of the column in + the database. (Applies only if a string-valued column is used). +- ``unique``: (optional, default FALSE) Whether the column is a + unique key. +- ``nullable``: (optional, default FALSE) Whether the database + column is nullable. +- ``precision``: (optional, default 0) The precision for a decimal + (exact numeric) column. (Applies only if a decimal column is used.) +- ``scale``: (optional, default 0) The scale for a decimal (exact + numeric) column. (Applies only if a decimal column is used.) +- ``columnDefinition``: (optional) Allows to define a custom + DDL snippet that is used to create the column. Warning: This normally + confuses the SchemaTool to always detect the column as changed. - ``options``: (optional) Key-value pairs of options that get passed - to the underlying database platform when generating DDL statements. + to the underlying database platform when generating DDL statements. Doctrine Mapping Types ----------------------