From fb78905c6a344d1674387a3a24cb9bfc5c2f0322 Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Tue, 26 Mar 2013 08:58:55 -0700
Subject: [PATCH] fix val() description in the docs. fixes #1091

---
 index.html          | 5 ++---
 select2-latest.html | 3 ++-
 select2-master      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index cfdbe97d..33c682d7 100644
--- a/index.html
+++ b/index.html
@@ -1469,15 +1469,14 @@ $("#select").select2({
       </table>
         <p><code>val</code> method invoked on a single-select with an unset value will return <code>""</code>, while a <code>val</code> method invoked on an empty multi-select will return <code>[]</code></p>
 
-        Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
+        Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", "CA"});</pre>
+        <p class="alert alert-info">Notice that in order to use this method you must define the <code>initSelection</code> function in the options so Select2 knows how to transform the id of the object you pass in <code>val()</code> to the full object it needs to render selection. If you are attaching to a <code>select</code> element this function is already provided for you.</p>
 
         <div class="row">
             <div class="span12"><h3>data</h3></div>
         </div>
         <p>Gets or sets the selection. Analogous to <code>val</code> method, but works with objects instead of ids.</p>
         <p><code>data</code> method invoked on a single-select with an unset value will return <code>null</code>, while a <code>data</code> method invoked on an empty multi-select will return <code>[]</code></p>
-
-
     <div class="row">
         <div class="span12"><h3>destroy</h3></div>
     </div>
diff --git a/select2-latest.html b/select2-latest.html
index a1ee4a79..e20460ed 100644
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -1527,7 +1527,8 @@ $("#select").select2({
       </table>
         <p><code>val</code> method invoked on a single-select with an unset value will return <code>""</code>, while a <code>val</code> method invoked on an empty multi-select will return <code>[]</code></p>
 
-        Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
+        Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", "CA"});</pre>
+        <p class="alert alert-info">Notice that in order to use this method you must define the <code>initSelection</code> function in the options so Select2 knows how to transform the id of the object you pass in <code>val()</code> to the full object it needs to render selection. If you are attaching to a <code>select</code> element this function is already provided for you.</p>
 
         <div class="row">
             <div class="span12"><h3>data</h3></div>
diff --git a/select2-master b/select2-master
index 5782e07f..f9f76d8b 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 5782e07ff8da2700ceffd3db64a20846be21453d
+Subproject commit f9f76d8b4c72605baa937e3749f25187f0cce17f