Read about our upcoming Code of Conduct on this issue

Commit 5e0fba3a authored by Marcin Kasperski's avatar Marcin Kasperski
Browse files

merge

......@@ -22,7 +22,6 @@ extension glues it to Mercurial.
.. sectnum::
.. _keyring: http://pypi.python.org/pypi/keyring
.. _Mercurial: http://mercurial.selenic.com
How does it work
=======================================================
......@@ -376,7 +375,7 @@ install some missing tool, or library, and reinstall keyring.
Note also, that recent versions of keyring library (since version 12) use Python
entrypoints to find available backends. Those are incompatible with
some binary packaging methods (like ``py2app``) and may cause
problems. In particular there were packaged installations of TortoiseHG
problems. In particular there were packaged installations of TortoiseHG_
which were unable to load keyring backends. See `#61 <https://foss.heptapod.net/mercurial/mercurial_keyring/issues/61/tortoisehg-encounters-unknown-exception>`_ for some more details.
......@@ -386,7 +385,7 @@ Only if this doesn't help, there may be a bug in mercurial_keyring.
By far easiest way to have properly working keyring is to use packaged
binary version (like ``python-keyring`` Ubuntu package, or keyring
bundled with TortoiseHG on some systems). If you pip-installed keyring
bundled with TortoiseHG_ on some systems). If you pip-installed keyring
and it doesn't work, you may consider removing it via ``pip uninstall
keyring`` and looking for binary package instead.
......@@ -415,7 +414,7 @@ Additional notes
=======================================================
Information about this extension is also available
on Mercurial Wiki: http://mercurial.selenic.com/wiki/KeyringExtension
on Mercurial Wiki: https://www.mercurial-scm.org/wiki/KeyringExtension
Check also `other Mercurial extensions I wrote`_.
......@@ -425,7 +424,7 @@ Check also `other Mercurial extensions I wrote`_.
.. _other Mercurial extensions I wrote: http://code.mekk.waw.pl/mercurial.html
.. _HISTORY.rst: https://foss.heptapod.net/mercurial/mercurial_keyring/src/tip/HISTORY.rst
.. _TortoiseHg: http://tortoisehg.bitbucket.org/
.. _Mercurial: http://mercurial.selenic.com
.. _TortoiseHg: https://foss.heptapod.net/mercurial/tortoisehg/thg
.. _Mercurial: https://www.mercurial-scm.org/
.. _mercurial_extension_utils: https://foss.heptapod.net/mercurial/mercurial-extension_utils/
.. _Path Pattern: https://foss.heptapod.net/mercurial/mercurial-path_pattern/
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment