From 63ed772e5c0c043692b4dc48add7bd556f5083ba Mon Sep 17 00:00:00 2001
From: Jonathan Farbowitz <jfarbowitz@gmail.com>
Date: Wed, 18 Nov 2015 19:30:11 -0500
Subject: [PATCH] Adjusted intro text and concatenate description

---
 index.html | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/index.html b/index.html
index 8f3b140..0b749fb 100644
--- a/index.html
+++ b/index.html
@@ -29,11 +29,11 @@
 
        <div class="well col-md-3 col-md-offset-0">
         <br>
-          <h5>Making FFmpeg easier</h5>
-          <p>FFmpeg is a powerful framework for manipulating audiovisual files. Unfortunately, it also has a steep learning curve, especially for users unfamiliar with the command line. This app helps users through the bash command generation process so that more people can reap the benefits of the FFmpeg library. </p>
-          <p>This project is very much a work in progress. Each button displays a form to help fulfill a popular user request. To use, click on the button and fill out the form. After clicking the Generate button, a command line will appear in the box below. That line can be copied and pasted into a Terminal, with the assumption that the video file is located in the same directory that the user currently is in.</p>
-          <p>For FFmpeg basics, check out their <a href="https://www.ffmpeg.org/">official website.</a></p>
-          <p>For bash and command line basics, try the <a href="http://cli.learncodethehardway.org/book/">Command Line Crash Course</a></p>
+          <h5>Making FFmpeg Easier</h5>
+          <p>FFmpeg is a powerful tool for manipulating audiovisual files. Unfortunately, it also has a steep learning curve, especially for users unfamiliar with a command line interface. This app helps users through the command generation process so that more people can reap the benefits of the FFmpeg. </p>
+          <p>This project is very much a work in progress. Each button displays helpful information about how to perform a wide variety of tasks using FFmpeg. To use this site, click on the task you would like to perform. A new window will open up with a sample command and a description of how that command works. You can copy this command, and after specifying an [input] and possibly an [output], you can then use this command in a Terminal.</p>
+          <p>For FFmpeg basics, check out the program's <a href="https://www.ffmpeg.org/">official website.</a></p>
+          <p>For Bash and command line basics, try the <a href="http://cli.learncodethehardway.org/book/">Command Line Crash Course</a></p>
       </div>
 
       <div class="well col-md-6 col-md-offset-2">
@@ -246,7 +246,7 @@
 <!-- ends Pull specs -->
 
 <!-- Join files together -->
-<span data-toggle="modal" data-target=".join_files"><button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Concatenate two or more files into a single file">Join files together</button></span>
+<span data-toggle="modal" data-target=".join_files"><button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Join (concatenate) two or more files into a single file">Join files together</button></span>
 
 <div class="modal fade join_files" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel">
   <div class="modal-dialog modal-lg">
@@ -256,21 +256,22 @@
         <h3>Join files together</h3>
         <p><code>ffmpeg -f concat -i mylist.txt -c copy [output] </code></p>
 
-        <p>This command takes two or more files of the same filetype and joins them together to make a single file. All that the program needs is a list specifying the files that should be concatenated.  However, it only works if the files to be combined have the exact same codec and technical specifications.  </p>
+        <p>This command takes two or more files of the same file type and joins them together to make a single file. All that the program needs is a text file with a list specifying the files that should be joined.  However, it only works properly if the files to be combined have the exact same codec and technical specifications. Be careful, ffmpeg may appear to have successfully joined two video files with different codecs, but may only bring over the audio from the second file or have other weird behaviors. Don’t use this command for joining files with different codecs and technical specs and always preview your resulting video file!
+</p>
         <p>ffmpeg documentation on concatenating files (full list of flags, commands, <a href="https://trac.ffmpeg.org/wiki/Concatenate">https://trac.ffmpeg.org/wiki/Concatenate</a>) </p>
 
         <ul>
          <li>ffmpeg: calls the program</li>
-         <li>-f: forces the input file format</li>
-         <li>concat: ffmpeg’s concatenate command</li>
+         <li>-f: forces ffmpeg to keep the same file format of the joined files</li>
+         <li>concat: ffmpeg’s concatenate command. This tells ffmpeg to join the files.</li>
          <li>-i: tells ffmpeg to expect input files</li>
-         <li>mylist.txt: a text file indicating the list of files to be concatenated. Should be formatted as:</li>
+         <li>mylist.txt: specifies the location of a text file with a list of files to be concatenated. You should create a text file that is formatted as follows:</li>
             <ul>
               <li>file [path to file 1]</li>
               <li>file [path to file 2]</li>
             </ul>
-         <li>-c copy: specifies the encoder for the output file by telling the program to copy the codecs of the original files and use them for the output file</li>
-         <li>[output]: desired filename for the output file</li>
+         <li>-c copy: specifies the encoder for the output file by telling ffmpeg to copy the codecs of the original files and use them for the output file</li>
+         <li>[output]: specifies the filename and location for the output file</li>
         </ul>
       </div>
     </div>