X-Git-Url: https://git.phdru.name/?p=git-wiki.git;a=blobdiff_plain;f=pep-103.txt;h=867784cf7d9a0fb4a5aa0574b67e45c159a4bf9a;hp=ae0e031cbd9936c27317b9c535b1d1c7a1d9fb39;hb=6f76777b0bb5c0850ebb82644cec24f2f890cda8;hpb=6c79765cc3563e74958aa6e8008eb2c63f951c17

diff --git a/pep-103.txt b/pep-103.txt
index ae0e031..867784c 100644
--- a/pep-103.txt
+++ b/pep-103.txt
@@ -85,8 +85,8 @@ Microsoft Windows: download `git-for-windows
 <https://github.com/git-for-windows/git/releases>`_.
 
 MacOS X: use git installed with `XCode
-<https://developer.apple.com/xcode/downloads/>`_ or download from
-`MacPorts <https://www.macports.org/ports.php?by=name&substr=git>`_ or
+<https://developer.apple.com/xcode/>`_ or download from `MacPorts
+<https://www.macports.org/ports.php?by=name&substr=git>`_ or
 `git-osx-installer
 <http://sourceforge.net/projects/git-osx-installer/files/>`_ or
 install git with `Homebrew <http://brew.sh/>`_: ``brew install git``.
@@ -440,7 +440,7 @@ Read `how to recover from upstream rebase
 <https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase>`_.
 It is in ``git help rebase``.
 
-On the other hand don't be too afraid about commit editing. You can
+On the other hand, don't be too afraid about commit editing. You can
 safely edit, reorder, remove, combine and split commits that haven't
 been pushed yet. You can even push commits to your own (backup) repo,
 edit them later and force-push edited commits to replace what have
@@ -971,8 +971,8 @@ both are written in Python; pagure was written by Fedora developers
 and is being used to develop some Fedora projects. `GitPrep
 <http://gitprep.yukikimoto.com/>`_ is yet another Github clone,
 written in Perl. `Gogs <https://gogs.io/>`_ is written in Go.
-`GitBucket <https://takezoe.github.io/gitbucket/about/>`_ is written
-in Scala.
+`GitBucket <https://gitbucket.github.io/gitbucket-news/about/>`_ is
+written in Scala.
 
 And last but not least, `Gitlab <https://about.gitlab.com/>`_. It's
 perhaps the most advanced web-based development environment for git.
@@ -1008,7 +1008,7 @@ To work with the repository just use regular git commands including
 
 To start converting your Mercurial habits to git see the page
 `Mercurial for Git users
-<https://mercurial.selenic.com/wiki/GitConcepts>`_ at Mercurial wiki.
+<https://www.mercurial-scm.org/wiki/GitConcepts>`_ at Mercurial wiki.
 At the second half of the page there is a table that lists
 corresponding Mercurial and git commands. Should work perfectly in
 both directions.