From e2cc72105d10f0395799a7b955c78d2c5493ca20 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Mon, 13 Aug 2012 16:07:01 -0700
Subject: [PATCH] catch up to master and updated docs

---
 index.html          |  1 +
 select2-latest.html | 10 ++++++++++
 select2-master      |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index f5d39a92..4b99c4fa 100755
--- a/index.html
+++ b/index.html
@@ -875,6 +875,7 @@ $("#e18,#e18_2").select2();
                         only
                         available when the placeholder is specified.
                     </p>
+                    <p>This option only works when the placeholder is specified</p>
                     <p class="alert alert-warning">When attached to a <code>select</code> an <code>option</code> with an empty value must be provided.
                         This is the option that will be selected when the button is pressed since a select box requires
                         at least one selection <code>option</code>.</p>
diff --git a/select2-latest.html b/select2-latest.html
index e6dc8542..53b23b27 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -922,6 +922,7 @@ $("#e18,#e18_2").select2();
                         only
                         available when the placeholder is specified.
                     </p>
+                    <p>This option only works when the placeholder is specified</p>
                     <p class="alert alert-warning">When attached to a <code>select</code> an <code>option</code> with an empty value must be provided.
                         This is the option that will be selected when the button is pressed since a select box requires
                         at least one selection <code>option</code>.</p>
@@ -957,6 +958,15 @@ $("#e18,#e18_2").select2();
                     </p>
                 </td>
             </tr>
+            <tr>
+                <td>openOnEnter</td>
+                <td>boolean</td>
+                <td>
+                    <p>
+                        If set to true the dropdown is opened when the user presses the enter key and Select2 is closed. By default this option is enabled.
+                    </p>
+                </td>
+            </tr>
             <tr><td>id</td><td>function</td><td>
                    Function used to get the id from the choice object or a string representing the key under which the id is stored.
                    <pre>id(object)</pre>
diff --git a/select2-master b/select2-master
index 289226cf..816af442 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 289226cf6c925d7702336a5887a642750a016b58
+Subproject commit 816af4425b5dd867dd8378a96c107759054e5e49