Fix merge issues

Author: Doodoune

Dockerfile

@@ -65,23 +65,23 @@ COPY build.sh /home/akeneo/pim-docs/build.sh
 RUN chmod +x /home/akeneo/pim-docs/build.sh && \
     #
     # Download curent version
-    wget https://github.com/akeneo/pim-community-dev/archive/3.1.zip -P /home/akeneo/pim-docs/ && \
-    unzip /home/akeneo/pim-docs/3.1.zip -d /home/akeneo/pim-docs/ && \
+    wget https://github.com/akeneo/pim-community-dev/archive/master.zip -P /home/akeneo/pim-docs/ && \
+    unzip /home/akeneo/pim-docs/master.zip -d /home/akeneo/pim-docs/ && \
     #
     # Install Akeneo PIM
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && \
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && \
     php -d memory_limit=3G /home/akeneo/pim-docs/composer.phar install --no-dev --no-suggest --ignore-platform-reqs
 
 COPY docker/wait_for_mysql.sh /wait_for_mysql.sh
 RUN service mysql start && chmod +x /wait_for_mysql.sh && /wait_for_mysql.sh && \
     mysql -u root -e "CREATE DATABASE akeneo_pim" && \
     mysql -u root -e "GRANT ALL PRIVILEGES ON akeneo_pim.* TO akeneo_pim@localhost IDENTIFIED BY 'akeneo_pim'" && \
-    cp /home/akeneo/pim-docs/pim-community-dev-3.1/app/config/parameters.yml.dist /home/akeneo/pim-docs/pim-community-dev-3.1/app/config/parameters.yml && \
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && php bin/console doctrine:schema:create --env=prod && \
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && php bin/console pim:installer:assets --env=prod && \
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && sed -i "s#replace: '/bundles'#replace: '../bundles'#" frontend/build/compile-less.js && \
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && yarn install && yarn less
+    cp /home/akeneo/pim-docs/pim-community-dev-master/app/config/parameters.yml.dist /home/akeneo/pim-docs/pim-community-dev-master/app/config/parameters.yml && \
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && php bin/console doctrine:schema:create --env=prod && \
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && php bin/console pim:installer:assets --env=prod && \
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && sed -i "s#replace: '/bundles'#replace: '../bundles'#" frontend/build/compile-less.js && \
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && mkdir -p web/css && yarn install && yarn less
     #
     # Clean
 RUN rm -rf /root/.composer/cache && \
-    cd /home/akeneo/pim-docs/pim-community-dev-3.1/ && ls | grep -v "vendor\|web" | xargs rm -rf
+    cd /home/akeneo/pim-docs/pim-community-dev-master/ && ls | grep -v "vendor\|web" | xargs rm -rf

README.md

@@ -89,12 +89,12 @@ sed -i -e "s/^\(.*\)'versions': .*,\(.*\)$/\1'versions': ['$(git branch -l|grep
 From the `./pim-docs` directory, run:
 
 ```bash
-    $ docker build . --tag pim-docs:3.1
+    $ docker build . --tag pim-docs:master
     $ rm -rf pim-docs-build && mkdir pim-docs-build
     $ docker run --rm \
         -v $(pwd):/home/akeneo/pim-docs/data \
-        pim-docs:3.1 \
-        ./build.sh 3.1 --uid $(id -u) --gid $(id -g) --no-asset-check
+        pim-docs:master \
+        ./build.sh master --uid $(id -u) --gid $(id -g) --no-asset-check
 ```
 
 The docs will be built into `./pim-docs-build`.

_themes/akeneo/layout.html

@@ -92,6 +92,14 @@
         </div>
     </div>
 
+    <!-- Remove to deactivate development version notice -->
+    <div class="bg-warning text-warning text-center small" style="padding: 5px 0;">
+        <i class="fa fa-warning"></i>
+        Caution! You are browsing the documentation for Akeneo in version <b>master</b>, which is a development
+        version. <strong>Consider using the <a href="https://docs.akeneo.com/latest/">latest stable
+        version</a>.</strong>
+    </div>
+
     <!-- Uncomment to activate deprecation
     <div class="alert alert-warning warning deprecation-notice">
         <div class="bg-warning text-center">

contribute_to_pim/contribution_guide.rst

@@ -109,7 +109,7 @@ topic branch:
 
 .. code-block:: bash
 
-    $ git checkout -b BRANCH_NAME 3.1
+    $ git checkout -b BRANCH_NAME master
 
 .. tip::
 
@@ -231,11 +231,11 @@ while to finish your changes):
 
 .. code-block:: bash
 
-    $ git checkout 3.1
+    $ git checkout master
     $ git fetch upstream
-    $ git merge upstream/3.1
+    $ git merge upstream/master
     $ git checkout BRANCH_NAME
-    $ git rebase 3.1
+    $ git rebase master
 
 When doing the ``rebase`` command, you might have to fix merge conflicts.
 ``git status`` will show you the *unmerged* files. Resolve all the conflicts,
@@ -346,11 +346,11 @@ Rework your Patch
 ~~~~~~~~~~~~~~~~~
 
 Based on the feedback on the pull request, you might need to rework your
-patch. Before re-submitting the patch, rebase with ``upstream/3.1``, don't merge; and force the push to the origin:
+patch. Before re-submitting the patch, rebase with ``upstream/master``, don't merge; and force the push to the origin:
 
 .. code-block:: bash
 
-    $ git rebase -f upstream/3.1
+    $ git rebase -f upstream/master
     $ git push --force origin BRANCH_NAME
 
 .. note::
@@ -364,7 +364,7 @@ convert many commits to one commit. To do this, use the rebase command:
 
 .. code-block:: bash
 
-    $ git rebase -i upstream/3.1
+    $ git rebase -i upstream/master
     $ git push --force origin BRANCH_NAME
 
 After you type this command, an editor will popup showing a list of commits:

contribute_to_pim/documentation.rst

@@ -23,7 +23,7 @@ For typo / quick fixes you can directly submit a `PullRequest`_.
 
 To test the rendering of the documentation you can follow this `HowTo`_.
 
-.. _HowTo: https://github.com/akeneo/pim-docs/blob/3.1/README.md
+.. _HowTo: https://github.com/akeneo/pim-docs/blob/master/README.md
 
 Once your Pull Request is merged, don't hesitate to claim your badge "Core contributor" on `Badger platform <http://badger.akeneo.com/login/>`_!
 

contribute_to_pim/tests/establishing_decorator_pattern.rst

@@ -86,7 +86,7 @@ Navigate And Change The Current Page
     }
 
 Selenium will know which URL to go to thanks to `the protected $path attribute
-<https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Context/Page/Role/Edit.php#L19>`_
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Context/Page/Role/Edit.php#L19>`_
 contained in *Context\\Page\\Role\\Edit*.
 
 You may notice that this Gherkin method still uses the old implementation of Behat in Akeneo PIM.
@@ -102,7 +102,7 @@ This organization is very helpful to quickly find the context you are looking fo
 
 We are working on permissions that are localized in the system main menu. So let's see the
 `\\Pim\\Behat\\Context\\Domain\\System\\PermissionsContext
-<https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_.
 
 .. image:: images/PermissionsContext.png
 
@@ -149,12 +149,12 @@ Pages
 _____
 
 The current page is `Context\\Page\\Role\\Edit
-<https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Context/Page/Role/Edit.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Context/Page/Role/Edit.php>`_.
 
 When you call *Pim\\Behat\\Context\\NavigationContext->getCurrentPage()* the method will match "Role edit" to
 *return new Context\\Page\\Role\\Edit()*. That's why all of our pages are located in a folder named after the name of
 the Entity. In this folder, each action has its dedicated page such as Index.php, Creation.php, Edit.php as you can see
-in the `Role folder <https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Context/Page/Role>`_ for example.
+in the `Role folder <https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Context/Page/Role>`_ for example.
 
 .. image:: images/edit.png
 
@@ -247,7 +247,7 @@ The name of the sub-folder is only the representative name of the element, no pr
 have to be suffixed by "Decorator" like *DecoratedElementDecorator*.
 
 The `Pim\\Behat\\Decorator\\Permission\\PermissionDecorator
-<https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Context/Domain/System/PermissionsContext.php>`_
 adds behaviors to an Element to be able to navigate between groups and grant or revoke permissions for resources or groups.
 
 .. image:: images/decorator.png
@@ -303,7 +303,7 @@ The method *$this->find()* is neither in the decorator nor in the abstract class
 
 That's how we can call methods from the Element class inside decorators. And obviously, that's why all decorators must
 extend `Pim\\Behat\\Decorator\\ElementDecorator
-<https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features/Behat/Decorator/ElementDecorator.php>`_.
+<https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features/Behat/Decorator/ElementDecorator.php>`_.
 
 .. note::
 

contribute_to_pim/tests/index.rst

@@ -2,7 +2,7 @@ How behavior tests are architectured in the PIM?
 ================================================
 
 
-The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/blob/3.0/tests/legacy/features
+The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features
 
 .. warning::
 

design_pim/guides/create_a_reference_data_crud.rst

@@ -4,4 +4,4 @@ How to create the UI to manage a Reference Data
 .. note::
     The documentation of this cookbook is available on the extension `CustomEntityBundle`_.
 
-.. _CustomEntityBundle: https://github.com/akeneo-labs/CustomEntityBundle/blob/3.0/docs/index.md
+.. _CustomEntityBundle: https://github.com/akeneo-labs/CustomEntityBundle/blob/master/docs/index.md

import_and_export_data/formats/attribute.rst

@@ -10,7 +10,7 @@ The import/export file follows this data structure:
     :file: examples/attribute_properties.csv
     :delim: ;
 
-.. _MeasureBundle measures: https://github.com/akeneo/pim-community-dev/blob/3.1/src/Akeneo/Tool/Bundle/MeasureBundle/Resources/config/measure.yml
+.. _MeasureBundle measures: https://github.com/akeneo/pim-community-dev/blob/master/src/Akeneo/Tool/Bundle/MeasureBundle/Resources/config/measure.yml
 
 .. note::
 

import_and_export_data/simple-import.rst

@@ -1,8 +1,8 @@
 How import works
 ================
 
-.. _minimal: https://github.com/akeneo/pim-community-dev/tree/3.1/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/minimal
-.. _icecat: https://github.com/akeneo/pim-community-dev/tree/3.1/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/icecat_demo_dev
+.. _minimal: https://github.com/akeneo/pim-community-dev/tree/master/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/minimal
+.. _icecat: https://github.com/akeneo/pim-community-dev/tree/master/src/Akeneo/Platform/Bundle/InstallerBundle/Resources/fixtures/icecat_demo_dev
 
 At any time, a set of data can be imported: products, attributes, users, etc.
 

install_pim/docker/installation_docker.rst

@@ -48,7 +48,7 @@ This is achieved by `bind mounting <https://docs.docker.com/storage/bind-mounts/
 .. note::
 
    The following compose file example is intentionally incomplete, focusing on cache directories only.
-   Check the complete file directly `in the PIM <https://github.com/akeneo/pim-community-dev/blob/3.1/docker-compose.yml>`_.
+   Check the complete file directly `in the PIM <https://github.com/akeneo/pim-community-dev/blob/master/docker-compose.yml>`_.
 
 .. code-block:: yaml
 
@@ -134,7 +134,7 @@ Here is a ``docker-compose.override.yml`` example:
 
 Be aware that it is currently not possible to replace array values in the override. You can read more here: https://docs.docker.com/compose/extends/#adding-and-overriding-configuration.
 
-This is why the mapping of the Apache port is already present in `docker-compose.yml <https://github.com/akeneo/pim-community-dev/blob/3.1/docker-compose.yml#L46>`_, as this mapping is mandatory to access the PIM from a web browser.
+This is why the mapping of the Apache port is already present in `docker-compose.yml <https://github.com/akeneo/pim-community-dev/blob/master/docker-compose.yml#L46>`_, as this mapping is mandatory to access the PIM from a web browser.
 It is configurable through an environment variable, wo you will not have any conflicts having several PIM running in parallel. Just copy the file ```.env.dist``` as ```.env``` and set the port you want to access Apache on.
 
 If you intend to run behat tests, create on your host a folder ``/tmp/behat/screenshots`` (or anywhere else according to your compose file) with full read/write access to your user.

install_pim/manual/daemon_queue.rst

@@ -30,6 +30,16 @@ You can also run the daemon to execute only one job and then exit. This is usefu
 
     $ /path/to/php /path/to/your/pim/bin/console akeneo:batch:job-queue-consumer-daemon --env=prod --run-once
 
+Another possibility is to launch several daemons that will consume different jobs. This could be useful if you want a specific job to be consumed sooner.
+Here is an example with a few bulk actions:
+
+
+.. code-block:: bash
+    :linenos:
+
+    $ /path/to/php /path/to/your/pim/bin/console akeneo:batch:job-queue-consumer-daemon --env=prod -j update_product_value -p add_product_value -p remove_product_value
+
+
 Logs
 ----
 

manipulate_pim_data/mass_edition/register_a_new_mass_edit_action.rst

@@ -8,7 +8,7 @@ on selected products.
 Prerequisite
 ------------
 The mass edit action uses the `BatchBundle
-<https://github.com/akeneo/pim-community-dev/blob/3.1/src/Akeneo/Tool/Bundle/BatchBundle>`_ in order to run mass edit in the background. Readers and Writers are already
+<https://github.com/akeneo/pim-community-dev/blob/master/src/Akeneo/Tool/Bundle/BatchBundle>`_ in order to run mass edit in the background. Readers and Writers are already
 created so in this cookbook we will focus on how to create a Mass Edit Action and create a Processor.
 For more information on how to create Jobs, Readers, Processors, or Writers please see :doc:`/import_and_export_data/index`.
 

manipulate_pim_data/non-product/create.rst

@@ -1,7 +1,7 @@
 How to Create Non-Product Objects
 =================================
 
-.. _SimpleFactoryInterface: https://github.com/akeneo/pim-community-dev/blob/3.1/src/Akeneo/Tool/Component/StorageUtils/Factory/SimpleFactoryInterface.php
+.. _SimpleFactoryInterface: https://github.com/akeneo/pim-community-dev/blob/master/src/Akeneo/Tool/Component/StorageUtils/Factory/SimpleFactoryInterface.php
 
 To create common objects, we rely on different methods depending on the complexity of the object. There are some examples on how to use these services.
 

technical_architecture/best_practices/core/behat.rst

@@ -1,7 +1,7 @@
 Setup Behat
 ===========
 
-The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/blob/3.1/tests/legacy/features
+The PIM comes with a set of Behat scenarios: https://github.com/akeneo/pim-community-dev/blob/master/tests/legacy/features
 
 These scenarios allow to:
 

technical_architecture/best_practices/core/standards.rst

@@ -5,7 +5,7 @@ When contributing code to Akeneo PIM, you must follow its coding standards (very
 
 Akeneo follows the standards defined in the `PSR-0`_, `PSR-1`_ and `PSR-2`_ documents.
 
-We use few extra rules defined in our configuration of php-cs-fixer https://github.com/akeneo/pim-community-dev/blob/3.1/.php_cs.php.
+We use few extra rules defined in our configuration of php-cs-fixer https://github.com/akeneo/pim-community-dev/blob/master/.php_cs.php.
 
 Example
 -------

technical_architecture/best_practices/reusable_bundle.rst

@@ -55,8 +55,8 @@ You can find some configuration examples on our `Akeneo-Labs`_ projects (`scruti
 .. _Travis: https://travis-ci.org/
 .. _Scrutinizer: https://scrutinizer-ci.com/
 .. _Akeneo-Labs: https://github.com/akeneo-labs
-.. _scrutinizer.yml: https://github.com/akeneo-labs/CustomEntityBundle/blob/3.0/.scrutinizer.yml
-.. _travis.yml: https://github.com/akeneo-labs/CustomEntityBundle/blob/3.0/.travis.yml
+.. _scrutinizer.yml: https://github.com/akeneo-labs/CustomEntityBundle/blob/master/.scrutinizer.yml
+.. _travis.yml: https://github.com/akeneo-labs/CustomEntityBundle/blob/master/.travis.yml
 
 
 Another important point about maintainability is to rely on interfaces instead of concrete classes.
@@ -134,7 +134,7 @@ For your own model classes, create your class and its interface.
 Then you can rely on your interface and use the `Akeneo target resolver`_ which is based on the `Doctrine target entity resolver`_.
 
 .. _oneToOne unidirectional association: https://www.doctrine-project.org/projects/doctrine-orm/en/2.5/reference/association-mapping.html#one-to-one-unidirectional
-.. _Akeneo target resolver: https://github.com/akeneo/pim-community-dev/blob/3.1/src/Akeneo/Tool/Bundle/StorageUtilsBundle/DependencyInjection/Compiler/AbstractResolveDoctrineTargetModelPass.php
+.. _Akeneo target resolver: https://github.com/akeneo/pim-community-dev/blob/master/src/Akeneo/Tool/Bundle/StorageUtilsBundle/DependencyInjection/Compiler/AbstractResolveDoctrineTargetModelPass.php
 .. _Doctrine target entity resolver: https://symfony.com/doc/3.4/doctrine/resolve_target_entity.html