diff options
| -rw-r--r-- | MgaRepo/commands/getsrpm.py | 2 | ||||
| -rw-r--r-- | MgaRepo/commands/putsrpm.py | 2 | ||||
| -rw-r--r-- | MgaRepo/commands/rpmlog.py | 2 | ||||
| -rw-r--r-- | MgaRepo/plugins/ldapusers.py | 4 | ||||
| -rw-r--r-- | README.LDAP | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/MgaRepo/commands/getsrpm.py b/MgaRepo/commands/getsrpm.py index 1d437d4..9c96309 100644 --- a/MgaRepo/commands/getsrpm.py +++ b/MgaRepo/commands/getsrpm.py @@ -25,7 +25,7 @@ Options: -v VER Use files from the version specified by VER (e.g. 2.2.1-2cl) -r REV Use files from current directory, in revision REV (e.g. 1001) -t DIR Put SRPM file in directory DIR when done (default is ".") - -P USER Define the RPM packager inforamtion to USER + -P USER Define the RPM packager information to USER -s FILE Run script with "FILE TOPDIR SPECFILE" command -n Rename the package to include the revision number -l Use subversion log to build rpm %changelog diff --git a/MgaRepo/commands/putsrpm.py b/MgaRepo/commands/putsrpm.py index f553f98..242423b 100644 --- a/MgaRepo/commands/putsrpm.py +++ b/MgaRepo/commands/putsrpm.py @@ -12,7 +12,7 @@ Usage: mgarepo putsrpm [OPTIONS] SOURCERPMS Will import source RPMs into the SVN repository. Options: - -l LOG Log message used when commiting changes + -l LOG Log message used when committing changes -t Create version-release tag on releases/ -b NAME The distribution branch to place it -d URL The URL of base directory where packages will be placed diff --git a/MgaRepo/commands/rpmlog.py b/MgaRepo/commands/rpmlog.py index ae8997d..722cfe9 100644 --- a/MgaRepo/commands/rpmlog.py +++ b/MgaRepo/commands/rpmlog.py @@ -29,7 +29,7 @@ Options: Examples: mgarepo rpmlog python - mgarepo rpmlog http://svn.mandriva.com/svn/packages/cooker/python + mgarepo rpmlog svn://svn.mageia.org/svn/packages/cauldron/python/current """ def parse_options(): diff --git a/MgaRepo/plugins/ldapusers.py b/MgaRepo/plugins/ldapusers.py index 294c32d..dd202ed 100644 --- a/MgaRepo/plugins/ldapusers.py +++ b/MgaRepo/plugins/ldapusers.py @@ -43,12 +43,12 @@ options in the [global] section of mgarepo.conf: >>> format = Template("$cn <$mail>") >>> d = search(basedn, filter) >>> d - {"cn": "John Doe", "mail": "john@mandriva.org", + {"cn": "John Doe", "mail": "john@example.org", "uidNumber": "1290", "loginShell": "/bin/bash", ... many other attributes ... } >>> value = format.substitute(d) >>> print value - John Doe <john@mandriva.org> + John Doe <john@example.org> Note that only the first value of the attributes will be used. diff --git a/README.LDAP b/README.LDAP index a30ebd0..8762511 100644 --- a/README.LDAP +++ b/README.LDAP @@ -42,12 +42,12 @@ options in the [global] section of mgarepo.conf: >>> format = Template("$cn <$mail>") >>> d = search(basedn, filter) >>> d - {"cn": "John Doe", "mail": "john@mandriva.org", + {"cn": "John Doe", "mail": "john@example.org", "uidNumber": "1290", "loginShell": "/bin/bash", ... many other attributes ... } >>> value = format.substitute(d) >>> print value - John Doe <john@mandriva.org> + John Doe <john@example.org> Note that only the first value of the attributes will be used. |