Merge branch '3.2' into 3.3

weaverryan · weaverryan · commit a15b5f89edcb · 2017-06-16T12:05:22.000-04:00
* 3.2:
  Re-adding index
  fixing index problem now that there were *no* frontend articles on 2.7
  Removing bower, as even they now recommend to use yarn and webpack
  Changed link to Capifony
diff --git a/_build/redirection_map b/_build/redirection_map
@@ -164,7 +164,7 @@
 /cookbook/form/inherit_data_option /form/inherit_data_option
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
-/cookbook/frontend/bower /frontend/bower
+/cookbook/frontend/bower /frontend
 /cookbook/frontend/index /frontend
 /cookbook/install/unstable_versions /setup/unstable_versions
 /cookbook/install/bundles /setup/bundles
diff --git a/deployment.rst b/deployment.rst
@@ -198,7 +198,7 @@ Don't forget that deploying your application also involves updating any dependen
 (typically via Composer), migrating your database, clearing your cache and
 other potential things like pushing assets to a CDN (see `Common Post-Deployment Tasks`_).
 
-.. _`Capifony`: http://capifony.org/
+.. _`Capifony`: https://github.com/everzet/capifony
 .. _`Capistrano`: http://capistranorb.com/
 .. _`sf2debpkg`: https://github.com/liip/sf2debpkg
 .. _`Fabric`: http://www.fabfile.org/
diff --git a/frontend.rst b/frontend.rst
@@ -73,6 +73,9 @@ Other Front-End Articles
     frontend/encore/simple-example
     frontend/encore/*
 
+See the latest version of the docs for frontend tools. Or, see
+:doc:`/assetic`.
+
 .. toctree::
     :maxdepth: 1
     :glob:
diff --git a/frontend/bower.rst b/frontend/bower.rst
