Merge remote-tracking branch 'upstream/master' into testmerge

Author: travissarles

README.md

@@ -3,6 +3,16 @@
 
 This repository contains the source for the Scala documentation website, as well as the source for "Scala Improvement Process" (SIP) documents.
 
+## Quickstart ##
+
+To build and view the site locally:
+
+    gem install bundler
+    bundle install
+    bundle exec jekyll serve -I
+
+For more details, read on.
+
 ## Contributing ##
 
 Please have a look at [http://docs.scala-lang.org/contribute.html](http://docs.scala-lang.org/contribute.html) before making a contribution.

_includes/discourse.html

@@ -0,0 +1,12 @@
+<div id='discourse-comments'></div>
+
+<script type="text/javascript">
+  DiscourseEmbed = { discourseUrl: 'http://users.scala-lang.org/',
+                     discourseEmbedUrl: 'http://docs.scala-lang.org/{{ page.url }}' };
+
+  (function() {
+    var d = document.createElement('script'); d.type = 'text/javascript'; d.async = true;
+    d.src = DiscourseEmbed.discourseUrl + 'javascripts/embed.js';
+    (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(d);
+  })();
+</script>

_includes/disqus.html

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Apstraktni tipovi
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 22
 outof: 33
 language: ba
+
+next-page: compound-types
+previous-page: inner-classes
 ---
 
 U Scali, klase su parameterizovane vrijednostima (parameteri konstruktora) i tipovima (ako su [generičke](generic-classes.html)).

ba/tutorials/tour/_posts/2017-02-13-abstract-types.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Anotacije
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 31
 outof: 33
 language: ba
+
+next-page: default-parameter-values
+previous-page: case-classes
 ---
 
 Anotacije pridružuju meta-informacije definicijama.

ba/tutorials/tour/_posts/2017-02-13-annotations.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Sintaksa anonimnih funkcija
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 6
 outof: 33
 language: ba
+
+next-page: higher-order-functions
+previous-page: mixin-class-composition
 ---
 
 Scala omogućuje relativno lahku sintaksu za definisanje anonimnih funkcija. Sljedeći izraz kreira funkciju za sljedbenike cijelih brojeva:

ba/tutorials/tour/_posts/2017-02-13-anonymous-function-syntax.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Automatska konstrukcija tipno zavisnih closura (zatvarajućih funkcija)
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 30
 outof: 33
 language: ba
+
+next-page: case-classes
+previous-page: operators
 ---
 
 Scala dozvoljava da se argument (ili više njih) metode ne evaluira prije samog poziva metode.

ba/tutorials/tour/_posts/2017-02-13-automatic-closures.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Case klase
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 30
 outof: 33
 language: ba
+
+next-page: annotations
+previous-page: automatic-closures
 ---
 
 Scala podržava tzv. _case klase_.

ba/tutorials/tour/_posts/2017-02-13-case-classes.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Klase
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 3
 outof: 33
 language: ba
+
+next-page: traits
+previous-page: unified-types
 ---
 
 Klase u Scali su statički šabloni koji mogu biti instancirani u više objekata tokom izvršavanja programa (runtime).

ba/tutorials/tour/_posts/2017-02-13-classes.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Složeni tipovi
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 23
 outof: 33
 language: ba
+
+next-page: explicitly-typed-self-references
+previous-page: abstract-types
 ---
 
 Ponekad je potrebno izraziti da je tip objekta podtip nekoliko drugih tipova.