--- a/docs/code_contributions.md Tue May 17 00:58:01 2022 -0500
+++ b/docs/code_contributions.md Wed May 18 02:19:34 2022 -0500
@@ -35,8 +35,8 @@
### Mercurial Configuration
This configuration for Mercurial is to make your life as a contributor easier.
-There a few different ways to configure Mercurial, but these instructions will-update your user specific configuration in `$HOME/.hgrc`.+There are a few different ways to configure Mercurial, but these instructions +will update your user specific configuration in `$HOME/.hgrc`. The first thing we need to do is to install the evolve extension. This
extension makes rewriting history safe and we use it extensively in our
--- a/docs/mercurial.md Tue May 17 00:58:01 2022 -0500
+++ b/docs/mercurial.md Wed May 18 02:19:34 2022 -0500
@@ -21,7 +21,7 @@
repositories are hosted in Mercurial at
[keep.imfreedom.org](https://keep.imfreedom.org/). To clone them you will be
using the command `hg clone <URL>`. The specific URL can be looked up in the
-table below depending what you are trying to clone.+table below depending on what you are trying to clone. > If you are trying to build Pidgin 3, you can just clone that repository and
> the build system will automatically clone the other repositories for you.
--- a/docs/repository-hosting.md Tue May 17 00:58:01 2022 -0500
+++ b/docs/repository-hosting.md Wed May 18 02:19:34 2022 -0500
@@ -20,12 +20,12 @@
-Once you have your own repository hosted somewhere, you're are going to need+Once you have your own repository hosted somewhere, you are going to need to be able to keep it in sync with the canonical repository. There are no tools
to do this automatically for you, but it's relatively painless with a few
-The following will work for any urls, but we're using the Instant Messaging+The following will work for any URLs, but we're using the Instant Messaging Freedom's HGKeeper instance as an example.
For this example, we're going to assume you have a copy of the Pidgin
@@ -59,7 +59,7 @@
This allows you to push to your copy of the repository by not specifying a
remote name at all. a simple `hg push` will now use the value from the
-`default-pushurl` which we set to your respository. This now means that the+`default-pushurl` which we set to your repository. This now means that the only time you need to specify a remote name, is when you want to pull commits
from your copy of the repository.
@@ -78,7 +78,7 @@
[ssh-agent](https://en.wikipedia.org/wiki/Ssh-agent) to avoid having to
constantly type your password.
-To interact with these repository is no different than any other. But you first+To interact with these repositories is no different than any other. But you first need to create them, which you can do via the `hg init` command. Say you want
to create a new pidgin repository in your name space. You can use the following
command to create the repository.
@@ -91,7 +91,7 @@
an existing clone to it by making sure you are in the check out directory and
typing `hg push ssh://keep.imfreedom.org/alice/pidgin`.
-To avoid typing the full SSH url everytime, be sure to check out the+To avoid typing the full SSH URL every time, be sure to check out the [Repository Management](#repository-management) section above.
## Sourcehut Repositories
@@ -107,10 +107,10 @@
Once you have an account, and have added an SSH key you can easily create your
own copy of any of the Instant Messaging Freedom repositories by just pushing
to them. For example, if your Sourcehut username is bob and your shell is
-currently in the an Instant Messaging Freedom related repository, you can type+currently in an Instant Messaging Freedom related repository, you can type `hg push ssh://hg@hg.sr.ht/~bob/pidgin` to push that repository up to
You can now use this repository just like any other, but to avoid typing the
-full SSH url everytime, be sure to check out the+full SSH URL every time, be sure to check out the [Repository Management](#repository-management) section above.
