From: Luca Boccassi Date: Sat, 11 Nov 2023 16:26:58 +0000 (+0000) Subject: Fix various typos found by Lintian X-Git-Tag: 0.7.28~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F542%2Fhead;p=thirdparty%2Flibsolv.git Fix various typos found by Lintian --- diff --git a/doc/gen/libsolv-bindings.3 b/doc/gen/libsolv-bindings.3 index ca14b344..2970a790 100644 --- a/doc/gen/libsolv-bindings.3 +++ b/doc/gen/libsolv-bindings.3 @@ -614,7 +614,7 @@ Make the addfileprovides method only add files from the standard locations (i\&. .PP \fBPOOL_FLAG_NOWHATPROVIDESAUX\fR .RS 4 -Disable the creation of the auxillary whatprovides index\&. This saves a bit of memory but also makes the whatprovides lookups a bit slower\&. +Disable the creation of the auxiliary whatprovides index\&. This saves a bit of memory but also makes the whatprovides lookups a bit slower\&. .RE .PP \fBPOOL_FLAG_WHATPROVIDESWITHDISABLED\fR @@ -2159,7 +2159,7 @@ Add the metadata of a single rpm package to the repository\&. .RE .\} .sp -Add all pubkeys contained in the rpm database to the repository\&. Note that newer rpm versions also allow to store the pubkeys in some directory instead of the rpm database\&. +Add all pubkeys contained in the rpm database to the repository\&. Note that newer rpm versions also allow storing the pubkeys in some directory instead of the rpm database\&. .sp .if n \{\ .RS 4 @@ -3609,7 +3609,7 @@ Update the matching installed packages to their best version\&. If none of the s .PP \fBSOLVER_WEAKENDEPS\fR .RS 4 -Allow to break the dependencies of the matching packages\&. Handle with care\&. +Allow breaking the dependencies of the matching packages\&. Handle with care\&. .RE .PP \fBSOLVER_MULTIVERSION\fR @@ -4513,7 +4513,7 @@ my \fI@decisions\fR \fB=\fR \fI$problem\fR\fB\->get_decisionlist()\fR; .RE .\} .sp -Return a list of decisions prooving the problem\&. This is somewhat similar to the findallproblemrules(), but the output is in an order that makes it easier to understand why the solver could not find a solution\&. +Return a list of decisions proving the problem\&. This is somewhat similar to the findallproblemrules(), but the output is in an order that makes it easier to understand why the solver could not find a solution\&. .sp .if n \{\ .RS 4 @@ -4683,7 +4683,7 @@ my \fI@decisions\fR \fB=\fR \fI$rule\fR\fB\->get_decisionlist()\fR; .RE .\} .sp -Return a list of decisions prooving a learnt rule\&. +Return a list of decisions proving a learnt rule\&. .sp .if n \{\ .RS 4 diff --git a/doc/gen/libsolv-pool.3 b/doc/gen/libsolv-pool.3 index 0cd26a10..1e2bfb8f 100644 --- a/doc/gen/libsolv-pool.3 +++ b/doc/gen/libsolv-pool.3 @@ -1290,7 +1290,7 @@ There can be multiple equivalence classes, the set of allowed vendor changes for You can turn off the vendor replacement checks with the Solver\(cqs SOLVER_FLAG_ALLOW_VENDORCHANGE flag\&. .SH "BOOLEAN DEPENDENCIES" .sp -Boolean Dependencies allow to build complex expressions from simple dependencies\&. Note that depending on the package manager only a subset of those may be useful\&. For example, debian currently only allows an "OR" expression\&. +Boolean Dependencies allow building complex expressions from simple dependencies\&. Note that depending on the package manager only a subset of those may be useful\&. For example, debian currently only allows an "OR" expression\&. .PP \fBREL_OR\fR .RS 4 diff --git a/doc/gen/testsolv.1 b/doc/gen/testsolv.1 index 50254f71..0a5b9697 100644 --- a/doc/gen/testsolv.1 +++ b/doc/gen/testsolv.1 @@ -45,7 +45,7 @@ Increase the debug level of the solver\&. This option can be specified multiple .RS 4 Write the output in testcase format instead of human readable text\&. The output can then be used in the result section of the test case\&. If the \fB\-r\fR -option is given twice, the output is formated for verbatim inclusion\&. +option is given twice, the output is formatted for verbatim inclusion\&. .RE .PP \fB\-l\fR \fIPKGSPEC\fR diff --git a/doc/libsolv-bindings.txt b/doc/libsolv-bindings.txt index b1069a9b..a1dee398 100644 --- a/doc/libsolv-bindings.txt +++ b/doc/libsolv-bindings.txt @@ -353,7 +353,7 @@ dependencies, but you still want the fast speed that addfileprovides() generates. *POOL_FLAG_NOWHATPROVIDESAUX*:: -Disable the creation of the auxillary whatprovides index. This saves +Disable the creation of the auxiliary whatprovides index. This saves a bit of memory but also makes the whatprovides lookups a bit slower. *POOL_FLAG_WHATPROVIDESWITHDISABLED*:: @@ -1218,7 +1218,7 @@ Add the metadata of a single rpm package to the repository. repo.add_rpmdb_pubkeys() Add all pubkeys contained in the rpm database to the repository. Note that -newer rpm versions also allow to store the pubkeys in some directory instead +newer rpm versions also allow storing the pubkeys in some directory instead of the rpm database. Solvable add_pubkey(const char *keyfile, int flags = 0) @@ -2047,7 +2047,7 @@ packages to the specified versions. See the section about targeted updates about more information. *SOLVER_WEAKENDEPS*:: -Allow to break the dependencies of the matching packages. Handle with care. +Allow one to break the dependencies of the matching packages. Handle with care. *SOLVER_MULTIVERSION*:: Mark the matched packages for multiversion install. If they get to be @@ -2771,7 +2771,7 @@ job rules (unless the returned rules only consist of those types). decisions = problem.get_decisionlist() decisions = problem.get_decisionlist() -Return a list of decisions prooving the problem. This is somewhat similar to +Return a list of decisions proving the problem. This is somewhat similar to the findallproblemrules(), but the output is in an order that makes it easier to understand why the solver could not find a solution. @@ -2868,7 +2868,7 @@ an array of all infos about a rule. decisions = rule.get_decisionlist() decisions = rule.get_decisionlist() -Return a list of decisions prooving a learnt rule. +Return a list of decisions proving a learnt rule. Decision *get_decisionsetlist() my @decisionsets = $rule->get_decisionsetlist(); diff --git a/doc/libsolv-pool.txt b/doc/libsolv-pool.txt index 991083f3..2958437c 100644 --- a/doc/libsolv-pool.txt +++ b/doc/libsolv-pool.txt @@ -850,7 +850,7 @@ SOLVER_FLAG_ALLOW_VENDORCHANGE flag. Boolean Dependencies -------------------- -Boolean Dependencies allow to build complex expressions from simple +Boolean Dependencies allow building complex expressions from simple dependencies. Note that depending on the package manager only a subset of those may be useful. For example, debian currently only allows an "OR" expression. diff --git a/doc/testsolv.txt b/doc/testsolv.txt index eb52d959..fb92dbdc 100644 --- a/doc/testsolv.txt +++ b/doc/testsolv.txt @@ -26,7 +26,7 @@ multiple times to further increase the amount of debug data. *-r*:: Write the output in testcase format instead of human readable text. The output can then be used in the result section of the test case. -If the *-r* option is given twice, the output is formated for +If the *-r* option is given twice, the output is formatted for verbatim inclusion. *-l* 'PKGSPEC':: diff --git a/src/rules.c b/src/rules.c index 7d57cfde..cb3f9a32 100644 --- a/src/rules.c +++ b/src/rules.c @@ -1691,7 +1691,7 @@ solver_addinfarchrules(Solver *solv, Map *addedmap) if (allowedarchs.count && pool->implicitobsoleteusescolors && installed) { - /* need an extra pass for lockstep checking: we only allow to keep an inferior arch + /* need an extra pass for lockstep checking: we only allow keeping an inferior arch * if the corresponding installed package is not lock-stepped */ queue_empty(&allowedarchs); FOR_PROVIDES(p, pp, s->name) diff --git a/src/solver.h b/src/solver.h index 34c045e1..b1f8d262 100644 --- a/src/solver.h +++ b/src/solver.h @@ -155,10 +155,10 @@ struct s_Solver { * Solver configuration *-------------------------------------------------------------------------------------------------------------*/ - int allowdowngrade; /* allow to downgrade installed solvable */ - int allownamechange; /* allow to change name of installed solvables */ - int allowarchchange; /* allow to change architecture of installed solvables */ - int allowvendorchange; /* allow to change vendor of installed solvables */ + int allowdowngrade; /* allow downgrading installed solvable */ + int allownamechange; /* allow changing name of installed solvables */ + int allowarchchange; /* allow changing architecture of installed solvables */ + int allowvendorchange; /* allow changing vendor of installed solvables */ int allowuninstall; /* allow removal of installed solvables */ int noupdateprovide; /* true: update packages needs not to provide old package */ int needupdateprovide; /* true: update packages must provide old package */ diff --git a/src/solver_util.c b/src/solver_util.c index 79faaf25..0d6aaf48 100644 --- a/src/solver_util.c +++ b/src/solver_util.c @@ -408,7 +408,7 @@ solver_add_obsoleted(Solver *solv, Id p, Queue *q) * Call solver_add_obsoleted and intersect the result with the * elements in Queue q starting at qstart. * Assumes that it's the first call if qstart == q->count. - * May use auxillary map m for the intersection process, all + * May use auxiliary map m for the intersection process, all * elements of q starting at qstart must have their bit cleared. * (This is also true after the function returns.) * (See solver_add_obsoleted for limitations of the package p)