Merge branch 'master' into gh-pages

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2023 Jeremy Ashkenas, DocumentCloud
+Copyright (c) 2010-2024 Jeremy Ashkenas, DocumentCloud
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

backbone.js

@@ -1,6 +1,6 @@
-//     Backbone.js 1.5.0
+//     Backbone.js 1.6.0
 
-//     (c) 2010-2023 Jeremy Ashkenas and DocumentCloud
+//     (c) 2010-2024 Jeremy Ashkenas and DocumentCloud
 //     Backbone may be freely distributed under the MIT license.
 //     For all details and documentation:
 //     http://backbonejs.org
@@ -44,7 +44,7 @@
   var slice = Array.prototype.slice;
 
   // Current version of the library. Keep in sync with `package.json`.
-  Backbone.VERSION = '1.5.0';
+  Backbone.VERSION = '1.6.0';
 
   // For Backbone's purposes, jQuery, Zepto, Ender, or My Library (kidding) owns
   // the `$` variable.

index.html

@@ -300,7 +300,7 @@
   <div id="sidebar" class="interface">
 
     <a class="toc_title" href="#">
-      Backbone.js <span class="version">(1.5.0)</span>
+      Backbone.js <span class="version">(1.6.0)</span>
     </a>
     <ul class="toc_section">
       <li>&raquo; <a href="http://github.com/jashkenas/backbone">GitHub Repository</a></li>
@@ -609,11 +609,11 @@ <h2 id="downloads">
 
     <table>
       <tr>
-        <td><a class="punch" href="backbone.js">Development Version (1.5.0)</a></td>
+        <td><a class="punch" href="backbone.js">Development Version (1.6.0)</a></td>
         <td class="text"><i>72kb, Full source, tons of comments</i></td>
       </tr>
       <tr>
-        <td><a class="punch" href="backbone-min.js">Production Version (1.5.0)</a></td>
+        <td><a class="punch" href="backbone-min.js">Production Version (1.6.0)</a></td>
         <td class="text" style="line-height: 16px;">
           <i>7.9kb, Packed and gzipped</i><br />
           <small>(<a href="backbone-min.map">Source Map</a>)</small>
@@ -4554,6 +4554,26 @@ <h2 id="examples-tzigla">Tzigla</h2>
 
     <h2 id="changelog">Change Log</h2>
 
+    <b class="header" id="1.6.0">1.6.0</b> &mdash; <small><i>Date TBD</i></small>
+    &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.5.0...1.6.0">Diff</a>
+    &mdash; <a href="https://cdn.statically.io/gh/jashkenas/backbone/1.6.0/index.html">Docs</a>
+    <br />
+    <ul style="margin-top: 5px;">
+      <li>
+        Added a <tt>notfound</tt> event to <tt>Backbone.history</tt> for when no
+        router matches the current URL.
+      </li>
+      <li>
+        Added the <tt>debugInfo</tt> function to make bug reports easier.
+      </li>
+      <li>
+        Fixed a corner case where a collection would forward <tt>error</tt> events twice if the model was first added through the <tt>create</tt> method with <tt>wait: true</tt>.
+      </li>
+      <li>
+        Added issue templates and other documentation improvements.
+      </li>
+    </ul>
+
     <b class="header" id="1.5.0">1.5.0</b> &mdash; <small><i>Jul. 28, 2023</i></small>
     &mdash; <a href="https://github.com/jashkenas/backbone/compare/1.4.1...1.5.0">Diff</a>
     &mdash; <a href="https://cdn.statically.io/gh/jashkenas/backbone/1.5.0/index.html">Docs</a>

package.json

@@ -42,7 +42,7 @@
     "prepublishOnly": "npm run test && npm run mark-release && npm run build && npm run alias-sourcemap && npm run doc && git add -u && npm run mark-develop"
   },
   "main": "backbone.js",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "license": "MIT",
   "repository": {
     "type": "git",