=== modified file 'Makefile.PL'
--- Makefile.PL 2009-10-03 17:14:24 +0000
+++ Makefile.PL 2009-12-05 16:07:46 +0000
@@ -44,7 +44,7 @@
# We want a release bundled with the needed dependency to be able to
-# prepare a standealone binay with PAR::Packer
+# prepare a standalone binary with PAR::Packer
if ($ENV{OCS_BUNDLE_RELEASE}) {
foreach my $module (qw/Archive::Zip HTML::Parser LWP URI XML::NamespaceSupport Net::IP HTML::Tagset Proc::Daemon Module::ScanDeps PAR::Packer AutoLoader PAR PAR::Dist File::Remove YAML::Tiny Getopt::ArgvFile ExtUtils::Install ExtUtils::ParseXS XML::SAX XML::Simple/) {
bundle $module;
@@ -76,7 +76,7 @@
if (!can_run('ipdiscover') && !can_run('nmap')) {
- print "Plese install nmap ";
+ print "Please install nmap ";
print "or ipdiscover " if $^O =~ /^linux$/i;
print "if you want to use the network ".
"discover feature.\n";
@@ -94,7 +94,7 @@
my $archname;
-eval { # config_re is not avalaible on Perl 5.6
+eval { # config_re is not available on Perl 5.6
my @t = Config::config_re('archname');
$archname = $t[0];
};
@@ -102,7 +102,7 @@
foreach (qw/dmidecode lspci/) {
if (!can_run($_)) {
print "\n";
- print "[WARNING] $_ is needed if you want a complet inventory on x86 and AMD64/x86_64.\n";
+ print "[WARNING] $_ is needed if you want a complete inventory on x86 and AMD64/x86_64.\n";
print "\n";
}
}
=== modified file 'README'
--- README 2009-09-11 20:39:08 +0000
+++ README 2009-12-05 16:03:01 +0000
@@ -32,17 +32,17 @@
Proc::PID::File brings the pid file support if Proc::Daemon is installed
- ipmitoolif you want to collect information about IPMI
+ ipmitool if you want to collect information about IPMI
Compress::Zlib needed for OCS server prior 1.02
To get the serial number of the screen you will need one of these tools:
- - monitor-edid from Mandriva is needed to fetch the monitor. A package is avalaible
+ - monitor-edid from Mandriva is needed to fetch the monitor. A package is available
in Fedora repository.
information http://wiki.mandriva.com/en/Tools/monitor-edid
- get-edid from the read-edid package
- If avalaible, Net::CUPS is used to detect the printer
+ If available, Net::CUPS is used to detect the printer
BUILDING/INSTALLING
=== modified file 'etc/ocsinventory-agent/modules.conf'
--- etc/ocsinventory-agent/modules.conf 2008-02-01 19:12:14 +0000
+++ etc/ocsinventory-agent/modules.conf 2009-12-05 16:16:50 +0000
@@ -1,10 +1,10 @@
-# this list of module will be load by the at run time
+# this list of module will be loaded by the agent at run time
# to check its syntax do:
# $perl modules.conf
# You must have NO error. Else the content will be ignored
# This mechanism goal it to keep compatibility with 'plugin'
# created for the previous linux_agent.
-# The new unified_agent have its own extension system that allow
+# The new unified_agent has its own extension system that allows
# user to add new information easily.
use Ocsinventory::Agent::Option::Download;
=== modified file 'lib/Ocsinventory/Agent.pm'
--- lib/Ocsinventory/Agent.pm 2009-10-13 19:45:24 +0000
+++ lib/Ocsinventory/Agent.pm 2009-12-05 16:21:40 +0000
@@ -77,7 +77,7 @@
# TODO add a workaround if Proc::PID::File is not installed
eval { require Proc::PID::File; };
if(!$@) {
- $logger->debug('Proc::PID::File avalaible, checking for pid file');
+ $logger->debug('Proc::PID::File available, checking for pid file');
if (Proc::PID::File->running()) {
$logger->debug('parent process already exists');
return 1;
@@ -130,13 +130,13 @@
}
if ($config->{config}{nosoft}) {
- $logger->info("the parameter --nosoft is deprecated and may be removed in a futur release, please use --nosoftware instead.");
+ $logger->info("the parameter --nosoft is deprecated and may be removed in a future release, please use --nosoftware instead.");
$config->{config}{nosoftware} = 1
}
# TODO put that in Ocsinventory::Agent::Config
if (!$config->{config}{'stdout'} && !$config->{config}{'local'} && $config->{config}{server} !~ /^http(|s):\/\//) {
- $logger->debug("the --server passed doesn't have a protocle, assume http as default");
+ $logger->debug("the --server passed doesn't have a protocol, assume http as default");
$config->{config}{server} = "http://".$config->{config}{server}.'/ocsinventory';
}
@@ -230,7 +230,7 @@
if ($config->{config}{tag}) {
if ($accountinfo->get("TAG")) {
$logger->debug("A TAG seems to already exist in the server for this ".
- "machine. The -t paramter may be ignored by the server useless it ".
+ "machine. The -t paramter may be ignored by the server unless it ".
"has OCS_OPT_ACCEPT_TAG_UPDATE_FROM_CLIENT=1.");
}
$accountinfo->set("TAG",$config->{config}{tag});
@@ -299,7 +299,7 @@
if ($config->{config}{stdout} || $config->{config}{local}) { # Local mode
- # TODO, avoid to create Backend a two different place
+ # TODO, avoid to create Backend a two different places
my $backend = new Ocsinventory::Agent::Backend ({
accountinfo => $accountinfo,
=== modified file 'lib/Ocsinventory/Agent/AccountInfo.pm'
--- lib/Ocsinventory/Agent/AccountInfo.pm 2009-06-03 14:30:56 +0000
+++ lib/Ocsinventory/Agent/AccountInfo.pm 2009-12-05 16:24:07 +0000
@@ -87,7 +87,7 @@
}
}
-# Add accountinfo stuff to an inventary
+# Add accountinfo stuff to an inventory
sub setAccountInfo {
my $self = shift;
my $inventary = shift;
=== modified file 'lib/Ocsinventory/Agent/Backend.pm'
--- lib/Ocsinventory/Agent/Backend.pm 2009-11-14 22:51:39 +0000
+++ lib/Ocsinventory/Agent/Backend.pm 2009-12-05 16:05:04 +0000
@@ -323,7 +323,7 @@
if (!exists &retrieve) {
eval "use Storable;";
if ($@) {
- $logger->debug("Storable.pm is not avalaible, can't load Backend module data");
+ $logger->debug("Storable.pm is not available, can't load Backend module data");
return;
}
}
@@ -341,7 +341,7 @@
if (!exists &store) {
eval "use Storable;";
if ($@) {
- $logger->debug("Storable.pm is not avalaible, can't save Backend module data");
+ $logger->debug("Storable.pm is not available, can't save Backend module data");
return;
}
}
=== modified file 'lib/Ocsinventory/Agent/Backend/OS/Linux.pm'
--- lib/Ocsinventory/Agent/Backend/OS/Linux.pm 2009-09-11 20:39:08 +0000
+++ lib/Ocsinventory/Agent/Backend/OS/Linux.pm 2009-12-05 16:31:13 +0000
@@ -26,7 +26,7 @@
# This will probably be overwritten by a Linux::Distro module.
$inventory->setHardware({
OSNAME => "Linux",
- OSCOMMENTS => "Unknow Linux distribution",
+ OSCOMMENTS => "Unknown Linux distribution",
OSVERSION => $osversion,
LASTLOGGEDUSER => $lastloggeduser,
DATELASTLOGGEDUSER => $datelastlog
=== modified file 'lib/Ocsinventory/Agent/Backend/OS/Win32/Networks.pm'
--- lib/Ocsinventory/Agent/Backend/OS/Win32/Networks.pm 2009-09-11 20:39:08 +0000
+++ lib/Ocsinventory/Agent/Backend/OS/Win32/Networks.pm 2009-12-05 16:05:37 +0000
@@ -4,7 +4,7 @@
use strict;
-# No check here. If Win32::OLE and Win32::OLE::Variant not avalaible, the module
+# No check here. If Win32::OLE and Win32::OLE::Variant not available, the module
# will fail to load.
sub check {
=== modified file 'lib/Ocsinventory/Compress.pm'
--- lib/Ocsinventory/Compress.pm 2008-07-01 14:29:43 +0000
+++ lib/Ocsinventory/Compress.pm 2009-12-05 16:04:38 +0000
@@ -16,10 +16,10 @@
chomp(my $gzippath=`which gzip 2>/dev/null`);
if ($self->{mode} eq 'natif') {
- $logger->debug ('Compress::Zlib is avalaible.');
+ $logger->debug ('Compress::Zlib is available.');
} elsif (-x $gzippath) {
$logger->debug (
- 'Compress::Zlib is not avalaible! The data will be compressed with
+ 'Compress::Zlib is not available! The data will be compressed with
gzip instead but won\'t be accepted by server prior 1.02');
$self->{mode} = 'gzip';
$self->{tmpdir} = tempdir( CLEANUP => 1 );
=== modified file 'ocsinventory-agent'
--- ocsinventory-agent 2009-11-14 20:55:21 +0000
+++ ocsinventory-agent 2009-12-05 16:15:36 +0000
@@ -52,14 +52,14 @@
=head1 EXAMPLES
% ocsinventory-agent --server localhost
- # sent an inventory to the OCS server
+ # send an inventory to the OCS server
% ocsinventory-agent --server http://localhost/ocsinventory2
- # sent an inventory over http to a server with a non standard
+ # send an inventory over http to a server with a non standard
# virtual directory
% ocsinventory-agent --server https://localhost/ocsinventory
- # sent an inventory over https to the OCS server
+ # send an inventory over https to the OCS server
% ocsinventory-agent --local /tmp
# write an inventory in the /tmp directory
@@ -67,17 +67,17 @@
% ocsinventory-agent --server localhost --user=toto --password=pw --realm="Restricted Area"
# send a report to a server protected by a basic authentification
% ocsinventory-agent --lazy
- # send an inventory only if the a random delay between 0 and PROLOG_FREQ had been run over. Usefull for package maintainer.
+ # send an inventory only if the a random delay between 0 and PROLOG_FREQ had been run over. Useful for package maintainer.
% ocsinventory-agent --delaytime 60 -d
# If NO PROLOG_FREQ has been preset, pick a time between execution and --delaytime for the agent to contact the server [default is 3600 seconds]
=head1 DESCRIPTION
-F<ocsinventory-agent> creates inventory and sent or write them. This agent is the
-successor of the former linux_agent which was release with OCS 1.01 and prior. It also
+F<ocsinventory-agent> creates inventory and send or write them. This agent is the
+successor of the former linux_agent which was released with OCS 1.01 and prior. It also
replaces the Solaris/AIX/BSD unofficial agents. The detailed list of supported
-Operating System is avalaible in the Wiki.
+Operating System is available in the Wiki.
=over 4
@@ -111,7 +111,7 @@
=item B<--backend-collect-timeout=SECONDS_BEFORE_KILL>
-Time before OCS kill modules processing who don't end before the timeout.
+Time before OCS kills modules processing which don't end before the timeout.
=item B<--basevardir>=I<DIR>
@@ -135,8 +135,8 @@
=item B<-f>, B<--force>
-The agent will first contact the server during the PROLOG period. If the server doesn't know the machin or have outdated information, it will ask for an inventory.
-With this option, the agent doesn't run the PROLOG with the server first but directly send an inventory.
+The agent will first contact the server during the PROLOG period. If the server doesn't know the machine or has outdated informations, it will ask for an inventory.
+With this option, the agent doesn't run the PROLOG with the server first but directly sends an inventory.
=item B<-i>, B<--info>
@@ -190,7 +190,7 @@
=item B<--tag>=I<TAG>
-Mark the machin with the I<TAG> tag. Once the initial inventory is accepted by the server this value is ignored and you've to change the information directly on the server. The server do so in order to centralize the administration of the machine.
+Mark the machine with the I<TAG> tag. Once the initial inventory is accepted by the server this value is ignored and you've to change the information directly on the server. The server do so in order to centralize the administration of the machine.
=item B<-u> I<USER>, B<--user>=I<USER>
@@ -209,17 +209,17 @@
=item B<--nosoftware>
-Do not inventory the software installed on the machin. B<--nosoft> also
+Do not inventory the software installed on the machine. B<--nosoft> also
works but is deperecated.
=back
=head1 CONFIG FILE
-The agent try to initilise the settings from the B<ocsinventory-agent.cfg>
+The agent try to initialize the settings from the B<ocsinventory-agent.cfg>
config file.
-It looks for the file in these directory:
+It looks for the file in these directories:
=over
@@ -262,7 +262,7 @@
=head1 BUGS
-Please, use the forum as much as possible. You can open you bug.
+Please, use the forum as much as possible. You can open your own bug tickets.
Patches are welcome. You can also use LaunchPad bugtracker or
push your Bazaar branch on LaunchPad and do a merge request.