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. 

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

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Curry-jevanje
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 9
 outof: 33
 language: ba
+
+next-page: pattern-matching
+previous-page: nested-functions
 ---
 
 Metode mogu definisati više lista parametara. 

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

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Podrazumijevane vrijednosti parametara
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 32
 outof: 33
 language: ba
+
+next-page: named-parameters
+previous-page: annotations
 ---
 
 Scala omogućuje davanje podrazumijevanih vrijednosti parametrima koje dozvoljavaju korisniku metode da izostavi te parametre.

ba/tutorials/tour/_posts/2017-02-13-default-parameter-values.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Eksplicitno tipizirane samo-reference
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 24
 outof: 33
 language: ba
+
+next-page: implicit-parameters
+previous-page: compound-types
 ---
 
 Kada se razvija proširiv softver ponekad je zgodno deklarisati tip vrijednosti `this` eksplicitno.  

ba/tutorials/tour/_posts/2017-02-13-explicitly-typed-self-references.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Ekstraktor objekti
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 15
 outof: 33
 language: ba
+
+next-page: sequence-comprehensions
+previous-page: regular-expression-patterns
 ---
 
 U Scali, uzorci (patterns) mogu biti definisani nezavisno od case klasa.

ba/tutorials/tour/_posts/2017-02-13-extractor-objects.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Generičke klase
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 17
 outof: 33
 language: ba
+
+next-page: variances
+previous-page: sequence-comprehensions
 ---
 
 Kao u Javi 5 ([JDK 1.5](http://java.sun.com/j2se/1.5/)), Scala ima ugrađenu podršku za klase parametrizovane tipovima.

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

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Funkcije višeg reda
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 7
 outof: 33
 language: ba
+
+next-page: nested-functions
+previous-page: anonymous-function-syntax
 ---
 
 Scala dozvoljava definisanje funkcija višeg reda.

ba/tutorials/tour/_posts/2017-02-13-higher-order-functions.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Implicitne konverzije
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 26
 outof: 33
 language: ba
+
+next-page: polymorphic-methods
+previous-page: implicit-parameters
 ---
 
 Implicitna konverzija iz tipa `S` u tip `T` je definisana kao implicitna vrijednost koja ima tip `S => T` (funkcija), 

ba/tutorials/tour/_posts/2017-02-13-implicit-conversions.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Implicitni parametri
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 25
 outof: 33
 language: ba
+
+next-page: implicit-conversions
+previous-page: explicitly-typed-self-references
 ---
 
 Metoda s _implicitnim parametrima_ može biti primijenjena na argumente kao i normalna metoda.

ba/tutorials/tour/_posts/2017-02-13-implicit-parameters.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Unutarnje klase
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 21
 outof: 33
 language: ba
+
+next-page: abstract-types
+previous-page: lower-type-bounds
 ---
 
 U Scali je moguće da klase imaju druge klase kao članove.

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

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Lokalno zaključivanje tipova (type inference)
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 28
 outof: 33
 language: ba
+
+next-page: operators
+previous-page: polymorphic-methods
 ---
 Scala ima ugrađen mehanizam zaključivanja tipova koji dozvoljava programeru da izostavi određene anotacije tipova.
 Često nije potrebno specificirati tip varijable u Scali,

ba/tutorials/tour/_posts/2017-02-13-local-type-inference.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Donja granica tipa
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 20
 outof: 33
 language: ba
+
+next-page: inner-classes
+previous-page: upper-type-bounds
 ---
 
 Dok [gornja granica tipa](upper-type-bounds.html) limitira tip na podtip nekog drugog tipa,

ba/tutorials/tour/_posts/2017-02-13-lower-type-bounds.md

@@ -2,13 +2,16 @@
 layout: inner-page-no-masthead
 title: Kompozicija mixin klasa
 
-disqus: true
+discourse: false
 
 tutorial: scala-tour
 categories: tour
 num: 5
 outof: 33
 language: ba
+
+next-page: anonymous-function-syntax
+previous-page: traits
 ---
 
 Nasuprot jezicima koji podržavaju samo _jednostruko nasljeđivanje_, Scala ima generalniji pojam ponovne upotrebe klasa.