From 94a03fad3ca252513cef8ba0804506c0ac99dd49 Mon Sep 17 00:00:00 2001
From: Mark Hoeber <hoeber@edx.org>
Date: Tue, 19 Aug 2014 16:05:32 -0400
Subject: [PATCH] Added shared browser topic

To include in all guides
---
 .../course_authors/source/change_log.rst      |  2 +
 .../source/getting_started/browsers.rst       |  1 +
 .../source/getting_started/index.rst          |  2 +-
 docs/en_us/shared/browsers.rst                | 80 +++++++++++++++++++
 4 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 docs/en_us/course_authors/source/getting_started/browsers.rst
 create mode 100644 docs/en_us/shared/browsers.rst

diff --git a/docs/en_us/course_authors/source/change_log.rst b/docs/en_us/course_authors/source/change_log.rst
index 2236ed6105..67280a2a59 100644
--- a/docs/en_us/course_authors/source/change_log.rst
+++ b/docs/en_us/course_authors/source/change_log.rst
@@ -12,6 +12,8 @@ August, 2014
 
    * - Date
      - Change
+   * - 08/20/14
+     - Added :ref:`Browsers` to the :ref:`Getting Started Index` section
    * - 08/18/14
      - Expanded the :ref:`Example Messages to Students` in the :ref:`Launch`
        chapter.
diff --git a/docs/en_us/course_authors/source/getting_started/browsers.rst b/docs/en_us/course_authors/source/getting_started/browsers.rst
new file mode 100644
index 0000000000..7f2a1b17db
--- /dev/null
+++ b/docs/en_us/course_authors/source/getting_started/browsers.rst
@@ -0,0 +1 @@
+.. include:: ../../../shared/browsers.rst
\ No newline at end of file
diff --git a/docs/en_us/course_authors/source/getting_started/index.rst b/docs/en_us/course_authors/source/getting_started/index.rst
index 13a61b11ab..90a6457d25 100644
--- a/docs/en_us/course_authors/source/getting_started/index.rst
+++ b/docs/en_us/course_authors/source/getting_started/index.rst
@@ -8,7 +8,7 @@ Getting Started
    :maxdepth: 3
 
 
-
+   browsers
    accounts
    get_started
    accessibility
diff --git a/docs/en_us/shared/browsers.rst b/docs/en_us/shared/browsers.rst
new file mode 100644
index 0000000000..08827095ff
--- /dev/null
+++ b/docs/en_us/shared/browsers.rst
@@ -0,0 +1,80 @@
+.. _Browsers:
+
+####################
+edX Browser Support
+####################
+
+The edX Platform runs on the following browsers:
+
+* Internet Explorer
+* Chrome
+* Safari
+* Firefox
+
+The edX Platform is routinely tested and verified on the current
+and previous version of each of these browsers, but we generally encourage the
+use of and fully support only the latest version.
+
+This page is updated as new major operating system and browser versions
+are released. All point releases are supported unless noted; these occasional
+exceptions are based on specific bug fixes or feature updates.
+
+***********************************
+The edX Learning Management System
+***********************************
+
+The following table shows operating system and browser support for the Learning
+Management System, which students and course staff use to interact with
+courseware.
+
+.. list-table::
+   :widths: 20 10 10 10 10 10
+   :header-rows: 1
+
+   * - 
+     - Chrome
+     - Safari
+     - Firefox
+     - IE 9
+     - IE 10
+   * - Windows 7
+     - Yes
+     - N/A
+     - Yes
+     - Yes
+     - Yes
+   * - Mac OSX 10.8 or 10.9
+     - Yes
+     - Yes
+     - Yes
+     - N/A
+     - N/A
+
+***********************************
+edX Studio
+***********************************
+
+The following table shows operating system and browser support for edX Studio, which course staff use to build courseware.
+
+.. list-table::
+   :widths: 20 10 10 10 10 10
+   :header-rows: 1
+
+   * - 
+     - Chrome
+     - Safari
+     - Firefox
+     - IE 9
+     - IE 10
+   * - Windows 7
+     - Yes
+     - N/A
+     - Yes
+     - Provisional
+     - Provisional
+   * - Mac OSX 10.8 or 10.9
+     - Yes
+     - Yes
+     - Yes
+     - N/A
+     - N/A
\ No newline at end of file