Merge pull request #2212 from openedx/theinkedkraken-patch-1

Updated Add Video Overview diagram for RTD

en_us/course_authors/source/video/add_video_to_course.rst

@@ -4,7 +4,7 @@
 Adding a Video to a Course
 ##########################
 
-To make a video visible in your course, you create a video component in a unit
+To make a video visible in your course, you create a video component in a Unit
 in Studio, and then you add information for the video to the video component.
 The information is different for courses on edx.org and courses on Edge.
 
@@ -24,7 +24,7 @@ Add a Video to an edx.org Course
   :ref:`Add a Video to an Edge Course`.
 
 For courses on edx.org, you add the following information to the video
-component.
+component:
 
 * A display name for the component.
 * The video ID that the upload process automatically creates for your video. To
@@ -96,6 +96,30 @@ To add a video and its transcript to an edx.org course, follow these steps.
 
 #. Select **Save** to save the video component.
 
+=========================================================
+Add New or Previously Uploaded Video to Course on edx.org 
+=========================================================
+
+If you are in a Unit in your course and you want to add a previously uploaded video, click on the green video tile. 
+
+.. image:: ../../../shared/images/AddNewComponent.png
+  :alt: this is an image of several components that you can choose from, including the video component.
+
+You now see a list of all the videos that you have previously uploaded. You can search for specific videos within the Search bar, filter by date added (newest/oldest), name (ascending/descending), or duration (longest/shortest). You can sort by video status (uploading, processing, ready, failed). To add a video to your course, click on the video you want to add and then click on Select video. 
+
+.. image:: ../../../shared/images/AddVideoToYourCourse.png
+  :alt: this is the page you are brought to after clicking on the video component and this page offers the ability to select a previously uploaded video so that you can add it to the course as well as a button to upload or embed a new video.
+
+To upload or embed a new video, click on the link on the bottom left side of the Add video to your course page. You can drag and drop a video, click to upload a video, or paste your video ID or URL in the text box. 
+
+.. image:: ../../../shared/images/UploadVideoDragAndDrop.png
+  :alt: you can drag and drop a video here or upload MP4 or MOV files.
+
+In the screenshot above, a Youtube URL was pasted into the text box. If you click the right arrow in the box, you are taken to the Video Settings page (screenshot below). If you click Save, the video is added to your course. If you click on Replace video, you are taken back to the Add video to your course page.
+
+.. image:: ../../../shared/images/VideoUploadDetails.png
+  :alt: this screen shows the settings for the video and includes video ID and video URL as well as fields for fallback videos, a thumbnail, transcripts, duration, handout, and license. 
+
 .. _Add a Video to an Edge Course:
 
 ********************************

en_us/course_authors/source/video/upload_video.rst

@@ -58,9 +58,10 @@ represents all of the formats and hosting locations for the video.
   If a step in the process does not complete successfully, the process
   automatically tries again multiple times. If the process does not complete
   successfully after multiple tries, an :ref:`error status <Video Processing
-  Statuses>` appears in the list of videos on the **Video Uploads** page.
+  Statuses>` appears in the list of videos on the **Video Uploads** page as 
+  well as within the video component.
 
-For more information, see the following topics.
+For more information, see the following topics:
 
 .. contents::
   :local:
@@ -138,9 +139,9 @@ course team has obtained transcripts from the transcript provider, the course
 team creates a video component and adds the video ID and transcript to the
 component. For more information, see :ref:`Add a Video to a Course`.
 
-====================================
-Upload a Video for an edx.org Course
-====================================
+=============================================================
+Upload a Video for an edx.org Course (for Video Uploads page)
+=============================================================
 
 To upload video files, both for videos with integrated transcripts and
 non-integrated transcripts, follow these steps.
@@ -156,11 +157,11 @@ non-integrated transcripts, follow these steps.
    to upload.
 
    A rectangular tile appears on the page for each file and shows the following
-   information.
+   information:
 
-   * The video file name.
-   * A progress bar.
-   * The status of the file upload process.
+   * The video file name
+   * A progress bar
+   * The status of the file upload process
 
    When the file has been successfully uploaded, the tile disappears, and an
    entry for the video appears under **Previous Uploads** with a status of

en_us/course_authors/source/video/video_process_overview.rst

@@ -33,8 +33,6 @@ edx.org course.
 #. The course team :ref:`uploads a video <Uploading a Video for an edx org
    Course>` to the **Video Uploads** page.
 
-#. The :ref:`edX video process <Automated Video Process>` encodes and uploads
-   completed videos to the edX hosting service.
 
 #. The course team :ref:`creates video components <Add a Video to an edx org
    Course>` and adds the video information to the components.