bundles in sync

Author: petk

bundles/DoctrineMigrationsBundle/index.rst

@@ -23,8 +23,8 @@ standardno izdajo. Dodajte sledeče v vašo datoteko ``composer.json``:
 
     {
         "require": {
-            "doctrine/migrations": "dev-master",
-            "doctrine/doctrine-migrations-bundle": "dev-master"
+            "doctrine/migrations": "1.0.*@dev",
+            "doctrine/doctrine-migrations-bundle": "2.1.*@dev"
         }
     }
 

bundles/DoctrineMongoDBBundle/index.rst

@@ -375,7 +375,7 @@ Once you have your repository, you have access to all sorts of helpful methods::
     // find *all* products
     $products = $repository->findAll();
 
-    // find a group of products based on an abitrary column value
+    // find a group of products based on an arbitrary column value
     $products = $repository->findByPrice(19.99);
 
 .. note::
@@ -799,8 +799,8 @@ Learn more from the Cookbook
 .. _`Basic Mapping Documentation`: http://docs.doctrine-project.org/projects/doctrine-mongodb-odm/en/latest/reference/basic-mapping.html
 .. _`MongoDB type`: http://us.php.net/manual/en/mongo.types.php
 .. _`Mapping Types Documentation`: http://docs.doctrine-project.org/projects/doctrine-mongodb-odm/en/latest/reference/basic-mapping.html#doctrine-mapping-types
-.. _`Query Builder`: http://www.doctrine-project.org/docs/mongodb_odm/1.0/en/reference/query-builder-api.html
-.. _`Conditional Operators`: http://www.doctrine-project.org/docs/mongodb_odm/1.0/en/reference/query-builder-api.html#conditional-operators
-.. _`Event Documentation`: http://www.doctrine-project.org/docs/mongodb_odm/1.0/en/reference/events.html
+.. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-mongodb-odm/en/latest/reference/query-builder-api.html
+.. _`Conditional Operators`: http://docs.doctrine-project.org/projects/doctrine-mongodb-odm/en/latest/reference/query-builder-api.html#conditional-operators
+.. _`Event Documentation`: http://docs.doctrine-project.org/projects/doctrine-mongodb-odm/en/latest/reference/events.html
 .. _`PHP Documentation`: http://www.php.net/manual/en/mongo.tutorial.php
 .. _`UniqueEntity`: http://symfony.com/doc/current/reference/constraints/UniqueEntity.html

bundles/SensioFrameworkExtraBundle/annotations/cache.rst

@@ -52,6 +52,12 @@ configuration, the latter overrides the former::
 HTTP Validation Strategies
 --------------------------
 
+.. caution::
+
+    Support for HTTP validation strategies was introduced in SensioFrameworkExtraBundle
+    3.0. This bundle version can only be used with Symfony 2.4 or later (see
+    :ref:`the SensioFrameworkExtraBundle release cycle <release-cycle-note>`).
+
 The ``lastModified`` and ``ETag`` attributes manages the HTTP validation cache
 headers. ``lastModified`` adds a ``Last-Modified`` header to Responses and
 ``ETag`` adds an ``ETag`` header.

bundles/SensioFrameworkExtraBundle/annotations/converters.rst

@@ -262,7 +262,7 @@ definition.
 
 .. tip::
 
-   If you would like to inject services or additional arguments to custom param converter, the priority shouldn't
+   If you would like to inject services or additional arguments into a custom param converter, the priority shouldn't
    be higher than 1. Otherwise, the service wouldn't be loaded.
 
 .. tip::

bundles/SensioFrameworkExtraBundle/annotations/security.rst

@@ -1,6 +1,12 @@
 @Security
 =========
 
+.. caution::
+
+    Anotacija ``@Security`` je bila predstavljena v SensioFrameworkExtraBundle
+    3.0. Ta verzija paketa je lahko uporabljena samo s Symfony 2.4 ali novejšim (glejte
+    :ref:`the SensioFrameworkExtraBundle proces izdaj <release-cycle-note>`).
+
 Uporaba
 -------
 

bundles/SensioFrameworkExtraBundle/index.rst

@@ -8,7 +8,12 @@ konvencije in anotacije. Omogoča bolj jedrnate krmilnike.
 Namestitev
 ----------
 
-`Prenesite`_ paket in ga dajte pod imenski prostor ``Sensio\Bundle\``.
+Pred uporabo tega paketa v vašem projektu, ga dodajte v vašo datoteko ``composer.json``:
+
+.. code-block:: bash
+
+    $ composer require sensio/framework-extra-bundle
+
 Nato ga, kot vsak drug paket, vključite v vaš razred Kernel::
 
     public function registerBundles()
@@ -22,6 +27,18 @@ Nato ga, kot vsak drug paket, vključite v vaš razred Kernel::
         ...
     }
 
+.. _release-cycle-note:
+
+.. note::
+
+    Od SensioFrameworkExtraBundle 3.0 je njen proces izdaj nesinhroniziran
+    s Symfony-jevem procesom izdaj. To pomeni, da lahko enostavno naredite require
+    ``sensio/framework-extra-bundle: ~3.0`` v vaši datoteki ``composer.json``
+    in Composer bo avtomatsko izbral najnovejšo verzijo paketa za vas.
+    Uporabiti morate Symfony 2.4 ali novejši za ta potek dela. Pred Symfony
+    2.4, zahtevana verzija SensioFrameworkExtraBundle bi morala biti
+    enaka kot je vaša verzija Symfony.
+
 Če planirate uporabiti ali ustvariti anotacije za krmilnike, zagotovite posodobiti
 vaš ``autoload.php`` z dodajanjem sledeče vrstice::
 
@@ -157,5 +174,4 @@ Usmeritve morajo biti uvožene, da so aktivne kot katerikoli drugi viri usmerite
 glejte :ref:`Annotated Routes Activation<frameworkextra-annotations-routing-activation>` za
 podrobnosti.
 
-.. _`SensioFrameworkExtraBundle`: https://github.com/sensio/SensioFrameworkExtraBundle
-.. _`Download`: http://github.com/sensio/SensioFrameworkExtraBundle
+.. _`SensioFrameworkExtraBundle`: https://github.com/sensiolabs/SensioFrameworkExtraBundle

bundles/SensioGeneratorBundle/commands/generate_controller.rst

@@ -27,7 +27,7 @@ Opcije na voljo
 
 * ``--controller``: Ime krmilnika dano kot bližnjica notacije, ki vsebuje
   ime paketa v katerem je krmilnik lociran in ime
-  krmilnika. Na primer: ``AcmeBlogBundle:Post`` (ustvro ``PostController``
+  krmilnika. Na primer: ``AcmeBlogBundle:Post`` (ustvari ``PostController``
   znotraj paketa ``AcmeBlogBundle``):
 
     .. code-block:: bash

bundles/SensioGeneratorBundle/commands/generate_doctrine_crud.rst

@@ -63,3 +63,9 @@ Opcije na voljo
   .. code-block:: bash
 
       php app/console generate:doctrine:crud --format=annotation
+
+* ``--overwrite``: (**no**) [vrednosti: yes|no] Ali naj ali ne prepiše obstoječe datoteke:
+
+  .. code-block:: bash
+
+       php app/console generate:doctrine:crud --overwrite

bundles/SensioGeneratorBundle/index.rst

@@ -9,7 +9,12 @@ sheme Doctrine 2.
 Namestitev
 ----------
 
-`Prenesite`_ paket in ga dajte pod imenski prostor ``Sensio\Bundle``.
+Preden uporabo paketa v vašem projektu, ga dodajte v vašo datoteko ``composer.json``:
+
+.. code-block:: bash
+
+    $ composer require sensio/generator-bundle
+
 Potem ga, kot za vsak paket, vključite v vaš razred Kernel::
 
     public function registerBundles()