diff -r 6b4b73ebb054 committing.rst --- a/committing.rst Thu Jul 14 07:53:11 2016 +0300 +++ b/committing.rst Fri Jul 15 13:23:17 2016 +0200 @@ -275,9 +275,9 @@ .. _Mercurial: http://www.hg-scm.org/ -.. _mq: http://mercurial.selenic.com/wiki/MqExtension -.. _rebase: http://mercurial.selenic.com/wiki/RebaseExtension -.. _collapse: http://mercurial.selenic.com/wiki/CollapseExtension +.. _mq: https://www.mercurial-scm.org/wiki/MqExtension +.. _rebase: https://www.mercurial-scm.org/wiki/RebaseExtension +.. _collapse: https://www.mercurial-scm.org/wiki/CollapseExtension Minimal Configuration @@ -340,7 +340,7 @@ .. _configuration file: http://www.selenic.com/mercurial/hgrc.5.html#files .. _extended diff format: http://www.selenic.com/mercurial/hg.1.html#diffs -.. _eol extension: http://mercurial.selenic.com/wiki/EolExtension +.. _eol extension: https://www.mercurial-scm.org/wiki/EolExtension .. _hooks repository: https://hg.python.org/hooks @@ -428,7 +428,7 @@ `, etc., see the :ref:`FAQs for core developers `. -.. _share extension: http://mercurial.selenic.com/wiki/ShareExtension +.. _share extension: https://www.mercurial-scm.org/wiki/ShareExtension Active branches @@ -598,7 +598,7 @@ Bitbucket_ also maintain an `up to date clone`_ of the main ``cpython`` repository that can be used as the basis for a new clone or patch queue. -.. _named branch: http://mercurial.selenic.com/wiki/NamedBranches +.. _named branch: https://www.mercurial-scm.org/wiki/NamedBranches .. _Bitbucket: http://www.bitbucket.org .. _up to date clone: https://bitbucket.org/mirror/cpython/overview diff -r 6b4b73ebb054 faq.rst --- a/faq.rst Thu Jul 14 07:53:11 2016 +0300 +++ b/faq.rst Fri Jul 15 13:23:17 2016 +0200 @@ -141,7 +141,7 @@ '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' Mercurial_'s (also known as ``hg``) official web site is at -http://mercurial.selenic.com/. A book on Mercurial published by +https://www.mercurial-scm.org/. A book on Mercurial published by `O'Reilly Media`_, `Mercurial: The Definitive Guide`_, is available for free online. Another resource is `Hg Init: a Mercurial tutorial`_ by Joel Spolsky. @@ -155,7 +155,7 @@ various commands, but doesn't provide any guidance on overall workflow. -.. _Mercurial: http://mercurial.selenic.com/ +.. _Mercurial: https://www.mercurial-scm.org/ .. _O'Reilly Media: http://www.oreilly.com/ .. _Mercurial\: The Definitive Guide: http://hgbook.red-bean.com/ .. _man page: http://www.selenic.com/mercurial/hg.1.html @@ -209,7 +209,7 @@ Host hg.python.org Compression yes -.. _download Mercurial: http://mercurial.selenic.com/downloads +.. _download Mercurial: https://www.mercurial-scm.org/downloads .. _OpenSSH: http://www.openssh.org/ @@ -353,7 +353,7 @@ The current branch in a working copy is "sticky": if you pull in some new changes, ``hg update`` will update to the head of the *current branch*. -.. _share extension: http://mercurial.selenic.com/wiki/ShareExtension +.. _share extension: https://www.mercurial-scm.org/wiki/ShareExtension .. _hg-paths: @@ -489,7 +489,7 @@ hg qdelete somework.patch .. _extended diff format: http://www.selenic.com/mercurial/hg.1.html#diffs -.. _mq: http://mercurial.selenic.com/wiki/MqExtension +.. _mq: https://www.mercurial-scm.org/wiki/MqExtension .. _merge-patch: @@ -660,7 +660,7 @@ Graphical tools, such as TortoiseHG, will display the changeset graph by default. -.. _graphlog: http://mercurial.selenic.com/wiki/GraphlogExtension +.. _graphlog: https://www.mercurial-scm.org/wiki/GraphlogExtension How do I update to a specific release tag? @@ -722,9 +722,9 @@ .. _man hgrc: http://www.selenic.com/mercurial/hgrc.5.html -.. _wiki: http://mercurial.selenic.com/wiki/ -.. _extensions: http://mercurial.selenic.com/wiki/UsingExtensions -.. _tips and tricks: http://mercurial.selenic.com/wiki/TipsAndTricks +.. _wiki: https://www.mercurial-scm.org/wiki/ +.. _extensions: https://www.mercurial-scm.org/wiki/UsingExtensions +.. _tips and tricks: https://www.mercurial-scm.org/wiki/TipsAndTricks .. _configuration options: http://www.selenic.com/mercurial/hgrc.5.html @@ -788,7 +788,7 @@ Mercurial will use KDiff3 automatically if it's installed and it can find it --- you don't need to change any settings. KDiff3 is also already included in the installer of TortoiseHg. For more information, see - http://mercurial.selenic.com/wiki/KDiff3. + https://www.mercurial-scm.org/wiki/KDiff3. .. _hg-null-merge: diff -r 6b4b73ebb054 gitdevs.rst --- a/gitdevs.rst Thu Jul 14 07:53:11 2016 +0300 +++ b/gitdevs.rst Fri Jul 15 13:23:17 2016 +0200 @@ -101,7 +101,7 @@ rather longer lived concepts like "release branches" (rel-1, rel-2, etc) and rather not for short lived work of single developers. - -- http://mercurial.selenic.com/wiki/Branch#Named_branches + -- https://www.mercurial-scm.org/wiki/Branch#Named_branches If you routinely create short-lived branches for development work and then @@ -189,10 +189,10 @@ Note that deleting a bookmark does not mean that the releated changesets are also deleted. You must use the `strip extension`_ to do that. Bookmarks can be published to a remote repo to be shared, but must explicitly be pushed (see -http://mercurial.selenic.com/wiki/Bookmarks#Working_with_remote_repositories +https://www.mercurial-scm.org/wiki/Bookmarks#Working_with_remote_repositories for details). -.. _`strip extension`: http://mercurial.selenic.com/wiki/StripExtension +.. _`strip extension`: https://www.mercurial-scm.org/wiki/StripExtension @@ -506,4 +506,4 @@ hg update issueB -.. _NamedBranches: http://mercurial.selenic.com/wiki/NamedBranches +.. _NamedBranches: https://www.mercurial-scm.org/wiki/NamedBranches