Skip to content

Commit b67c1bc

Browse files
heathermillerheathermiller
committed
Merge branch 'master' of github.com:scala/scala.github.com
2 parents 706503b + ff48f07 commit b67c1bc

30 files changed

+242
-279
lines changed

‎_includes/sidebar-toc-glossary.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ <h5 class="contents">Terms</h5>
55
<div id="toc"></div>
66
</div>
77
<hr>
8-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
8+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
99
</div>
1010
</div>

‎_includes/sidebar-toc-multipage-overview.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ <h5 class="contents">Contents</h5>
4646
{% endif %}
4747
</div>
4848
<hr>
49-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
49+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
5050
</div>
5151
</div>

‎_includes/sidebar-toc-singlepage-overview.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ <h5 class="contents">Contents</h5>
2626
{% endif %}
2727
</div>
2828
<hr>
29-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
29+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
3030
</div>
3131
</div>

‎_includes/sidebar-toc-style.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
5252
{% endif %}
5353
</div>
5454
<hr>
55-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
55+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
5656
</div>
5757
</div>
5858
{% endif %}

‎_includes/sidebar-toc-tour-overview.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ <h5 class="contents">Contents</h5>
4444
{% endif %}
4545
</div>
4646
<hr>
47-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
47+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
4848
</div>
4949
</div>

‎_includes/sidebar-toc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h5 class="contents">Contents</h5>
5252
{% endif %}
5353
</div>
5454
<hr>
55-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
55+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
5656
</div>
5757
</div>
5858
{% endif %}

‎_includes/tutorial-toc.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ <h5>Contents</h5>
2424
{% include tutorial-tour-list.txt %}
2525
</div>
2626
<hr>
27-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
27+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
2828
</div>
2929
</div>

‎_layouts/sip.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ <h5 class="contents">SIP Contents</h5>
2626
<div id="toc"></div>
2727
</div>
2828
<hr>
29-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
29+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
3030
</div>
3131
</div>
3232

‎_layouts/sips.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ <h5 class="contents" style="margin-bottom: 0;">Writing a SIP</h5>
4040
<li><a href="{{ site.baseurl }}/sips/sip-submission.html">Submitting a SIP</a></li>
4141
<li><a href="{{ site.baseurl }}/sips/sip-tutorial.html">Tutorial: Writing a SIP</a></li>
4242
</ul>
43-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{{ page.relative_path }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
43+
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/master/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
4444
</div>
4545
</div>
4646

‎_overviews/FAQ/finding-symbols.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ supertypes (`AnyRef` or `Any`) or a type parameter. In this case, we find
163163
avaialable on all types.
164164

165165
Other implicit conversions may be visible in your scope depending on imports, extended types or
166-
self-type annotations. See [Finding implicits](tutorials/FAQ/finding-implicits.html) for details.
166+
self-type annotations. See [Finding implicits](finding-implicits.html) for details.
167167

168168
Syntactic sugars/composition
169169
-----------------------------

0 commit comments

Comments
 (0)