3 files changed, 13 insertions, 1 deletions
diff --git a/share/www/database.html b/share/www/database.html
index 77172b0d..5a6f301f 100644
--- a/share/www/database.html
+++ b/share/www/database.html
@@ -118,7 +118,7 @@ specific language governing permissions and limitations under the License.
         <label>Select view: <select autocomplete="false">
           <option value="_all_docs">All documents</option>
           <option value="_design_docs">Design documents</option>
-          <option value="_temp_view">Custom query…</option>
+          <option value="_temp_view">Temporary view…</option>
         </select></label>
       </div>
       <ul id="toolbar">
@@ -151,6 +151,13 @@ specific language governing permissions and limitations under the License.
           <label>Language: <select id="language"></select></label>
         </div>
       </div>
+      <p id="tempwarn">
+        <strong>Warning</strong>: Please note that temporary views are not
+        suitable for use in production, as they are really slow for any
+        database with more than a few dozen documents. You can use a temporary
+        view to experiment with view functions, but switch to a permanent view
+        before using them in an application.
+      </p>
 
       <table id="documents" class="listing" cellspacing="0">
         <caption>Documents</caption>
diff --git a/share/www/script/futon.browse.js b/share/www/script/futon.browse.js
index f05e92d5..30cff66e 100644
--- a/share/www/script/futon.browse.js
+++ b/share/www/script/futon.browse.js
@@ -207,6 +207,9 @@
           );
         }
         page.populateLanguagesMenu();
+        if (this.isTempView) {
+          $("#tempwarn").show();
+        }
       }
 
       // Populate the languages dropdown, and listen to selection changes
diff --git a/share/www/style/layout.css b/share/www/style/layout.css
index b4d20322..0971c2ee 100644
--- a/share/www/style/layout.css
+++ b/share/www/style/layout.css
@@ -332,6 +332,8 @@ ul.suggest-dropdown li.selected { cursor: pointer; background: Highlight;
 #viewcode.collapsed .top span { background-position: 0 3px; }
 #viewcode.collapsed table, #viewcode.collapsed .bottom { display: none; }
 
+#tempwarn { display: none; font-size: 90%; margin: 0 2em 1.5em; }
+
 /* Database table */
 
 #databases thead th.size, #databases thead th.count, #databases thead th.seq,