Skip to content

Commit 82eb1dd

Browse files
authored
Merge pull request #1173 from bloomberg/fix_1170_set_as_combination
fix combination of bs.set bs.as
2 parents 532a9d7 + aab18e0 commit 82eb1dd

File tree

10 files changed

+1131
-1065
lines changed

10 files changed

+1131
-1065
lines changed

docs/Manual.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,7 +1608,7 @@ <h4 id="_binding_to_method_bs_send_bs_send_pipe"><a class="anchor" href="#_bindi
16081608
</div>
16091609
</div>
16101610
<div class="paragraph">
1611-
<p><code>bs.pipe.send</code> is similar to <code>bs.send</code> except that the first argument, i.e, the object,
1611+
<p><code>bs.send.pipe</code> is similar to <code>bs.send</code> except that the first argument, i.e, the object,
16121612
is put in the position of last argument to help user write in a <em>chaining style</em>:</p>
16131613
</div>
16141614
<div class="listingblock">
@@ -4008,7 +4008,7 @@ <h4 id="_build_with_other_bucklescript_dependencies"><a class="anchor" href="#_b
40084008
<span class="tok-s2">&quot;sources&quot;</span><span class="tok-o">:</span> <span class="tok-p">[</span>
40094009
<span class="tok-p">..</span> <span class="tok-p">.</span>
40104010
<span class="tok-p">],</span>
4011-
<span class="tok-s2">&quot;generate-merlin&quot;</span> <span class="tok-o">:</span> <span class="tok-kc">true</span> <b class="conum">(2)</b>
4011+
<span class="tok-s2">&quot;generate-merlin&quot;</span> <span class="tok-o">:</span> <span class="tok-kc">false</span> <b class="conum">(2)</b>
40124012
<span class="tok-p">}</span></code></pre>
40134013
</div>
40144014
</div>
@@ -4018,7 +4018,7 @@ <h4 id="_build_with_other_bucklescript_dependencies"><a class="anchor" href="#_b
40184018
<p>Yet another BuckleScript dependency</p>
40194019
</li>
40204020
<li>
4021-
<p>bsb will generate merlin file for you</p>
4021+
<p>if true (default) bsb will generate merlin file for you</p>
40224022
</li>
40234023
</ol>
40244024
</div>

0 commit comments

Comments
 (0)