svn commit: r882636 - in /websites/staging/isis/trunk: cgi-bin/ content/ content/screenshot-tutorial.html

[bu...@apache.org]

Author: buildbot
Date: Mon Oct 14 23:49:56 2013
New Revision: 882636

Log:
Staging update by buildbot for isis

Modified:
    websites/staging/isis/trunk/cgi-bin/   (props changed)
    websites/staging/isis/trunk/content/   (props changed)
    websites/staging/isis/trunk/content/screenshot-tutorial.html

Propchange: websites/staging/isis/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 14 23:49:56 2013
@@ -1 +1 @@
-1532147
+1532148

Propchange: websites/staging/isis/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Oct 14 23:49:56 2013
@@ -1 +1 @@
-1532147
+1532148

Modified: websites/staging/isis/trunk/content/screenshot-tutorial.html
==============================================================================
--- websites/staging/isis/trunk/content/screenshot-tutorial.html (original)
+++ websites/staging/isis/trunk/content/screenshot-tutorial.html Mon Oct 14 23:49:56 2013
@@ -308,6 +308,15 @@
     <div class="bs-docs-section">
       <div class="page-header">
         <h1 id="js-overview">Overview</h1>
+        
+        <h3 id="js-individual-compiled">Individual or compiled</h3>
+        <p>Plugins can be included individually (using Bootstrap's individual <code>*.js</code> files), or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>).</p>
+
+        <div class="bs-callout bs-callout-danger">
+          <h4>Do not attempt to include both.</h4>
+          <p>Both <code>bootstrap.js</code> and <code>bootstrap.min.js</code> contain all plugins in a single file.</p>
+        </div>
+
       </div>
 
       <h3 id="js-individual-compiled">Individual or compiled</h3>