Skip to content

Commit

Permalink
Merge branch 'dev-master' into dev-3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
okuryu committed Aug 28, 2014
2 parents 157e5b6 + 06b25a4 commit 9d14e3f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/button/docs/index.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ YUI().use('button-group', function(Y){

<div id="buttongroup">
<h3>use('button-group')</h3>
<p>`Y.ButtonGroup` is a constructor that is used to generate widgets containing a group of buttons. To avoid widgets inside of widgets, this class is built on top of `Y.ButtonCore`, not `Y.Button`</p>
<p>`Y.ButtonGroup` is a constructor that is used to generate widgets containing a group of buttons.</p>
</div>


Expand Down Expand Up @@ -212,7 +212,7 @@ YUI().use('button-group', function(Y){
</table>

<h4>Y.ButtonGroup</h4>
<p>In addition to the inherited `Y.ButtonCore` attributes...</p>
<p>In addition to the inherited `Y.Widget` attributes...</p>
<table>
<thead>
<tr>
Expand Down Expand Up @@ -298,7 +298,7 @@ YUI().use('button-group', function(Y){
</table>

<h4>Y.ButtonGroup</h4>
<p>In addition to the inherited `Y.ButtonCore` events...</p>
<p>In addition to the inherited `Y.Widget` events...</p>
<table>
<thead>
<tr>
Expand Down

0 comments on commit 9d14e3f

Please sign in to comment.