Skip to content

Commit

Permalink
Merge pull request #858 from edx/ahodges/dogwood_IRC
Browse files Browse the repository at this point in the history
None of the features require a step to enable AFAICT
  • Loading branch information
Alison Hodges committed Feb 10, 2016
2 parents 8af614a + 4473f35 commit b766f00
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 32 deletions.
45 changes: 13 additions & 32 deletions en_us/install_operations/source/dogwood.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@ Open edX Dogwood Release

This section describes how to install the Open edX Dogwood release.

.. important::
Dogwood is pre-release software, and may be unstable. These instructions
are a draft, for Dogwood RC3. We welcome feedback.


.. contents::
:local:
:depth: 1
Expand All @@ -20,30 +15,18 @@ What's Included in Dogwood
******************************

The Open edX Dogwood release contains several new features for learners, course
teams, and developers. See the :ref:`openreleasenotes:Open edX Release Notes`
for more details.

.. TBD: fix this up for Dogwood...
.. Note::
There are several new features in the Dogwood release that are available, but
not enabled by default in new installations. For details, see the following
topics.
* :ref:`Enable edX Search`
* :ref:`Enable Badging`
* :ref:`Enable CCX`
* :ref:`Enable Licensing`
teams, and developers. See the release notes for the
:ref:`openreleasenotes:Open edX Dogwood Release` for more details.

******************************
What is the Dogwood Git Tag?
******************************

The Git tag for the Dogwood release is ``named-release/dogwood.rc3``. You use this
tag to identify the version of Open edX code that is the Dogwood release.
The Git tag for the Dogwood release is ``named-release/dogwood``. You use
this tag to identify the version of Open edX code that is the Dogwood release.

The following Open edX Git repositories have the Git tag
``named-release/dogwood.rc3``.
``named-release/dogwood``.

* edx-platform
* configuration
Expand All @@ -64,9 +47,8 @@ The following Open edX Git repositories have the Git tag
Installing the Dogwood Release
******************************

You can install the Open edX Dogwood release using
:ref:`Devstack <Install DevStack>` or
:ref:`Fullstack <Install Open edX Fullstack>`.
You can install the Open edX Dogwood release using :ref:`Devstack <Install
DevStack>` or :ref:`Fullstack <Install Open edX Fullstack>`.

Review the prerequisites and instructions for each option, and then choose the
option that best meets your needs. Ensure that you install the
Expand All @@ -93,7 +75,7 @@ Download the Vagrant Box
=========================

If you have a fast and reliable Internet connection, you can download the
Vagrant box directly or by running ``vagrant up`` when installing
Vagrant box directly or by running ``vagrant up`` when you install
:ref:`Devstack <Installing the Open edX Developer Stack>` or
:ref:`Fullstack <Installing Open edX Fullstack>`.

Expand Down Expand Up @@ -144,7 +126,7 @@ release. To do so, use the Linux ``export`` command.

.. code-block:: bash
export OPENEDX_RELEASE="named-release/dogwood.rc3"
export OPENEDX_RELEASE="named-release/dogwood"
=========================
Install the Vagrant Box
Expand Down Expand Up @@ -183,9 +165,10 @@ The ``migrate.sh`` script is in the configuration repository, `available here
On the computer or virtual machine that is running the Cypress release of Open
edX, run the upgrade script for your type of installation:

* For Devstack, run ``./migrate.sh -c devstack -t named-release/dogwood.rc3``.
* For Devstack, run ``./migrate.sh -c devstack -t named-release/dogwood``.

* For Fullstack, run ``./migrate.sh -c fullstack -t named-release/dogwood.rc3``.
* For Fullstack, run
``./migrate.sh -c fullstack -t named-release/dogwood``.

* You can also run ``./migrate.sh -h`` to see which other options the script
accepts.
Expand All @@ -202,7 +185,7 @@ Upgrade Process Overview
========================

This is an overview of what happens during an upgrade from Cypress to Dogwood.
The ``migrage.sh`` script implements this process. You may need to understand
The ``migrate.sh`` script implements this process. You may need to understand
this process if your installation is customized in some way, or if you need to
diagnose problems during the upgrade.

Expand Down Expand Up @@ -251,6 +234,4 @@ The upgrade from Cypress to Dogwood includes these steps.
Similar steps are followed to upgrade other repositories such as xqueue.


.. _forum migration described on the Open edX wiki: https://openedx.atlassian.net/wiki/display/TNL/Migrating+the+Discussion+Forums+to+Support+Teams+Discussion+Filtering

.. include:: ../../links/links.rst
2 changes: 2 additions & 0 deletions en_us/links/links.rst
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@

.. _Developing on Devstack: https://github.com/edx/edx-platform/wiki/Developing-on-the-edX-Developer-Stack

.. _forum migration described on the Open edX wiki: https://openedx.atlassian.net/wiki/display/TNL/Migrating+the+Discussion+Forums+to+Support+Teams+Discussion+Filtering

.. _Google Drive XBlock: https://github.com/edx-solutions/xblock-google-drive

.. _init file: https://github.com/edx/edx-ora2/blob/a4ce7bb00190d7baff60fc90fb613229565ca7ef/openassessment/fileupload/backends/__init__.py
Expand Down

0 comments on commit b766f00

Please sign in to comment.