Fix some typos & bad URLs

4 files changed, 29 insertions, 28 deletions

diff --git a/CHANGES b/CHANGES
index c20dc1c..5996264 100644
--- a/CHANGES
+++ b/CHANGES
@@ -117,7 +117,7 @@
 
 * 1.10.0
 - change binrepo :
-  http://mageia.org/pipermail/mageia-sysadm/2011-July/003717.html
+  https://mageia.org/pipermail/mageia-sysadm/2011-July/003717.html
 - add command maintdb in the help
 - Fix the example in the usage message of putsrpm.py
 
diff --git a/README.BINREPO b/README.BINREPO
index 5063b17..bc4c0d4 100644
--- a/README.BINREPO
+++ b/README.BINREPO
@@ -40,14 +40,14 @@ survive.  Thus another mechanism which relies on dates instead of revisions
 numbers is needed.
 
 When a binary is uploaded to the binrepo, the file `sha1.lst` is updated to
-have the files's hash and commited in the main text repo. This file will be
+have the files's hash and committed in the main text repo. This file will be
 used as the reference when the user uses -r REV on mgarepo. mgarepo will
 checkout the package in the main text repo with -r REV and then will use
 the "Last Changed Date" of `sha1.lst` to checkout the binrepo part. Thus,
-`sha1.lst` should be always commited to the main text repository *after* the
-corresponding binary files have been commited to the binrepo. Hooks in the
+`sha1.lst` should be always committed to the main text repository *after* the
+corresponding binary files have been committed to the binrepo. Hooks in the
 main repository may be used to try to enforce this, by checking if the files
-changed in `sha1.lst` are already commited in the corresponding binrepo.
+changed in `sha1.lst` are already committed in the corresponding binrepo.
 
 Computation of `sha1.lst` is unlikely to be an issue:
 
@@ -55,8 +55,8 @@ Computation of `sha1.lst` is unlikely to be an issue:
 - it takes[0] less than 10s to sha1sum all SOURCES of openoffice.org-3.1-1mdv2010.0.src.rpm
 - it probably takes way less than the time to upload the file into the repository
 - it can be computed in parallel to the binrepo commit, and probably finish
-  before that, thus ready by the time `sha1.lst` should be commited
-- users don't need to verify the SHA1s "everytime", but the build system
+  before that, thus ready by the time `sha1.lst` should be committed
+- users don't need to verify the SHA1s "every time", but the build system
   does, thus Repsys can default to not verify and avoid wasting users' time
 
 The use of `sha1.lst` has the valuable property of tying the state of the main
@@ -82,11 +82,11 @@ property in the main text repository would be kept, such that for any given
 main repository revision, the corresponding state of the binrepos is
 obtainable (using the registered date).
 
-This would be "more transparent", as it can be maintened simply by using
+This would be "more transparent", as it can be maintained simply by using
 subversion hooks, without user intervention.  OTOH, as every time the user
 commits to a binrepo this would result in a commit in the main repository,
 it would require the user to "svn up" the directories from there before
-commiting, after every binrepo commit.  Also, this might result in a big
+committing, after every binrepo commit.  Also, this might result in a big
 number of "bogus" commits to the main repository, which could be seen as log
 pollution, and may potentially increase space usage etc..
 
@@ -101,14 +101,14 @@ Why a new repository without the tarballs
   failure very expensive, much more so than the more valuable data
 - there is no easy way to strip undesired tarballs without recreating the
   whole repository
-- fedora and ubuntu have separated repositories, so we must have it too!
+- Fedora and Ubuntu have separated repositories, so we must have it too!
 
 Numbers
 -------
 
-Current repository is +390000 revisions and ~340Gb big, while the bzip2ed
+Circa 2011 repository is +390000 revisions and ~340Gb big, while the bzip2ed
 dumps backup for it takes about a bit more than half that size (FIXME:
-estimative, can't check in the backup server right now).  Current txtrepo
+estimate; can't check in the backup server right now).  Current txtrepo
 with the same number of revisions is ~180Gb big, takes about 2-3 days to be
 imported, while the gzipped full dump backup for it currently takes ~1.2Gb. 
 Initial binrepo for cauldron (only `current/` packages' branches) took ~28Gb
@@ -137,8 +137,8 @@ We would have to update the configuration files from all the users in order
 to add a new stable repository. spuk suggests to use properties in the main
 text repo that would point to the right repository locations.
 
-How to handle failures when operating on more repositores?
-----------------------------------------------------------
+How to handle failures when operating on more repositories?
+-----------------------------------------------------------
 
 binrepos should replicate the structure of the main text repo. What we
 should do if the markrelease succeeds in the binrepo, but fails in the main
@@ -155,7 +155,7 @@ would work like:
 
 0. mark beginning of markrelease, early failing the package build if it fails
 1. do markrelease
-2. mark sucessful end of markrelease
+2. mark successful end of markrelease
    or mark failed markrelease, so we can replay it later
 
 
@@ -207,7 +207,7 @@ upgrading to a newer version of the package
 ::
 
   $ cd bla/SOURCES/
-  $ wget http://prdownloads.sourceforge.net/bla/bla-1.6.tar.bz2
+  $ wget https://prdownloads.sourceforge.net/bla/bla-1.6.tar.bz2
   $ mgarepo upload bla-1.6.0.tar.bz2
 
 - mgarepo notices this is a tarball (checking filename and/or file size)
@@ -342,7 +342,7 @@ assuming repository manipulation with mgarepo (for ease).  Repsys could
 xdelta tarballs and add it to SVN with a special filename, then use it when
 checking out.  Would require a policy/algorithm on when to ditch old whole
 binaries, too (i.e.  hopefully wouldn't need to be handled manually by the
-maintainer).  Also, this is something complemental to splitting the
+maintainer).  Also, this is something complementary to splitting the
 repository, so we may do it later, for binrepos.
 
 
diff --git a/README.LDAP b/README.LDAP
index 8762511..276a2eb 100644
--- a/README.LDAP
+++ b/README.LDAP
@@ -58,4 +58,5 @@ each configuration access.
 
 This plugin requires the package python-ldap.
 
-For more information, look http://qa.mandriva.com/show_bug.cgi?id=30549
+For more information, look at http://qa.mandriva.com/show_bug.cgi?id=30549
+(sadly, now vanished).
diff --git a/mgarepo.8 b/mgarepo.8
index a100a78..ce79040 100644
--- a/mgarepo.8
+++ b/mgarepo.8
@@ -27,7 +27,7 @@ Obtains a working copy of the package foo.
 .IP "\fBmgarepo co 1/mutt\fP"
 Obtains a working copy of the package mutt of from the 1 branch.
 .IP "\fBmgarepo co hplip -k 5\fP"
-Obtains a working copy of the package hplib of from the 5 branch and backport directory.
+Obtains a working copy of the package hplip of from the 5 branch and backport directory.
 .IP "\fBmgarepo ci\fP"
 Commits pending changes in the working copy.
 .IP "\fBmgarepo submit foo \-r 12345\fP"
@@ -51,7 +51,7 @@ submit a package in a given revision for build and release
 .IP "\fBsync\fP"
 add-remove all file changes from the .spec
 .IP "\fBmaintdb\fP"
-get/set package maintainers informations
+get/set package maintainers information
 .IP "\fBputsrpm\fP"
 import a source package to the repository
 .IP "\fBgetspec\fP"
@@ -83,7 +83,7 @@ move a package in obsolete directory
 .SH "REPOSITORY LAYOUT"
 .nf
 A detailed description can be found at:
-http://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
+https://web.archive.org/web/20130917042024/https://wiki.mandriva.com/en/Development/Packaging/RepositorySystem
 .fi
 
 The svn repository used by \fBmgarepo\fP consists of a set of branches in the top directory, followed by package directories having the internal package structure.
@@ -139,13 +139,13 @@ Contains the base URL used to access packages in the svn repository when only pa
 .IP "\fBdefault_parent = URL\fP"
 Points to the base URL of the development branch of the svn repository. This option is deprecated as it has been replaced by "repository".
 .IP "\fBmirror = URL\fP" 
-The URL of an alternative and read\-only repository to be used when checking out packages. \fBmgarepo ci\fP will automatically relocate to "repository" when comitting.
+The URL of an alternative and read\-only repository to be used when checking out packages. \fBmgarepo ci\fP will automatically relocate to "repository" when committing.
 .IP "\fBuse-mirror = yes/no\fP"
 Disable the use of the mirror repository when checking out packages.
 .IP "\fBurl\-map = MATCH\-REGEXP REPLACE\-EXPR\fP"
 This option is used on server-side to remap remote URLs brought by the user when running \fBmgarepo submit\fP to local (and probably faster) URLs. \fBMATCH\-REGEXP\fP is a Python regular expression matching the components that must be reused in the local URL. \fbREPLACE\-EXPR\fP is a replace expression that should expand in the final URL. Example: \fBsvn\+ssh://svn\.mageia\.org/(.*) file:///\1\fP
 .IP "\fBtempdir = PATH\fP"
-The directory to be used as base for temporay directories and files created by mgarepo.
+The directory to be used as base for temporary directories and files created by mgarepo.
 .IP "\fBdownload\-command = COMMAND\-FMT\fP"
 Command used to download generic remote URLs, it accepts the variables \fB$url\fP and \fB$dest\fP. It is currently used when running \fBmgarepo sync \-d\fP.
 .IP "\fBsvn\-command = COMMAND\fP"
@@ -153,7 +153,7 @@ The base command used to execute svn(1). Runs through system(3).
 .IP "\fBsvn-env = VAR=VALUE ..\fP"
 The environment variables to use when running svn. More entries can be defined by using more lines. The variable defined by default is \fBSVN_SSH\fP, which points to the \fBmgarepo-ssh\fP ssh wrapper.
 .IP "\fBverbose = yes/no\fP"
-Increase the verbosity of mgarepo output, printing commands being run and complete traceback when unhanlded errors happen.
+Increase the verbosity of mgarepo output, printing commands being run and complete traceback when unhandled errors happen.
 .IP "\fBtrunk-dir\fP"
 Points to the default branch of the distro used in commands that do not have their branch or URL specified.
 .IP "\fBbranches-dir\fP"
@@ -168,7 +168,7 @@ Defines the default host in which \fBmgarepo submit\fP will run the submit helpe
 .IP "\fBdefault = TARGET\fP"
 The default target to be used in \fBmgarepo submit\fP when the option \-t is not used.
 .SS "[submit TARGET] sections (server\-side only)"
-These sections describe each one of the sections available to submit packages, ther configuration options are:
+These sections describe each one of the sections available to submit packages. Their configuration options are:
 .IP "\fBtarget = PATH\fP"
 The path where SRPMs generated by \fBcreate\-srpm-\fP will be placed during during the submit process.
 .IP "\fBallowed = URLs\fP"
@@ -202,7 +202,7 @@ The base revision used to generated changelogs. As in \fBsvn log -r REVISION\-OF
 .IP "\fBignore\-string = STRING\fP"
 Mark used to hide log messages. When it appears at the beginning of the log message, the whole changeset log is hidden. When it is found in the middle of a string, only the line will not be shown.
 .IP "\fBunignore\-string = STRING\fP"
-The complement of the previous option. When this token is found, only those lines containg this mark will be shown. It is intended to be used in very long log messages.
+The complement of the previous option. When this token is found, only those lines containing this mark will be shown. It is intended to be used in very long log messages.
 .SS "[template] section"
 .IP "\fBpath = PATH\fP"
 Obsolete. The path of the template used to generate the changelog from svn commits.
@@ -210,7 +210,7 @@ Obsolete. The path of the template used to generate the changelog from svn commi
 The name of the template used to generate the changelog from svn commits. Use \fBdefault\fP or \fBrevno\fP.
 .SS "[srpm] section"
 .IP "\fBrun-prep = yes/no\fP"
-Repsys can check for the presence of a file named \fBMakefile\fP in the top directory of the package and run \fBmake prep-srpm\fP so that it can generate the actual files that must be distributed in in the srpm. This option enables this feature. (Note: the command is expected to run in an restricted environment, the Makefile must use only minimal funcionalities.)
+Repsys can check for the presence of a file named \fBMakefile\fP in the top directory of the package and run \fBmake prep-srpm\fP so that it can generate the actual files that must be distributed in in the srpm. This option enables this feature. (Note: the command is expected to run in an restricted environment, the Makefile must use only minimal functionality.)
 .SH "ENVIRONMENT VARIABLES"
 .PP
 .IP "\fBREPSYS_CONF\fP"
@@ -223,7 +223,7 @@ Sets the configuration file to be read by \fBmgarepo\fP
 /usr/share/doc/mgarepo/
 .fi 
 .SH "BUGS"
-See the list of bugs at http://bugs.mageia.org/buglist.cgi?quicksearch=mgarepo
+See the list of bugs at https://bugs.mageia.org/buglist.cgi?quicksearch=mgarepo
 .SH "SEE ALSO"
 mdvsys(1), svn(1), ssh\-agent(1)