Commits

Anonymous committed 8c5082d

remote, subrepositories, tasks: small grammar corrections

  • Participants
  • Parent commits a60ea94

Comments (0)

Files changed (5)

File src/basic/index.txt

 
    $ hg commit -m "First version of hello"## -d "2010-03-10 20:10:05"
 
-No output indicates success --- Mercurial wont interrupt you unless
+No output indicates success --- Mercurial won't interrupt you unless
 necessary.
 
 Inspecting History

File src/hgsubversion/index.txt

 
    $ hg clone https://hgsubversion.googlecode.com/hg/ hgsubversion
 
-You can leave out the version number if you want the very latest
-version, the version number shown above is the one used for this
-guide. Now put::
+Now put::
 
    [extensions]
    hgsubversion = path/to/hgsubversion

File src/remote/index.txt

 * SSH: the secure shell protocol used on many Unix systems.
 
   If you already have an account on a server with Mercurial installed,
-  then using SSH is the easiest way to close a repository. It is
-  possible to setup an account with a restricted account so that users
+  then using SSH is the easiest way to clone a repository. It is
+  possible to setup an account with a restricted access so that users
   can only execute Mercurial-related commands do not get a full login
   shell.
 
    date:        Sat Jan 22 10:00:00 2011 +0000
    summary:     Add comma
 
-She wont be able to push her changeset to the server since she does
+She won't be able to push her changeset to the server since she does
 not have write access to this particular repository.
 
 
    remote: ssl required
    updating 61c1daa1d929 to public failed!
 
-What happens is that Mercurial's webserver wont let you push over
+What happens is that Mercurial's webserver won't let you push over
 plain HTTP by default, it requires you to use a HTTPS URL. Alice can
 disable this requirement by using ``--config web.push_ssl=No`` on the
 command line when she serves the repository. She first kills the old
 
 The `keyring extension`_ will hook into Mercurial and intercept
 password requests. The passwords you enter a then stored securely in
-an OS-specific password database and you wont have to enter them
+an OS-specific password database and you won't have to enter them
 again. It stores passwords used for HTTP(S) authentication and SMTP
 authentication (as done by the `patchbomb extension`_ among others).
 
 
    Notice how you can push changesets into an empty repository. This
    is because you can expand a `hg clone` to `hg init` followed by `hg
-   pull` (except that you wont get hardlinks as described above).
+   pull` (except that you won't get hardlinks as described above).
 
    What happens if you try to push from your ``hello`` clone to your
    ``test`` clone on Bitbucket? How does Mercurial know if the

File src/subrepositories/index.txt

 Introduction
 ============
 
-Mercurial has a features called subrepositories. This feature allows
+Mercurial has a feature called subrepositories. This feature allows
 you to treat a collection of repositories as a group.
 
 Reusing code is an important concept of software architecture.
 option to recurse down into the subrepositories.
 
 When executing a command within the working directory of a
-subrepository. Then the behavior will be exactly the same as if it
+subrepository, then the behavior will be exactly the same as if it
 wasn't a subrepository, so a subrepository doesn't "know" it is within
 another repository.
 
    ``where/to/get/the/subrepo``.
 
    In the simple case where you have 'subrepo = subrepo', you end up
-   with Mercurial doing these commands
+   with Mercurial doing these commands:
 
    .. shelltest::
 
       $$ cd ..
 
    and if you had used ``subrepo = ../subrepo``, then the commands
-   would be
+   would be:
 
    .. shelltest::
 
       $$ cd ..
 
    where the last URL is the normalization version of
-   ``http://server/repos/repo/../subrepo``
+   ``http://server/repos/repo/../subrepo``.
 
 
 Remote Subrepositories
    $ echo svnrepo = [svn]http://mercurial.aragost.com/svn/hello1/trunk >> .hgsub
 
 Then SVN commands should be used within the subrepository and
-mercurial commands in the super repository.
+Mercurial commands in the super repository.
 
 Working with Subrepositories
 ============================
 subrepository. We realize that we want to link the main repository
 with an earlier version of the subrepository. This is done by updating
 the subrepository to the wanted revision and then performing a commit
-from the main repository, Again to update and commit the
+from the main repository again to update and commit the
 ``.hgsubstate`` file.
 
 .. shelltest::
 loose our precious history of these files.
 
 The way to do it, is by converting a folder into a repository, using
-the convert extension and then include this repository as a
+the `convert extension`_ and then include this repository as a
 subrepository in the different projects.
 
-.. _convert extension: http://mercurial/wiki/...
+.. _convert extension: http://mercurial.selenic.com/wiki/ConvertExtension
 
-This first part below, just creates our folder and makes and commits
-some changes to its contents.
+This first part below, just creates our folder. makes some changes and commits
+its contents.
 
 .. shelltest::
    :name: alice
 
 Now we want to make the folder into a subrepository. First we just
 make the folder into an repository. This is done by converting the
-original repository from a mercurial repository to a mercurial
+original repository from a Mercurial repository to a Mercurial
 repository and then using a filemap to specify we only want the
 certain folder.
 
 in the root directory of the repository we create. Then we perform the
 conversion, and see that we now have a repository containing only the
 changeset which edited in the file within the folder. This repository
-we can now include as a subrepository as previously described.
+we can now be included as a subrepository as previously described.
 
 .. shelltest::
    :name: alice

File src/tasks/index.txt

    The `--new-branch` flag was introduced in Mercurial 1.6. Older
    versions of Mercurial required you to use `--force` instead. The
    danger of using `--force` is that it disables all checks, whereas
-   `--new-branch` wont let you do things like pushing multiple heads.
+   `--new-branch` won't let you do things like pushing multiple heads.
 
 Sure enough, adding the flag makes the push go through:
 
 .. image:: carla-pull-issue-2.png
    :align: center
 
-Carla double-checks the files and is decides to merge his work now.
+Carla double-checks the files and decides to merge his work now.
 She updates to his branch to close it, and back to ``default`` to
 merge:
 
 the branches in sync help make the merges easier. On each merge,
 Mercurial will find the nearest common ancestor and apply the changes
 since that point. With periodic merges, this ancestor point will not
-lie too far in the past, and the branches wont have drifted too far
+lie too far in the past, and the branches won't have drifted too far
 away from each other.