Merge branch '2.4'

Conflicts:
	reference/forms/types/collection.rst
	reference/forms/types/file.rst

Author: weaverryan

.gitignore

@@ -1 +1,8 @@
-_exts
+/_build
+/bundles/DoctrineFixturesBundle
+/bundles/DoctrineMigrationsBundle
+/bundles/DoctrineMongoDBBundle
+/bundles/SensioFrameworkExtraBundle
+/bundles/SensioGeneratorBundle
+/cmf
+/_exts

Makefile

@@ -77,17 +77,17 @@ qthelp:
 	@echo
 	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
 	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SymfonyCMF.qhcp"
+	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Symfony.qhcp"
 	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SymfonyCMF.qhc"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Symfony.qhc"
 
 devhelp:
 	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
 	@echo
 	@echo "Build finished."
 	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/SymfonyCMF"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SymfonyCMF"
+	@echo "# mkdir -p $$HOME/.local/share/devhelp/Symfony"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Symfony"
 	@echo "# devhelp"
 
 epub: