Merge pull request #6 from progit/fix_compilation

Fix compilation errors

Author: jnavila

book/04-git-server/sections/gitlab.asc

@@ -39,7 +39,7 @@ image::images/gitlab-menu.png[The ``Admin area'' item in the GitLab menu.]
 Uporabniki v GitLab-u so računi, ki se ujemajo z ljudmi.
 Uporabniški računi nimajo veliko kompleksnosti; v celoti je zbirka osebnih informacij, pripetih k prijavnim podatkom.
 Vsak uporabniški račun prihaja z *imenskim prostorom*, kar je logično grupiranje projektov, ki pripadajo temu uporabniku.
-Če ima uporabnik +jane+ projekt imenovan +projekt+, je url projekta http://server/jane/project[].
+Če ima uporabnik +jane+ projekt imenovan +projekt+, je url projekta `http://server/jane/project`.
 
 [[rgitlab_users]]
 .The GitLab user administration screen.
@@ -56,7 +56,7 @@ To je očitno veliko bolj dokončna in destruktivna akcija in njene uporabe so r
 ===== Skupine
 
 GitLab skupina je montaža projektov skupaj s podatki o tem, kako lahko uporabniki dostopajo do teh projektov.
-Vsaka skupina ima imenski prostor projekta (enak način, kakor to delajo uporabniki), torej če ima skupina +training+ projekt +materials+, bi bil njen url http://server/training/materials[].
+Vsaka skupina ima imenski prostor projekta (enak način, kakor to delajo uporabniki), torej če ima skupina +training+ projekt +materials+, bi bil njen url `http://server/training/materials`.
 
 [[rgitlab_groups]]
 .The GitLab group administration screen.

book/08-customizing-git/sections/config.asc

@@ -240,7 +240,7 @@ We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your
 If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
 We'll use path names in the examples that work on Mac and Linux systems; for Windows, you'll have to change `/usr/local/bin` to an executable path in your environment.
 
-To begin, download P4Merge from http://www.perforce.com/downloads/Perforce/[].
+To begin, download P4Merge from https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools[download P4Merge from Perforce].
 Next, you'll set up external wrapper scripts to run your commands.
 We'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
 Set up a merge wrapper script named `extMerge` that calls your binary with all the arguments provided:

book/09-git-and-other-scms/sections/client-hg.asc

@@ -34,7 +34,7 @@ $ pip install mercurial
 (If you don't have Python installed, visit https://www.python.org/[] and get it first.)
 
 The last thing you'll need is the Mercurial client.
-Go to http://mercurial.selenic.com/[] and install it if you haven't already.
+Go to https://mercurial-scm.org/[] and install it if you haven't already.
 
 Now you're ready to rock.
 All you need is a Mercurial repository you can push to.

book/B-embedding-git/sections/jgit.asc

@@ -156,7 +156,6 @@ Mnogi ostali ukazi so na voljo preko razreda Git, vključno vendar ne omejeno na
 To je samo majhen primer JGit-ove polne zmožnosti.
 Če vas zanima in želite izvedeti več, poglejte tu za informacije in inspiracijo:
 
-* Uradna JGit API dokumentacija je na voljo na spletu na http://download.eclipse.org/jgit/docs/latest/apidocs[].
+* Uradna JGit API dokumentacija je na voljo na spletu na https://www.eclipse.org/jgit/documentation[].
   To so standardni Javadoc, tako da vaš priljubljeni JVM IDE jih bo tudi zmožen namestiti lokalno.
 * JGit knjiga receptov na https://github.com/centic9/jgit-cookbook[] ima mnoge primere, kako narediti določena opravila z JGit-om.
-* Na voljo je nekaj dobrih virov, ki so prikazani na http://stackoverflow.com/questions/6861881[].