Skip to content

Commit d739c57

Browse files
committed
renamed parameters.ini to parameters.yml
1 parent 46c04c8 commit d739c57

File tree

5 files changed

+19
-19
lines changed

5 files changed

+19
-19
lines changed

book/doctrine.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ Configuring the Database
4444

4545
Before you really begin, you'll need to configure your database connection
4646
information. By convention, this information is usually configured in an
47-
``app/config/parameters.ini`` file:
47+
``app/config/parameters.yml`` file:
4848

4949
.. code-block:: ini
5050
51-
;app/config/parameters.ini
52-
[parameters]
53-
database_driver = pdo_mysql
54-
database_host = localhost
55-
database_name = test_project
56-
database_user = root
57-
database_password = password
51+
;app/config/parameters.yml
52+
parameters:
53+
database_driver: pdo_mysql
54+
database_host: localhost
55+
database_name: test_project
56+
database_user: root
57+
database_password: password
5858
5959
.. note::
6060

61-
Defining the configuration via ``parameters.ini`` is just a convention.
61+
Defining the configuration via ``parameters.yml`` is just a convention.
6262
The parameters defined in that file are referenced by the main configuration
6363
file when setting up Doctrine:
6464

book/page_creation.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ format you prefer:
721721
722722
# app/config/config.yml
723723
imports:
724-
- { resource: parameters.ini }
724+
- { resource: parameters.yml }
725725
- { resource: security.yml }
726726
727727
framework:
@@ -747,7 +747,7 @@ format you prefer:
747747
748748
<!-- app/config/config.xml -->
749749
<imports>
750-
<import resource="parameters.ini" />
750+
<import resource="parameters.yml" />
751751
<import resource="security.yml" />
752752
</imports>
753753
@@ -769,7 +769,7 @@ format you prefer:
769769
770770
.. code-block:: php
771771
772-
$this->import('parameters.ini');
772+
$this->import('parameters.yml');
773773
$this->import('security.yml');
774774
775775
$container->loadFromExtension('framework', array(

cookbook/doctrine/reverse_engineering.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ to a post record thanks to a foreign key constraint.
4747
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4848
4949
Before diving into the recipe, be sure your database connection parameters are
50-
correctly setup in the ``app/config/parameters.ini`` file (or wherever your
50+
correctly setup in the ``app/config/parameters.yml`` file (or wherever your
5151
database configuration is kept) and that you have initialized a bundle that
5252
will host your future entity class. In this tutorial, we will assume that
5353
an ``AcmeBlogBundle`` exists and is located under the ``src/Acme/BlogBundle``

cookbook/workflow/new_project_git.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ git repository:
3333
/app/cache/*
3434
/app/logs/*
3535
/vendor/
36-
/app/config/parameters.ini
36+
/app/config/parameters.yml
3737
38-
4. Copy ``app/config/parameters.ini`` to ``app/config/parameters.ini.dist``.
39-
The ``parameters.ini`` file is ignored by git (see above) so that machine-specific
40-
settings like database passwords aren't committed. By creating the ``parameters.ini.dist``
38+
4. Copy ``app/config/parameters.yml`` to ``app/config/parameters.yml.dist``.
39+
The ``parameters.yml`` file is ignored by git (see above) so that machine-specific
40+
settings like database passwords aren't committed. By creating the ``parameters.yml.dist``
4141
file, new developers can quickly clone the project, copy this file to
42-
``parameters.ini``, customize it, and start developing.
42+
``parameters.yml``, customize it, and start developing.
4343

4444
5. Initialize your git repository:
4545

quick_tour/the_architecture.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ PHP. Have a look at the default configuration:
163163
164164
# app/config/config.yml
165165
imports:
166-
- { resource: parameters.ini }
166+
- { resource: parameters.yml }
167167
- { resource: security.yml }
168168
169169
framework:

0 commit comments

Comments
 (0)