Skip to content

Commit ac7ae1d

Browse files
committed
fix false URLs
1 parent c25dcfe commit ac7ae1d

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ image::images/gitlab-menu.png[The ``Admin area'' item in the GitLab menu.]
3939
Users in GitLab are accounts that correspond to people.
4040
User accounts don't have a lot of complexity; mainly it's a collection of personal information attached to login data.
4141
Each user account comes with a *namespace*, which is a logical grouping of projects that belong to that user.
42-
If the user +jane+ had a project named +project+, that project's url would be http://server/jane/project[].
42+
If the user +jane+ had a project named +project+, that project's url would be `http://server/jane/project`.
4343

4444
[[rgitlab_users]]
4545
.The GitLab user administration screen.
@@ -56,7 +56,7 @@ This is obviously a much more permanent and destructive action, and its uses are
5656
===== Groups
5757

5858
A GitLab group is an assemblage of projects, along with data about how users can access those projects.
59-
Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its url would be http://server/training/materials[].
59+
Each group has a project namespace (the same way that users do), so if the group +training+ has a project +materials+, its url would be `http://server/training/materials`.
6060

6161
[[rgitlab_groups]]
6262
.The GitLab group administration screen.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ We'll demonstrate setting up the Perforce Visual Merge Tool (P4Merge) to do your
239239
If you want to try this out, P4Merge works on all major platforms, so you should be able to do so.
240240
I'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.
241241

242-
To begin, download P4Merge from http://www.perforce.com/downloads/Perforce/[].
242+
To begin, https://www.perforce.com/product/components/perforce-visual-merge-and-diff-tools[download P4Merge from Perforce].
243243
Next, you'll set up external wrapper scripts to run your commands.
244244
I'll use the Mac path for the executable; in other systems, it will be where your `p4merge` binary is installed.
245245
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $ pip install mercurial
3434
(If you don't have Python installed, visit https://www.python.org/[] and get it first.)
3535

3636
The last thing you'll need is the Mercurial client.
37-
Go to http://mercurial.selenic.com/[] and install it if you haven't already.
37+
Go to https://www.mercurial-scm.org/[] and install it if you haven't already.
3838

3939
Now you're ready to rock.
4040
All you need is a Mercurial repository you can push to.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ Many other commands are available through the Git class, including but not limit
154154
This is only a small sampling of JGit's full capabilities.
155155
If you're interested and want to learn more, here's where to look for information and inspiration:
156156

157-
* The official JGit API documentation is available online at http://download.eclipse.org/jgit/docs/latest/apidocs[].
157+
* The official JGit API documentation is available online at https://www.eclipse.org/jgit/documentation[].
158158
These are standard Javadoc, so your favorite JVM IDE will be able to install them locally, as well.
159159
* The JGit Cookbook at https://github.com/centic9/jgit-cookbook[] has many examples of how to do specific tasks with JGit.
160-
* There are several good resources pointed out at http://stackoverflow.com/questions/6861881[].

0 commit comments

Comments
 (0)