From 2537b8b0dd35c810c133f5d8d858eaa0f64dc10d Mon Sep 17 00:00:00 2001
From: Igor Vaynberg <igor.vaynberg@gmail.com>
Date: Thu, 28 Jun 2012 02:32:37 -0700
Subject: [PATCH] doc hierarchical format. fixes #169

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

diff --git a/select2-latest.html b/select2-latest.html
index 06715bc5..4347acf2 100755
--- a/select2-latest.html
+++ b/select2-latest.html
@@ -979,13 +979,42 @@ $("#tags").select2({
                             <td>Callback function that should be called with the <code>result</code> object. The result object:
                                 <table class="table table-bordered table-striped">
                                     <tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
-                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> attribute is required</code>, even if custom renderers are used.</td></tr>
+                                    <tr><td>result.results</td><td>[object]</td><td>Array of result objects. The default renderers expect objects with <code>id</code> and <code>text</code> keys</code>. The <code>id</code> attribute is required</code>, even if custom renderers are used. The object may also contain a <code>children</code>key if hierarchical data is displayed.</td></tr>
                                     <tr><td>result.more</td><td>boolean</td><td><code>true</code>if more results are available for the current search term</td></tr>
                                     <tr><td>results.context</td><td>object</td><td>A user-defined object that should be made available as the <code>context</code> parameter to the <code>query</code> function on subsequent queries to load more result pages for the same search term. See the description of <a href="#doc-query-options-context">options.context</code></a> parameter.</td></tr>
                                 </table>
                             </td></tr>
                     </table>
                     <p class="alert alert-warning">In order for this function to work Select2 should be attached to a <code>input type='hidden'</code> tag instead of a <code>select</code>.</p>
+                    <p>
+                        <h4>Example Data</h4>
+                        <pre>
+{
+     more: false,
+     results: [
+        { id: "CA", text: "California" },
+        { id: "AL", text: "Alabama" }
+     ]
+}
+                        </pre>
+                    </p>
+                    <p>
+                        <h4>Example Hierarchical Data</h4>
+                        <pre>
+{
+    more: false,
+    results: [
+        { text: "Western", children: [
+            { id: "CA", text: "California" },
+            { id: "AZ", text: "Arizona" }
+        ] },
+        { text: "Eastern", children: [
+            { id: "FL", text: "Florida" }
+        ] }
+    ]
+}
+                        </pre>
+                    </p>
                 </td>
             </tr>
             <tr><td>ajax</td><td>object</td><td>
diff --git a/select2-master b/select2-master
index 45442aa8..89ee75dd 160000
--- a/select2-master
+++ b/select2-master
@@ -1 +1 @@
-Subproject commit 45442aa8d7a4aabb62733f22d28ec0a72cee786f
+Subproject commit 89ee75dd9d809d5bec923109330f6b6b6517aca1