Skip to content

Commit

Permalink
updating CONTRIBUTING to reflect keeping index.html up to date with m…
Browse files Browse the repository at this point in the history
…aster
  • Loading branch information
philfreo committed Jan 8, 2013
1 parent 22b2398 commit e14c433
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 3 deletions.
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Expand Up @@ -2,8 +2,10 @@

* Before you open a ticket or send a pull request, [search](https://github.com/documentcloud/backbone/issues) for previous discussions about the same feature or issue. Add to the earlier ticket if you find one.

* Before sending a pull request for a feature, be sure to have [tests](http://backbonejs.org/test/test.html).
* Before sending a pull request for a feature or bug fix, be sure to have [tests](http://backbonejs.org/test/test.html).

* If your pull request affects Backbone's public API, make relevant changes to the [documentation](https://github.com/documentcloud/backbone/blob/master/index.html). If appropriate, also add a line in the "Change Log" section.

This comment has been minimized.

Copy link
@tgriesser

tgriesser Jan 8, 2013

I'm not sure about requiring pull requests to have changes to the docs, that could be taken care of after they're merged. I think just taking out the part below about not adding documentation would be enough (but that's just my opinion).


* Use the same coding style as the rest of the [codebase](https://github.com/documentcloud/backbone/blob/master/backbone.js).

* In your pull request, do not add documentation or re-build the minified `backbone-min.js` file. We'll do those things before cutting a new release.
* In your pull request, do not re-build the minified `backbone-min.js` file. We'll do that before cutting a new release.
23 changes: 22 additions & 1 deletion index.html
Expand Up @@ -613,7 +613,14 @@ <h2 id="introduction">Introduction</h2>
to execute them.
</p>

<h2 id="upgrading">Upgrading to 0.9.9</h2>
<h2 id="upgrading">Upgrading to Edge</h2>

<p>
You're reading the docs for an unreleased version. See the
<a href="#changelog">change log</a>.
</p>

<h2>Upgrading to 0.9.9</h2>

<p>
Backbone <b>0.9.9</b> should be considered as a release candidate
Expand Down Expand Up @@ -3824,6 +3831,20 @@ <h2 id="faq">F.A.Q.</h2>

<h2 id="changelog">Change Log</h2>

<b class="header">Edge</b> &mdash; <small><i>Not yet released</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.9...master">Diff</a><br />
<ul style="margin-top: 5px;">
<li>
Model validation is no longer enforced by default upon
construction or in Model#set.
Models can be constructed (and added to collections) even if
they fail validation now, unless <tt>{validate: true}</tt> is passed
</li>
<li>
<tt>View#make</tt> has been removed. You'll need to use <tt>$</tt> directly to
construct DOM elements now.
</li>
</ul>

This comment has been minimized.

Copy link
@tgriesser

tgriesser Jan 8, 2013

model.change() has also been removed, with the simplification of the set internals - I'd taken that out from the docs earlier (wasn't entirely clear about the no docs modification).

Any change[:attr] are also no longer delayed until later when silent:true is passed, they are just completely silenced.


<b class="header">0.9.9</b> &mdash; <small><i>Dec. 13, 2012</i></small> &mdash; <a href="https://github.com/documentcloud/backbone/compare/0.9.2...0.9.9">Diff</a><br />
<ul style="margin-top: 5px;">
<li>
Expand Down

0 comments on commit e14c433

Please sign in to comment.