From 6e6f9f4cd4a8c849e31e9eba66210cc47665bba8 Mon Sep 17 00:00:00 2001
From: Arnold Daniels <arnold@jasny.net>
Date: Wed, 1 May 2013 03:29:52 -0700
Subject: [PATCH] Merge pull request #105 from GarthSnyder/2.3.1-j7-wip

Minor edits to File Upload docs: rm dup sentences, fix formats, clarify
---
 docs/javascript.html                     | 10 ++++------
 docs/templates/pages/javascript.mustache | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/docs/javascript.html b/docs/javascript.html
index 4602d1b7..ac2bb766 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -2044,13 +2044,11 @@ $('.carousel').carousel({
 
         <h2>Usage</h2>
         <h3>Via data attributes</h3>
-        <p>Add data attributes to register the file upload widget. The main container should either have the <code>.fileupload-new</code> class for a new record or if the record
-          does not have file or <code>.fileupload-exists</code> if an existing file is present. Elements inside the container with the <code>.fileupload-new</code> and <code>.fileupload-exists</code>
-          class will be shown or hidden based on the current state. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear
-          the file with <code>data-dismiss="fileupload"</code>. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear the file with
-          <code>data-dismiss="fileupload"</code>.</p>
+        <p>Add data attributes to register the file upload widget. The main container should either have the <code>.fileupload-new</code> class for a new record (one with no file yet specified) or the <code>.fileupload-exists</code> class if an existing file is present. Elements inside the container with the <code>.fileupload-new</code> and <code>.fileupload-exists</code>
+          classes will be shown or hidden based on the current state. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear
+          the file with <code>data-dismiss="fileupload"</code>.</p>
 
-        <p>Via JavaScript</p>
+        <h3>Via JavaScript</h3>
         <pre class="prettyprint linenums">$('.fileupload').fileupload()</pre>
 
         <h3>Layout</h3>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b8ce260b..1acaf2ce 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1964,13 +1964,11 @@ $('.carousel').carousel({
 
         <h2>{{_i}}Usage{{/i}}</h2>
         <h3>{{_i}}Via data attributes{{/i}}</h3>
-        <p>{{_i}}Add data attributes to register the file upload widget. The main container should either have the <code>.fileupload-new</code> class for a new record or if the record
-          does not have file or <code>.fileupload-exists</code> if an existing file is present. Elements inside the container with the <code>.fileupload-new</code> and <code>.fileupload-exists</code>
-          class will be shown or hidden based on the current state. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear
-          the file with <code>data-dismiss="fileupload"</code>. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear the file with
-          <code>data-dismiss="fileupload"</code>.{{/i}}</p>
+        <p>{{_i}}Add data attributes to register the file upload widget. The main container should either have the <code>.fileupload-new</code> class for a new record (one with no file yet specified) or the <code>.fileupload-exists</code> class if an existing file is present. Elements inside the container with the <code>.fileupload-new</code> and <code>.fileupload-exists</code>
+          classes will be shown or hidden based on the current state. The content of <code>.fileupload-preview</code> is replaced when a file is selected. Implement a button to clear
+          the file with <code>data-dismiss="fileupload"</code>.{{/i}}</p>
 
-        <p>{{_i}}Via JavaScript{{/i}}</p>
+        <h3>{{_i}}Via JavaScript{{/i}}</h3>
         <pre class="prettyprint linenums">$('.fileupload').fileupload()</pre>
 
         <h3>Layout</h3>