Merge branch 'spelling' into 'main'

Spelling fixes

See merge request apt-team/apt!194

14 files changed, 44 insertions, 44 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index a4a6bc4a3..f9362b0d5 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -999,7 +999,7 @@ void pkgAcquire::Item::FailMessage(string const &Message)
 // Acquire::Item::Start - Item has begun to download			/*{{{*/
 // ---------------------------------------------------------------------
 /* Stash status and the file size. Note that setting Complete means
-   sub-phases of the acquire process such as decompresion are operating */
+   sub-phases of the acquire process such as decompression are operating */
 void pkgAcquire::Item::Start(string const &/*Message*/, unsigned long long const Size)
 {
    Status = StatFetching;
@@ -3267,7 +3267,7 @@ void pkgAcqIndex::StageDownloadDone(string const &Message)
    std::string Filename = LookupTag(Message,"Filename");
 
    // we need to verify the file against the current Release file again
-   // on if-modfied-since hit to avoid a stale attack against us
+   // on if-modified-since hit to avoid a stale attack against us
    if (StringToBool(LookupTag(Message, "IMS-Hit"), false))
    {
       Filename = GetExistingFilename(GetFinalFileNameFromURI(Target.URI));
diff --git a/apt-pkg/acquire.h b/apt-pkg/acquire.h
index 09bb408bc..17b68768e 100644
--- a/apt-pkg/acquire.h
+++ b/apt-pkg/acquire.h
@@ -18,7 +18,7 @@
    of multiple items from multiple sources as well as dynamic balancing
    of load between the sources.
    
-   Schedualing of downloads is done on a first ask first get basis. This
+   Scheduling of downloads is done on a first ask first get basis. This
    preserves the order of the download as much as possible. And means the
    fastest source will tend to process the largest number of files.
    
diff --git a/apt-pkg/contrib/cdromutl.cc b/apt-pkg/contrib/cdromutl.cc
index c0fe869d2..f4020176a 100644
--- a/apt-pkg/contrib/cdromutl.cc
+++ b/apt-pkg/contrib/cdromutl.cc
@@ -71,7 +71,7 @@ bool IsMounted(string &Path)
 // UnmountCdrom - Unmount a cdrom					/*{{{*/
 // ---------------------------------------------------------------------
 /* Forking umount works much better than the umount syscall which can 
-   leave /etc/mtab inconsitant. We drop all messages this produces. */
+   leave /etc/mtab inconsistent. We drop all messages this produces. */
 bool UnmountCdrom(string Path)
 {
    // do not generate errors, even if the mountpoint does not exist
diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 03bdb12a8..5a7db1bbf 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -499,7 +499,7 @@ string Configuration::FindAny(const char *Name,const char *Default) const
    return Find(Name, Default);
 }
 									/*}}}*/
-// Configuration::CndSet - Conditinal Set a value			/*{{{*/
+// Configuration::CndSet - Conditional Set a value			/*{{{*/
 // ---------------------------------------------------------------------
 /* This will not overwrite */
 void Configuration::CndSet(const char *Name,const string &Value)
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 7c19fd7ca..76c779430 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1278,7 +1278,7 @@ bool pkgDepCache::MarkInstall_DiscardInstall(pkgCache::PkgIterator const &Pkg) /
 									/*}}}*/
 static bool MarkInstall_CollectDependencies(pkgDepCache const &Cache, pkgCache::VerIterator const &PV, std::vector<pkgCache::DepIterator> &toInstall, std::vector<pkgCache::DepIterator> &toRemove) /*{{{*/
 {
-   auto const propagateProctected = Cache[PV.ParentPkg()].Protect();
+   auto const propagateProtected = Cache[PV.ParentPkg()].Protect();
    for (auto Dep = PV.DependsList(); not Dep.end();)
    {
       auto const Start = Dep;
@@ -1290,7 +1290,7 @@ static bool MarkInstall_CollectDependencies(pkgDepCache const &Cache, pkgCache::
 	 if ((Cache[Dep] & pkgDepCache::DepInstall) == pkgDepCache::DepInstall)
 	    foundSolution = true;
       }
-      if (foundSolution && not propagateProctected)
+      if (foundSolution && not propagateProtected)
 	 continue;
 
       /* Check if this dep should be consider for install.
@@ -1352,10 +1352,10 @@ static APT::VersionVector getAllPossibleSolutions(pkgDepCache &Cache, pkgCache::
    return toUpgrade;
 }
 									/*}}}*/
-static bool MarkInstall_MarkDeleteForNotUpgradeable(pkgDepCache &Cache, bool const DebugAutoInstall, pkgCache::VerIterator const &PV, unsigned long const Depth, pkgCache::PkgIterator const &Pkg, bool const propagateProctected, APT::PackageVector &delayedRemove)/*{{{*/
+static bool MarkInstall_MarkDeleteForNotUpgradeable(pkgDepCache &Cache, bool const DebugAutoInstall, pkgCache::VerIterator const &PV, unsigned long const Depth, pkgCache::PkgIterator const &Pkg, bool const propagateProtected, APT::PackageVector &delayedRemove)/*{{{*/
 {
    auto &State = Cache[Pkg];
-   if (not propagateProctected)
+   if (not propagateProtected)
    {
       if (State.Delete())
 	 return true;
@@ -1380,7 +1380,7 @@ static bool MarkInstall_MarkDeleteForNotUpgradeable(pkgDepCache &Cache, bool con
    return true;
 }
 									/*}}}*/
-static bool MarkInstall_RemoveConflictsIfNotUpgradeable(pkgDepCache &Cache, bool const DebugAutoInstall, pkgCache::VerIterator const &PV, unsigned long Depth, std::vector<pkgCache::DepIterator> &toRemove, APT::PackageVector &toUpgrade, APT::PackageVector &delayedRemove, bool const propagateProctected, bool const FromUser) /*{{{*/
+static bool MarkInstall_RemoveConflictsIfNotUpgradeable(pkgDepCache &Cache, bool const DebugAutoInstall, pkgCache::VerIterator const &PV, unsigned long Depth, std::vector<pkgCache::DepIterator> &toRemove, APT::PackageVector &toUpgrade, APT::PackageVector &delayedRemove, bool const propagateProtected, bool const FromUser) /*{{{*/
 {
    /* Negative dependencies have no or-group
       If the candidate is effected try to keep current and discard candidate
@@ -1400,10 +1400,10 @@ static bool MarkInstall_RemoveConflictsIfNotUpgradeable(pkgDepCache &Cache, bool
 	    if (State.Install() && not Cache.MarkKeep(Pkg, false, false, Depth))
 	    {
 	       failedToRemoveSomething = true;
-	       if (not propagateProctected && not FromUser)
+	       if (not propagateProtected && not FromUser)
 		  break;
 	    }
-	    else if (propagateProctected)
+	    else if (propagateProtected)
 	    {
 	       MarkInstall_DiscardCandidate(Cache, Pkg);
 	       if (Pkg->CurrentVer == 0)
@@ -1412,14 +1412,14 @@ static bool MarkInstall_RemoveConflictsIfNotUpgradeable(pkgDepCache &Cache, bool
 	    else
 	       badCandidate.push_back(Pkg);
 	 }
-	 else if (not MarkInstall_MarkDeleteForNotUpgradeable(Cache, DebugAutoInstall, PV, Depth, Pkg, propagateProctected, delayedRemove))
+	 else if (not MarkInstall_MarkDeleteForNotUpgradeable(Cache, DebugAutoInstall, PV, Depth, Pkg, propagateProtected, delayedRemove))
 	 {
 	    failedToRemoveSomething = true;
-	    if (not propagateProctected && not FromUser)
+	    if (not propagateProtected && not FromUser)
 	       break;
 	 }
       }
-      if (failedToRemoveSomething && not propagateProctected && not FromUser)
+      if (failedToRemoveSomething && not propagateProtected && not FromUser)
 	 break;
       for (auto const &Ver : getAllPossibleSolutions(Cache, D, D, APT::CacheSetHelper::INSTALLED, true))
       {
@@ -1430,21 +1430,21 @@ static bool MarkInstall_RemoveConflictsIfNotUpgradeable(pkgDepCache &Cache, bool
 	    toUpgrade.push_back(Pkg);
 	 else if (State.CandidateVer == Pkg.CurrentVer())
 	    ; // already done in the first loop above
-	 else if (not MarkInstall_MarkDeleteForNotUpgradeable(Cache, DebugAutoInstall, PV, Depth, Pkg, propagateProctected, delayedRemove))
+	 else if (not MarkInstall_MarkDeleteForNotUpgradeable(Cache, DebugAutoInstall, PV, Depth, Pkg, propagateProtected, delayedRemove))
 	 {
 	    failedToRemoveSomething = true;
-	    if (not propagateProctected && not FromUser)
+	    if (not propagateProtected && not FromUser)
 	       break;
 	 }
       }
-      if (failedToRemoveSomething && not propagateProctected && not FromUser)
+      if (failedToRemoveSomething && not propagateProtected && not FromUser)
 	 break;
    }
    toRemove.clear();
    return not failedToRemoveSomething;
 }
 									/*}}}*/
-static bool MarkInstall_UpgradeOrRemoveConflicts(pkgDepCache &Cache, bool const DebugAutoInstall, unsigned long Depth, bool const ForceImportantDeps, APT::PackageVector &toUpgrade, bool const propagateProctected, bool const FromUser) /*{{{*/
+static bool MarkInstall_UpgradeOrRemoveConflicts(pkgDepCache &Cache, bool const DebugAutoInstall, unsigned long Depth, bool const ForceImportantDeps, APT::PackageVector &toUpgrade, bool const propagateProtected, bool const FromUser) /*{{{*/
 {
    bool failedToRemoveSomething = false;
    for (auto const &InstPkg : toUpgrade)
@@ -1455,17 +1455,17 @@ static bool MarkInstall_UpgradeOrRemoveConflicts(pkgDepCache &Cache, bool const
 	 if (not Cache.MarkDelete(InstPkg, false, Depth + 1, false))
 	 {
 	    failedToRemoveSomething = true;
-	    if (not propagateProctected && not FromUser)
+	    if (not propagateProtected && not FromUser)
 	       break;
 	 }
-	 else if (propagateProctected)
+	 else if (propagateProtected)
 	    Cache.MarkProtected(InstPkg);
       }
    toUpgrade.clear();
    return not failedToRemoveSomething;
 }
 									/*}}}*/
-static bool MarkInstall_InstallDependencies(pkgDepCache &Cache, bool const DebugAutoInstall, bool const DebugMarker, pkgCache::PkgIterator const &Pkg, unsigned long Depth, bool const ForceImportantDeps, std::vector<pkgCache::DepIterator> &toInstall, APT::PackageVector *const toMoveAuto, bool const propagateProctected, bool const FromUser) /*{{{*/
+static bool MarkInstall_InstallDependencies(pkgDepCache &Cache, bool const DebugAutoInstall, bool const DebugMarker, pkgCache::PkgIterator const &Pkg, unsigned long Depth, bool const ForceImportantDeps, std::vector<pkgCache::DepIterator> &toInstall, APT::PackageVector *const toMoveAuto, bool const propagateProtected, bool const FromUser) /*{{{*/
 {
    auto const IsSatisfiedByInstalled = [&](auto &D) { return (Cache[pkgCache::DepIterator{Cache, &D}] & pkgDepCache::DepInstall) == pkgDepCache::DepInstall; };
    bool failedToInstallSomething = false;
@@ -1475,7 +1475,7 @@ static bool MarkInstall_InstallDependencies(pkgDepCache &Cache, bool const Debug
       pkgCache::DepIterator Start, End;
       Dep.GlobOr(Start, End);
       bool foundSolution = std::any_of(Start, Dep, IsSatisfiedByInstalled);
-      if (foundSolution && not propagateProctected)
+      if (foundSolution && not propagateProtected)
 	 continue;
       bool const IsCriticalDep = Start.IsCritical();
       if (foundSolution)
@@ -1555,7 +1555,7 @@ static bool MarkInstall_InstallDependencies(pkgDepCache &Cache, bool const Debug
 	 if (DebugAutoInstall)
 	    std::clog << OutputInDepth(Depth) << "Installing " << InstPkg.FullName()
 		      << " as " << End.DepType() << " of " << Pkg.FullName() << '\n';
-	 if (propagateProctected && IsCriticalDep && possibleSolutions.size() == 1)
+	 if (propagateProtected && IsCriticalDep && possibleSolutions.size() == 1)
 	 {
 	    if (not Cache.MarkInstall(InstPkg, false, Depth + 1, false, ForceImportantDeps))
 	       continue;
@@ -1575,7 +1575,7 @@ static bool MarkInstall_InstallDependencies(pkgDepCache &Cache, bool const Debug
       if (not foundSolution && IsCriticalDep)
       {
 	 failedToInstallSomething = true;
-	 if (not propagateProctected && not FromUser)
+	 if (not propagateProtected && not FromUser)
 	    break;
       }
    }
@@ -1668,9 +1668,9 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg, bool AutoInst,
 	    P.iFlags &= (~Protected);
       }
       operator bool() noexcept { return already; }
-   } propagateProctected{PkgState[Pkg->ID]};
+   } propagateProtected{PkgState[Pkg->ID]};
 
-   if (not MarkInstall_UpgradeOrRemoveConflicts(*this, DebugAutoInstall, Depth, ForceImportantDeps, toUpgrade, propagateProctected, FromUser))
+   if (not MarkInstall_UpgradeOrRemoveConflicts(*this, DebugAutoInstall, Depth, ForceImportantDeps, toUpgrade, propagateProtected, FromUser))
    {
       if (failEarly)
       {
@@ -1698,7 +1698,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg, bool AutoInst,
 
    APT::PackageVector toMoveAuto;
    if (not MarkInstall_InstallDependencies(*this, DebugAutoInstall, DebugMarker, Pkg, Depth, ForceImportantDeps, toInstall,
-					   MoveAutoBitToDependencies ? &toMoveAuto : nullptr, propagateProctected, FromUser))
+					   MoveAutoBitToDependencies ? &toMoveAuto : nullptr, propagateProtected, FromUser))
    {
       if (failEarly)
       {
@@ -1811,7 +1811,7 @@ bool pkgDepCache::IsInstallOkDependenciesSatisfiableByCandidates(PkgIterator con
       DepIterator Start = Dep;
       bool foundSolution = false;
       unsigned Ors = 0;
-      // Is it possible to statisfy this dependency?
+      // Is it possible to satisfy this dependency?
       for (bool LastOR = true; not Dep.end() && LastOR; ++Dep, ++Ors)
       {
 	 LastOR = (Dep->CompareOp & Dep::Or) == Dep::Or;
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 20631bfc1..49a3126b7 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -12,7 +12,7 @@
 
    This is a modified version of Manoj's Routine B. It consists of four
    independent ordering algorithms that can be applied at for different
-   points in the ordering. By applying progressivly fewer ordering
+   points in the ordering. By applying progressively fewer ordering
    operations it is possible to give each consideration it's own
    priority and create an order that satisfies the lowest applicable
    consideration.
@@ -563,7 +563,7 @@ bool pkgOrderList::VisitProvides(DepIterator D,bool Critical)
 // ---------------------------------------------------------------------
 /* This is the core ordering routine. It calls the set dependency
    consideration functions which then potentially call this again. Finite
-   depth is achieved through the colouring mechinism. */
+   depth is achieved through the colouring mechanism. */
 bool pkgOrderList::VisitNode(PkgIterator Pkg, char const* from)
 {
    // Looping or irrelevant.
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 7d5733bbe..48dd03f66 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -2,7 +2,7 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Package Manager - Abstacts the package manager
+   Package Manager - Abstracts the package manager
 
    More work is needed in the area of transitioning provides, ie exim
    replacing smail. This can cause interesting side effects.
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index e70c204b5..d4cc3c63c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -2,7 +2,7 @@
 // Description								/*{{{*/
 /* ######################################################################
 
-   Package Manager - Abstacts the package manager
+   Package Manager - Abstracts the package manager
 
    Three steps are 
      - Aquiration of archives (stores the list of final file names)
diff --git a/apt-pkg/policy.cc b/apt-pkg/policy.cc
index 1179f422d..c5328c517 100644
--- a/apt-pkg/policy.cc
+++ b/apt-pkg/policy.cc
@@ -135,7 +135,7 @@ bool pkgPolicy::InitDefaults()
 									/*}}}*/
 // Policy::GetCandidateVer - Get the candidate install version		/*{{{*/
 // ---------------------------------------------------------------------
-/* Evaluate the package pins and the default list to deteremine what the
+/* Evaluate the package pins and the default list to determine what the
    best package is. */
 pkgCache::VerIterator pkgPolicy::GetCandidateVer(pkgCache::PkgIterator const &Pkg)
 {
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index aaf98539a..cffec30a8 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -692,7 +692,7 @@ bool DoCacheManipulationFromCommandLine(CommandLine &CmdL, std::vector<PseudoPkg
 
       if (Fix != NULL && _config->FindB("APT::Get::AutoSolving", true) == true)
       {
-	 InstallAction.propergateReleaseCandiateSwitching(helper.selectedByRelease, c0out);
+	 InstallAction.propagateReleaseCandidateSwitching(helper.selectedByRelease, c0out);
 	 InstallAction.doAutoInstall();
       }
 
@@ -1052,7 +1052,7 @@ void TryToInstall::operator() (pkgCache::VerIterator const &Ver) {
    }
 }
 									/*}}}*/
-bool TryToInstall::propergateReleaseCandiateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out)/*{{{*/
+bool TryToInstall::propagateReleaseCandidateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out)/*{{{*/
 {
    for (std::list<std::pair<pkgCache::VerIterator, std::string> >::const_iterator s = start.begin();
 	 s != start.end(); ++s)
diff --git a/apt-private/private-install.h b/apt-private/private-install.h
index 20b585d15..e3df9ac89 100644
--- a/apt-private/private-install.h
+++ b/apt-private/private-install.h
@@ -60,7 +60,7 @@ struct TryToInstall {
 			FixBroken(FixBroken), AutoMarkChanged(0) {};
 
    void operator() (pkgCache::VerIterator const &Ver);
-   bool propergateReleaseCandiateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out);
+   bool propagateReleaseCandidateSwitching(std::list<std::pair<pkgCache::VerIterator, std::string> > const &start, std::ostream &out);
    void doAutoInstall();
 };
 									/*}}}*/
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index f3ee0e594..e007c542f 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -334,7 +334,7 @@ bool DoSource(CommandLine &CmdL)
    // Dsc only mode only fetches .dsc files
    bool const dscOnly = _config->FindB("APT::Get::Dsc-Only", false);
 
-   // Load the requestd sources into the fetcher
+   // Load the requested sources into the fetcher
    aptAcquireWithTextStatus Fetcher;
    std::vector<std::string> UntrustedList;
    for (const char **cmdl = CmdL.FileList + 1; *cmdl != 0; ++cmdl)
@@ -831,7 +831,7 @@ bool DoBuildDep(CommandLine &CmdL)
 	    candSwitch.emplace_back(Pkg.VersionList(), pkg.release);
       }
       if (candSwitch.empty() == false)
-	 InstallAction.propergateReleaseCandiateSwitching(candSwitch, c0out);
+	 InstallAction.propagateReleaseCandidateSwitching(candSwitch, c0out);
       for (auto const &pkg: pseudoPkgs)
       {
 	 pkgCache::PkgIterator const Pkg = Cache->FindPkg(pkg.name, pkg.arch);
diff --git a/debian/changelog b/debian/changelog
index 19d195ca3..fc5214a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -242,7 +242,7 @@ apt (2.2.0) unstable; urgency=medium
   * The "Happy soft freeze" release
   * Do not make DefaultRootSetFunc2 public symbol
   * kernels: Avoid std::regex for escaping '.' and '+'
-  * symbols: Remove spurios package line, add kernel autoremoval helper
+  * symbols: Remove spurious package line, add kernel autoremoval helper
 
  -- Julian Andres Klode <jak@debian.org>  Thu, 18 Feb 2021 20:35:09 +0100
 
@@ -9345,7 +9345,7 @@ apt (0.7.10) unstable; urgency=low
     - make the authentication download code more robust against
       servers/proxies with broken If-Range implementations
   * apt-pkg/packagemanager.{cc,h}:
-    - propergate the Immediate flag to make hitting the
+    - propagate the Immediate flag to make hitting the
       "E: Internal Error, Could not perform immediate configuration (2)"
       harder
   * debian/control:
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 5c4d341c2..5a34d8297 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -92,7 +92,7 @@ class MirrorMethod : public aptMethod /*{{{*/
    virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
 
    void RedirectItem(MirrorListInfo const &info, FetchItem *const Itm, std::string const &Message);
-   bool MirrorListFileRecieved(MirrorListInfo &info, FetchItem *const Itm);
+   bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *const Itm);
    std::string GetMirrorFileURI(std::string const &Message, FetchItem *const Itm);
    void DealWithPendingItems(std::vector<std::string> const &baseuris, MirrorListInfo const &info, FetchItem *const Itm, std::function<void()> handler);
 
@@ -192,7 +192,7 @@ void MirrorMethod::DealWithPendingItems(std::vector<std::string> const &baseuris
    delete Itm;
 }
 									/*}}}*/
-bool MirrorMethod::MirrorListFileRecieved(MirrorListInfo &info, FetchItem *const Itm) /*{{{*/
+bool MirrorMethod::MirrorListFileReceived(MirrorListInfo &info, FetchItem *const Itm) /*{{{*/
 {
    std::vector<std::string> baseuris;
    for (auto const &i : mirrorfilestate)
@@ -345,7 +345,7 @@ bool MirrorMethod::URIAcquire(std::string const &Message, FetchItem *Itm) /*{{{*
 {
    auto mirrorinfo = mirrorfilestate.find(Itm->Uri);
    if (mirrorinfo != mirrorfilestate.end())
-      return MirrorListFileRecieved(mirrorinfo->second, Itm);
+      return MirrorListFileReceived(mirrorinfo->second, Itm);
 
    std::string const mirrorfileuri = GetMirrorFileURI(Message, Itm);
    if (mirrorfileuri.empty())