RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-24 08:53:52 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #759 from mfdj/patch-1

Browse Source 
Fixed out of sync code examples in getting-started.rst
This commit is contained in:
Marco Pivetta 2013-08-25 07:23:20 -07:00
commit f634ba343c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/en/tutorials/getting-started.rst
View File

@ -25,7 +25,7 @@ The code of this tutorial is `available on Github <https://github.com/doctrine/d
.. note:: .. note::
This tutorial assumes you work with Doctrine 2.4 and above. This tutorial assumes you work with **Doctrine 2.4** and above.
Some of the code will not work with lower versions. Some of the code will not work with lower versions.
What is Doctrine? What is Doctrine?
@ -87,13 +87,15 @@ the following contents:
{ {
"require": { "require": {
"doctrine/orm": "2.*", "doctrine/orm": "2.4.*",
"symfony/yaml": "2.*" "symfony/yaml": "2.*"
}, },
"autoload": { "autoload": {
"psr-0": {"": "src/"} "psr-0": {"": "src/"}
},
"minimum-stability" : "dev"
} }
}
Install Doctrine using the Composer Dependency Management tool, by calling: Install Doctrine using the Composer Dependency Management tool, by calling:
@ -102,15 +104,13 @@ Install Doctrine using the Composer Dependency Management tool, by calling:
$ composer install $ composer install
This will install the packages Doctrine Common, Doctrine DBAL, Doctrine ORM, This will install the packages Doctrine Common, Doctrine DBAL, Doctrine ORM,
Symfony YAML and Symfony Console. Both Symfony dependencies are optional Symfony YAML and Symfony Console into the `vendor` directory. The Symfony
but will be used in this tutorial. dependencies are not required by Doctrine but will be used in this tutorial.
You can prepare the directory structure:
Add the following directories:
:: ::
project doctrine2-tutorial
|-- composer.json
|-- config |-- config
| |-- xml | |-- xml
| `-- yaml | `-- yaml