Merge branch 'master' into firefox-amo

1 files changed, 11 insertions, 0 deletions

diff --git a/ext/bg/options.html b/ext/bg/options.html
index 939227b0..e6c5e8be 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -26,6 +26,10 @@
                 <h3>General Options</h3>
 
                 <div class="checkbox">
+                    <label><input type="checkbox" id="show-usage-guide"> Show usage guide on startup</label>
+                </div>
+
+                <div class="checkbox">
                     <label><input type="checkbox" id="group-terms-results"> Group term results</label>
                 </div>
 
@@ -193,6 +197,13 @@
                         <input type="text" id="interface-server" class="form-control">
                     </div>
 
+                    <p class="help-block">
+                        Specify the information you would like included in your flashcards in the field editor below.
+                        Please be aware that Anki requires the first field in the model to be unique. It is highly recommended
+                        that you set it to <code>{expression}</code> for term flashcards and <code>{character}</code> for
+                        Kanji flashcards.
+                    </p>
+
                     <div id="anki-format">
                         <ul class="nav nav-tabs">
                             <li class="active"><a href="#terms" data-toggle="tab">Terms</a></li>