[DRE-commits] [ruby-policy] 01/01: small fixes

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-policy.

commit 174fe88ad9b8a09f7eab39795745f21f6e3f1c6f
Author: Francesco Poli (wintermute) <invernomuto at paranoici.org>
Date:   Tue Sep 10 23:36:07 2013 +0200

    small fixes
---
 ruby-policy.mdw |   25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ruby-policy.mdw b/ruby-policy.mdw
index 9fb8981..b73fc81 100644
--- a/ruby-policy.mdw
+++ b/ruby-policy.mdw
@@ -8,7 +8,7 @@ Background
 
 There are several “subpolicies” in Debian. Their purpose is to provide
 guidelines and packaging requirements in addition to the [Debian
-Policy][debian-policy] when specific topic are concerned, such as
+Policy][debian-policy] when specific topics are concerned, such as
 packages providing Perl libraries, Emacs extensions...
 
 Similarly to the other subpolicies, the aim of the Debian Ruby Policy is
@@ -16,7 +16,7 @@ to unify the packaging of Ruby libraries and applications under a single
 well-defined structure that packagers and users alike can rely on.
 
 An important feature of Ruby is that there are quite a few different
-implentations of the Ruby language, first of all the different versions
+implementations of the Ruby language, first of all the different versions
 of the mainstream implementation (1.8 and 1.9.2), but also other
 implementations, such as JRuby and Rubinius for instance. One of the
 aims of this policy is to make it as painless as possible for different
@@ -46,7 +46,7 @@ the principal binary package.
 
 Interpreters **may** provide an alternatives entry for `/usr/bin/ruby`, so
 that users can choose one of the different interpreter implementations
-to provide the `ruby` program. This alternatives entry must have as
+to provide the `ruby` program. This alternatives entry must have
 slaves entries for the following programs: `erb`, `testrb`, `irb`,
 `rdoc` and `ri`, as well as the corresponding manual pages for all of
 those programs, including `ruby`.
@@ -55,8 +55,8 @@ Interpreter maintainers **may** use the `ruby1.8` and `ruby1.9.1` packages
 as an example of the alternatives system handling for Ruby interpreters.
 
 At the time of the writing of this policy, the default interpreter is
-`ruby1.8`. This means that by default `/usr/bin/ruby` points to
-`/usr/rin/rub1.8`. Other interpreters **must** not install alternatives
+`ruby1.9.1`. This means that by default `/usr/bin/ruby` points to
+`/usr/bin/ruby1.9.1`. Other interpreters **must** not install alternatives
 entries with priority higher than `50` without first having a) a
 consensus about that in the `debian-ruby` mailing list and b) a new
 version of this policy uploaded to `unstable` pointing out a new default
@@ -86,8 +86,8 @@ path:
 The load paths **must** be searched for Ruby libraries in the following
 order:
 
--   the *site directory*, where files installed by local administrator
-    (typically a subdirectory of `/usr/local`;
+-   the *site directory*, where files are installed by local administrators
+    (typically a subdirectory of `/usr/local`);
 
 -   the aforementioned subdirectories in `/usr/lib/ruby/vendor_ruby/`;
 
@@ -109,7 +109,7 @@ next section.
 
 ### Package names
 
-All binary packages that contains Ruby code **must** have a package name in
+Any binary package that contains Ruby code **must** have a package name in
 the form `ruby-`PKG, where PKG **should** be the “library name”, that is
 either the gem name or the argument to `require` (or the common part in
 case of a library providing several sub-libraries that can be used
@@ -150,7 +150,7 @@ All files for the different implementations **must** be shipped inside a
 single binary package. This binary package **must** have a
 `XB-Ruby-Versions` statement containing the space-separated list of Ruby
 implementations supported by the binary package, with fields identical
-to those for the source package, excepted that `all` cannot be used: the
+to those for the source package, except that `all` cannot be used: the
 full list **must** be listed explicitly.
 
 ### Installation paths
@@ -179,11 +179,12 @@ To avoid hard-to-detect mixes of Debian and local Ruby libraries,
 packages **must not** use `rubygems`. In particular the use of
 `require 'rubygems'` and `require_gem` is not allowed.
 
-A special exception can be made to this rule when the software
+A special exception can be made to this rule when a piece of software
 (program/library) is enhanced by the presence of external libraries,
 under two conditions:
 
-1.  The library **must not** be necessary for the software's normal use.
+1.  The library **must not** be necessary for the normal use of the piece
+    of software.
 
 2.  The library **must not** be available as a Debian package.
 
@@ -195,7 +196,7 @@ failure **must** result in a build failure.
 Ruby applications {#applications}
 ---------------------------------
 
-Excepted for the package name, which does not have to comply to any
+Except for the package name, which does not have to comply with any
 rules, Ruby applications **must** obey all rules that apply to Ruby
 libraries (previous sections). In addition, they must obey the following
 rules.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-policy.git