Merge pull request #478 from edx/birch.2

Fix links for box files and bittorrent for Birch.2

en_us/install_operations/source/birch.rst

@@ -110,17 +110,13 @@ Vagrant before continuing with the installation process.
 
    .. code-block:: bash
 
-     $ vagrant box add /path-to-downloaded-box/vagrant-images-20150224-birch-
-     devstack.box --name birch-devstack
+     $ vagrant box add /path-to-downloaded-box/vagrant-images-birch-2-devstack.box --name birch-devstack-2
 
 * For Fullstack installations, run the following command.
 
    .. code-block:: bash
 
-     $ vagrant box add /path-to-downloaded-box/vagrant-images-20150224-birch-
-     fullstack.box --name birch-fullstack
-
-.. confirm names
+     $ vagrant box add /path-to-downloaded-box/vagrant-images-birch-2-fullstack.box --name birch-fullstack-2
 
 ============================================
 Set the OPENEDX_RELEASE Environment Variable
@@ -165,9 +161,9 @@ Birch release, using the ``migrate.sh`` script in the configuration repository,
 On the computer or virtual machine running the Aspen release of Open edX, run
 the upgrade script for your type of installation:
 
-* For Devstack, run ``./migrate.sh -c devstack``.
+* For Devstack, run ``./migrate.sh -t named-release/birch.2 -c devstack``.
 
-* For Fullstack, run ``./migrate.sh -c fullstack``.
+* For Fullstack, run ``./migrate.sh -t named-release/birch.2 -c fullstack``.
 
 * You can also run ``./migrate.sh -h`` to see which other options the script accepts.
 

en_us/install_operations/source/links.rst

@@ -18,15 +18,15 @@
 
 .. _Vagrant's documentation on boxes: http://docs.vagrantup.com/v2/boxes.html
 
-.. _Birch Devstack: https://s3.amazonaws.com/edx-static/vagrant-images/20150224-birch-devstack.box
+.. _Birch Devstack: https://s3.amazonaws.com/edx-static/vagrant-images/birch-2-devstack.box
 
-.. _Birch Fullstack: https://s3.amazonaws.com/edx-static/vagrant-images/20150224-birch-fullstack.box
+.. _Birch Fullstack: https://s3.amazonaws.com/edx-static/vagrant-images/birch-2-fullstack.box
 
 .. _Google Drive XBlock: https://github.com/edx-solutions/xblock-google-drive
 
-.. _Birch Devstack BitTorrent: https://s3.amazonaws.com/edx-static/vagrant-images/20150224-birch-devstack.box?torrent
+.. _Birch Devstack BitTorrent: https://s3.amazonaws.com/edx-static/vagrant-images/birch-2-devstack.box?torrent
 
-.. _Birch Fullstack BitTorrent: https://s3.amazonaws.com/edx-static/vagrant-images/20150224-birch-fullstack.box?torrent
+.. _Birch Fullstack BitTorrent: https://s3.amazonaws.com/edx-static/vagrant-images/birch-2-fullstack.box?torrent
 
 .. _XML file: https://edge.edx.org/auth/saml/metadata.xml
 
@@ -42,7 +42,7 @@
 
 .. _Enable Google Drive Files in edX Studio: http://edx.readthedocs.org/projects/open-edx-building-and-running-a-course/en/named-release-birch/exercises_tools/google_docs.html#enable-google-drive-files-in-your-course
 
-.. mobile: 
+.. mobile:
 
 .. _iOS: http://github.com/edx/edx-app-ios
 .. _Android: http://github.com/edx/edx-app-android