From: Oleg Broytman <phd@phdru.name>
Date: Wed, 9 Sep 2015 20:13:46 +0000 (+0300)
Subject: Change wording
X-Git-Url: https://git.phdru.name/?p=git-wiki.git;a=commitdiff_plain;h=dc2077abaca44e962f57e2f5424bb6c8f7403379

Change wording
---

diff --git a/pep-git.txt b/pep-git.txt
index 1c78dd4..acc45f3 100644
--- a/pep-git.txt
+++ b/pep-git.txt
@@ -846,23 +846,23 @@ be configured to allow access with great granularity; gitolite is
 written in Perl and has a lot of documentation.
 
 Web interface to browse repositories can be created using `gitweb
-<https://git.kernel.org/cgit/git/git.git/tree/gitweb>`_ and `cgit
+<https://git.kernel.org/cgit/git/git.git/tree/gitweb>`_ or `cgit
 <http://git.zx2c4.com/cgit/about/>`_. Both are CGI scripts (written in
 Perl and C). In addition to web interface both provide read-only dumb
 http access for git (http(s):// URLs).
 
 There are also more advanced web-based development environments that
-include ability to manage users, groups and projects; private, group
-and public repositories; they often include issue trackers, wiki
-pages, pull requests and other tools for development and
-communication. Among these environments are `Kallithea
+include ability to manage users, groups and projects; private,
+group-accessible and public repositories; they often include issue
+trackers, wiki pages, pull requests and other tools for development
+and communication. Among these environments are `Kallithea
 <https://kallithea-scm.org/>`_ and `pagure <https://pagure.io/>`_,
 both are written in Python; pagure was written by Fedora developers
 and is being used to develop some Fedora projects. `Gogs
 <http://gogs.io/>`_ is written in Go; there is a fork `Gitea
 <http://gitea.io/>`_.
 
-And last but not least `Gitlab <https://about.gitlab.com/>`_. It's
+And last but not least, `Gitlab <https://about.gitlab.com/>`_. It's
 perhaps the most advanced web-based development environment for git.
 Written in Ruby, community edition is free and open source (MIT
 license).
@@ -872,14 +872,14 @@ From Mercurial to git
 =====================
 
 There are many tools to convert Mercurial repositories to git. The
-most famous are, perhaps, `hg-git <https://hg-git.github.io/>`_ and
+most famous are, probably, `hg-git <https://hg-git.github.io/>`_ and
 `fast-export <http://repo.or.cz/w/fast-export.git>`_ (many years ago
 it was known under the name ``hg2git``).
 
 But a better tool, perhaps the best, is `git-remote-hg
 <https://github.com/felipec/git-remote-hg>`_. It provides transparent
 bidirectional access (pull and push) to Mercurial repositories from
-git. The author wrote a `comparison of alternatives
+git. Its author wrote a `comparison of alternatives
 <https://github.com/felipec/git/wiki/Comparison-of-git-remote-hg-alternatives>`_
 that seems to be mostly unbiased.