Skip to content

Translate to Portuguese #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Translate to Portuguese #1

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b4fc95
updated for PR3
fabpot Jun 25, 2010
0a9a1ab
Merge branch 'master' into PR3
fabpot Jul 20, 2010
ed07bf1
Merge branch 'master' into PR3
fabpot Jul 26, 2010
5bb596a
[DoctrineMongoDBBundle] Updating documentation for recent changes.
jwage Jul 23, 2010
bfeb5d9
removed old file
fabpot Jul 28, 2010
2c67ad1
Merge branch 'master' into PR3
fabpot Jul 29, 2010
ef47cfd
Adicionado a tradução para o quick tour
adell Aug 5, 2010
69d2279
Traduzindo o the_architecture.rst
adell Aug 5, 2010
686213f
first commit
skipp Aug 5, 2010
3aaab6f
Merge branch 'master' of http://github.com/skipp/symfony-docs into sk…
adell Aug 5, 2010
7d9e98e
Seguindo a tradução do arquivo the_architecture
adell Aug 5, 2010
de0b2b7
Resolvendo osconflitos
adell Aug 20, 2010
6184344
adicionados novos arquivos e atualizado a tradução do arquivo the_arc…
adell Aug 30, 2010
0bfdda0
Terminada a pagina the_architecture.rst
adell Aug 31, 2010
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion guides/doctrine/configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ Doctrine Configuration
DBAL Configuration
------------------

<<<<<<< HEAD:guides/doctrine/configuration.rst
.. code-block:: yaml

=======
[yml]
>>>>>>> origin/PR3:guides/en/Doctrine/Configuration.markdown
# config/config.yml
doctrine.dbal:
driver: PDOMySql
Expand Down Expand Up @@ -64,7 +68,18 @@ but you must pass it an argument with the name of the connection you want to get
ORM Configuration
-----------------

<<<<<<< HEAD:guides/doctrine/configuration.rst
.. code-block:: yaml
=======
doctrine.orm:
default_entity_manager: default
cache_driver: apc # array, apc, memcache, xcache
entity_managers:
default:
connection: default
customer:
connection: customer
>>>>>>> origin/PR3:guides/en/Doctrine/Configuration.markdown

doctrine.orm:
default_entity_manager: default
Expand Down Expand Up @@ -150,4 +165,4 @@ or options:
:drop Processes the schema and either drop the database schema of EntityManager Storage Connection or generate the SQL output.
:update Processes the schema and either update the database schema of EntityManager Storage Connection or generate the SQL output.

...
...
4 changes: 4 additions & 0 deletions guides/testing/recipes.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ to check the number of database calls, the time spent in the framework, ...
But before writing assertions, always check that the profiler is indeed
available (it is enabled by default in the ``test`` environment)::

<<<<<<< HEAD:guides/testing/recipes.rst
=======
[php]
>>>>>>> origin/PR3:guides/en/Testing/Recipes.markdown
if ($profiler = $client->getProfiler()) {
// check the number of requests
$this->assertTrue($profiler['db']->getQueryCount() < 10);
Expand Down