Merge branch 'fix/cleanup' into 'main'

Drop unused and obsolete macros as well as documentation

See merge request apt-team/apt!428

149 files changed, 2162 insertions, 2984 deletions

diff --git a/.gitignore b/.gitignore
index aeab4a372..371d9948f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@ docbook-text-style.xsl
 **/cmdline/apt-extracttemplates
 **/cmdline/apt-get
 **/cmdline/apt-helper
-**/cmdline/apt-key
 **/cmdline/apt-mark
 **/cmdline/apt-sortpkgs
 **/cmdline/planners
@@ -67,10 +66,7 @@ docbook-text-style.xsl
 **/methods/mirror+ftp
 **/methods/mirror+http
 **/methods/mirror+https
-**/methods/ftp
 **/methods/rred
-**/methods/rsh
-**/methods/ssh
 **/methods/gzip
 **/methods/bzip2
 **/methods/xz
diff --git a/COPYING b/COPYING
index 670c30d5d..0f0e3f68f 100644
--- a/COPYING
+++ b/COPYING
@@ -16,11 +16,8 @@ Comment:
  for the project has always been GPL-2+, so we cannot be sure that contributors
  meant to grant additional permissions.
  .
- Translation files are considered to generally be GPL-2+,
- but they also include strings used by methods/rsh.cc which appears to be GPL-2.
- As the translations are split into separate domains later on,
- these strings are not loaded by library users outside of apt
- (they are in the 'apt' translation domain).
+ Translation files are also considered to generally be GPL-2+,
+ but they might include strings used in code with other licenses.
  .
  The apt-pkg/contrib/fileutl.cc file states "RunScripts()" is "GPLv2".
  We believe that this was not meant to exclude later versions of the GPL,
@@ -56,23 +53,6 @@ Files: methods/connect.c
 Copyright: Copyright (c) 1996 - 2023, Daniel Stenberg, <daniel@haxx.se>, and many contributors
 License: GPL-2+ and curl
 
-Files: methods/rsh.cc
-Copyright: 2000 Ben Collins <bcollins@debian.org>
-License: GPL-2
-Comment:
- This file stated:
- Licensed under the GNU General Public License v2 [no exception clauses]
- .
- We believe that this was intended to be not a statement against future
- versions of the GPL, but meant to exclude the Qt license exception in
- place in APT until that time.
- .
- We received permission from Ben in 2021 to relicense under GPL-2+,
- contributions from Adam Heath and Daniel Hartwig may still have to
- be considered GPL-2 for the time being.
- .
- Other contributions are GPL-2+
-
 Files: CMake/FindBerkeley.cmake
 Copyright: 2006, Alexander Dymo, <adymo@kdevelop.org>
            2016, Julian Andres Klode <jak@debian.org>
diff --git a/README.md b/README.md
index b2a0fdb2b..58c349713 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,6 @@ Included tools are:
   as well as available packages
 * **apt-cdrom** to use removable media as a source for packages
 * **apt-config** as an interface to the configuration settings
-* **apt-key** as an interface to manage authentication keys
 * **apt-extracttemplates** to be used by debconf to prompt for configuration
   questions before installation
 * **apt-ftparchive** creates Packages and other index files
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 69644883b..afd81b944 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -727,8 +727,8 @@ class APT_HIDDEN NoActionItem final : public pkgAcquire::Item		/*{{{*/
 {
    IndexTarget const Target;
    public:
-   virtual std::string DescURI() const APT_OVERRIDE {return Target.URI;};
-   virtual HashStringList GetExpectedHashes()  const APT_OVERRIDE {return HashStringList();};
+   [[nodiscard]] std::string DescURI() const override {return Target.URI;};
+   [[nodiscard]] HashStringList GetExpectedHashes() const override {return {};};
 
    NoActionItem(pkgAcquire * const Owner, IndexTarget const &Target) :
       pkgAcquire::Item(Owner), Target(Target)
@@ -751,8 +751,8 @@ class APT_HIDDEN CleanupItem final : public pkgAcqTransactionItem	/*{{{*/
    even if the lists-cleanup is deactivated. */
 {
    public:
-   virtual std::string DescURI() const APT_OVERRIDE {return Target.URI;};
-   virtual HashStringList GetExpectedHashes()  const APT_OVERRIDE {return HashStringList();};
+   [[nodiscard]] std::string DescURI() const override {return Target.URI;};
+   [[nodiscard]] HashStringList GetExpectedHashes() const override {return {};};
 
    CleanupItem(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager, IndexTarget const &Target) :
       pkgAcqTransactionItem(Owner, TransactionManager, Target)
@@ -760,7 +760,7 @@ class APT_HIDDEN CleanupItem final : public pkgAcqTransactionItem	/*{{{*/
       Status = StatDone;
       DestFile = GetFinalFileNameFromURI(Target.URI);
    }
-   bool TransactionState(TransactionStates const state) APT_OVERRIDE
+   bool TransactionState(TransactionStates const state) override
    {
       switch (state)
       {
diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 70620163a..5861d48be 100644
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -212,7 +212,7 @@ class APT_PUBLIC pkgAcquire::Item : public WeakPointable				/*{{{*/
     *  \sa pkgAcqMethod
     */
    virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf);
+		     pkgAcquire::MethodConfig const *const Cnf);
 
    /** \brief Invoked when the worker starts to fetch this object.
     *
@@ -372,7 +372,7 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item		/*{{{*/
    protected:
    HashStringList GetExpectedHashesFor(std::string const &MetaKey) const;
 
-   bool QueueURI(pkgAcquire::ItemDesc &Item) APT_OVERRIDE;
+   bool QueueURI(pkgAcquire::ItemDesc &Item) override;
 
    public:
    IndexTarget const Target;
@@ -390,14 +390,14 @@ class APT_HIDDEN pkgAcqTransactionItem: public pkgAcquire::Item		/*{{{*/
    };
    virtual bool TransactionState(TransactionStates const state);
 
-   virtual std::string DescURI() const APT_OVERRIDE { return Target.URI; }
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual std::string GetMetaKey() const;
-   virtual bool HashesRequired() const APT_OVERRIDE;
-   virtual bool AcquireByHash() const;
+   [[nodiscard]] std::string DescURI() const override { return Target.URI; }
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] virtual std::string GetMetaKey() const;
+   [[nodiscard]] bool HashesRequired() const override;
+   [[nodiscard]] virtual bool AcquireByHash() const;
 
    pkgAcqTransactionItem(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager, IndexTarget const &Target) APT_NONNULL(2, 3);
-   virtual ~pkgAcqTransactionItem();
+   ~pkgAcqTransactionItem() override;
 
    friend class pkgAcqMetaBase;
    friend class pkgAcqMetaClearSig;
@@ -428,7 +428,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
    /** \brief Queue the downloaded Signature for verification */
    void QueueForSignatureVerify(pkgAcqTransactionItem * const I, std::string const &File, std::string const &Signature);
 
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
+   [[nodiscard]] std::string Custom600Headers() const override;
 
    /** \brief Called when authentication succeeded.
     *
@@ -452,7 +452,7 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
     */
    bool VerifyVendor(std::string const &Message);
 
-   virtual bool TransactionState(TransactionStates const state) APT_OVERRIDE;
+   bool TransactionState(TransactionStates state) override;
 
  public:
    // This refers more to the Transaction-Manager than the actual file
@@ -460,9 +460,9 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
    TransactionStates State;
    std::string BaseURI;
 
-   virtual bool QueueURI(pkgAcquire::ItemDesc &Item) APT_OVERRIDE;
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual bool HashesRequired() const APT_OVERRIDE;
+   bool QueueURI(pkgAcquire::ItemDesc &Item) override;
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] bool HashesRequired() const override;
 
    // transaction code
    void Add(pkgAcqTransactionItem * const I);
@@ -480,11 +480,11 @@ class APT_HIDDEN pkgAcqMetaBase : public pkgAcqTransactionItem		/*{{{*/
    void TransactionStageRemoval(pkgAcqTransactionItem * const I, const std::string &FinalFile);
 
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
 
    pkgAcqMetaBase(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
 		  IndexTarget const &DataTarget) APT_NONNULL(2, 3);
-   virtual ~pkgAcqMetaBase();
+   ~pkgAcqMetaBase() override;
 };
 									/*}}}*/
 /** \brief An item that is responsible for downloading the meta-index	{{{
@@ -507,17 +507,17 @@ class APT_HIDDEN pkgAcqMetaIndex : public pkgAcqMetaBase
    void Init(std::string const &URIDesc, std::string const &ShortDesc);
 
    public:
-   virtual std::string DescURI() const APT_OVERRIDE;
+   [[nodiscard]] std::string DescURI() const override;
 
    // Specialized action members
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+		     pkgAcquire::MethodConfig const *Cnf) override;
 
    /** \brief Create a new pkgAcqMetaIndex. */
    pkgAcqMetaIndex(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
 		   IndexTarget const &DataTarget, IndexTarget const &DetachedSigTarget) APT_NONNULL(2, 3);
-   virtual ~pkgAcqMetaIndex();
+   ~pkgAcqMetaIndex() override;
 
    friend class pkgAcqMetaSig;
 };
@@ -542,21 +542,21 @@ class APT_HIDDEN pkgAcqMetaSig final : public pkgAcqTransactionItem
    protected:
 
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
 
    public:
-   virtual bool HashesRequired() const APT_OVERRIDE { return false; }
+   [[nodiscard]] bool HashesRequired() const override { return false; }
 
    // Specialized action members
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+		     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
 
    /** \brief Create a new pkgAcqMetaSig. */
    pkgAcqMetaSig(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
 	 IndexTarget const &Target, pkgAcqMetaIndex * const MetaIndex) APT_NONNULL(2, 3, 5);
-   virtual ~pkgAcqMetaSig();
+   ~pkgAcqMetaSig() override;
 };
 									/*}}}*/
 /** \brief An item responsible for downloading clearsigned metaindexes	{{{*/
@@ -570,12 +570,12 @@ class APT_HIDDEN pkgAcqMetaClearSig final : public pkgAcqMetaIndex
    metaIndex *MetaIndexParser;
    metaIndex *LastMetaIndexParser;
 
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
-   virtual bool VerifyDone(std::string const &Message, pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Finished() APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
+   bool VerifyDone(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+		     pkgAcquire::MethodConfig const *Cnf) override;
+   void Finished() override;
 
    /** \brief Starts downloading the individual index files.
     *
@@ -593,7 +593,7 @@ class APT_HIDDEN pkgAcqMetaClearSig final : public pkgAcqMetaIndex
 		IndexTarget const &DetachedDataTarget,
 		IndexTarget const &DetachedSigTarget,
 		metaIndex * const MetaIndexParser);
-   virtual ~pkgAcqMetaClearSig();
+   ~pkgAcqMetaClearSig() override;
 };
 									/*}}}*/
 /** \brief Common base class for all classes that deal with fetching indexes	{{{*/
@@ -603,12 +603,12 @@ class APT_HIDDEN pkgAcqBaseIndex : public pkgAcqTransactionItem
 
  public:
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
 
    pkgAcqBaseIndex(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
                    IndexTarget const &Target) APT_NONNULL(2, 3);
-   virtual ~pkgAcqBaseIndex();
+   ~pkgAcqBaseIndex() override;
 };
 									/*}}}*/
 /** \brief An acquire item that is responsible for fetching an index	{{{
@@ -660,22 +660,22 @@ class APT_HIDDEN pkgAcqIndex : public pkgAcqBaseIndex
    void InitByHashIfNeeded();
 
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
 
-   virtual bool TransactionState(TransactionStates const state) APT_OVERRIDE;
+   bool TransactionState(TransactionStates state) override;
 
    public:
    // Specialized action members
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Desc.URI;};
-   virtual std::string GetMetaKey() const APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+		     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
+   [[nodiscard]] std::string DescURI() const override { return Desc.URI; };
+   [[nodiscard]] std::string GetMetaKey() const override;
 
    pkgAcqIndex(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
                IndexTarget const &Target, bool const Derived = false) APT_NONNULL(2, 3);
-   virtual ~pkgAcqIndex();
+   ~pkgAcqIndex() override;
 
    protected:
    APT_HIDDEN void Init(std::string const &URI, std::string const &URIDesc,
@@ -719,19 +719,20 @@ class APT_HIDDEN pkgAcqDiffIndex final : public pkgAcqIndex
    bool Debug;
 
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
 
-   virtual bool QueueURI(pkgAcquire::ItemDesc &Item) APT_OVERRIDE;
+   bool QueueURI(pkgAcquire::ItemDesc &Item) override;
 
-   virtual bool TransactionState(TransactionStates const state) APT_OVERRIDE;
- public:
+   bool TransactionState(TransactionStates state) override;
+
+   public:
    // Specialized action members
-   virtual void Failed(std::string const &Message, pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual bool VerifyDone(std::string const &Message, pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Target.URI + "Index";};
-   virtual std::string GetMetaKey() const APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   bool VerifyDone(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+		     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string DescURI() const override { return Target.URI + "Index"; };
+   [[nodiscard]] std::string GetMetaKey() const override;
 
    /** \brief Parse the Index file for a set of Packages diffs.
     *
@@ -757,7 +758,7 @@ class APT_HIDDEN pkgAcqDiffIndex final : public pkgAcqIndex
     */
    pkgAcqDiffIndex(pkgAcquire * const Owner, pkgAcqMetaClearSig * const TransactionManager,
                    IndexTarget const &Target) APT_NONNULL(2, 3);
-   virtual ~pkgAcqDiffIndex();
+   ~pkgAcqDiffIndex() override;
  private:
    APT_HIDDEN void QueueOnIMSHit() const;
 };
@@ -810,14 +811,14 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs final : public pkgAcqBaseIndex
     *  This method will fall back to downloading the whole index file
     *  outright; its arguments are ignored.
     */
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-	 pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Target.URI + "Index";};
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual bool HashesRequired() const APT_OVERRIDE;
-   virtual bool AcquireByHash() const APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+	     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
+   [[nodiscard]] std::string DescURI() const override { return Target.URI + "Index"; };
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] bool HashesRequired() const override;
+   [[nodiscard]] bool AcquireByHash() const override;
 
    /** \brief Create an index merge-diff item.
     *
@@ -834,7 +835,7 @@ class APT_HIDDEN pkgAcqIndexMergeDiffs final : public pkgAcqBaseIndex
    pkgAcqIndexMergeDiffs(pkgAcquire *const Owner, pkgAcqMetaClearSig *const TransactionManager,
 			 IndexTarget const &Target, DiffInfo const &patch,
 			 std::vector<pkgAcqIndexMergeDiffs *> const *const allPatches) APT_NONNULL(2, 3, 6);
-   virtual ~pkgAcqIndexMergeDiffs();
+   ~pkgAcqIndexMergeDiffs() override;
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching server-merge patches {{{
@@ -910,15 +911,15 @@ class APT_HIDDEN pkgAcqIndexDiffs final : public pkgAcqBaseIndex
     *  This method will fall back to downloading the whole index file
     *  outright; its arguments are ignored.
     */
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
 
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Target.URI + "IndexDiffs";};
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual bool HashesRequired() const APT_OVERRIDE;
-   virtual bool AcquireByHash() const APT_OVERRIDE;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+	     pkgAcquire::MethodConfig const * Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
+   [[nodiscard]] std::string DescURI() const override { return Target.URI + "IndexDiffs"; };
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] bool HashesRequired() const override;
+   [[nodiscard]] bool AcquireByHash() const override;
 
    /** \brief Create an index diff item.
     *
@@ -936,7 +937,7 @@ class APT_HIDDEN pkgAcqIndexDiffs final : public pkgAcqBaseIndex
    pkgAcqIndexDiffs(pkgAcquire *const Owner, pkgAcqMetaClearSig *const TransactionManager,
 		    IndexTarget const &Target,
 		    std::vector<DiffInfo> const &diffs = std::vector<DiffInfo>()) APT_NONNULL(2, 3);
-   virtual ~pkgAcqIndexDiffs();
+   ~pkgAcqIndexDiffs() override;
 };
 									/*}}}*/
 /** \brief An item that is responsible for fetching a package file.	{{{
@@ -979,19 +980,18 @@ class APT_PUBLIC pkgAcqArchive : public pkgAcquire::Item
    bool QueueNext();
 
    /** \brief Get the full pathname of the final file for the current URI */
-   virtual std::string GetFinalFilename() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetFinalFilename() const override;
 
    public:
-
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &Hashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE;
-   virtual std::string ShortDesc() const APT_OVERRIDE;
-   virtual void Finished() APT_OVERRIDE;
-   virtual bool IsTrusted() const APT_OVERRIDE;
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual bool HashesRequired() const APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const * Cnf) override;
+   void Done(std::string const &Message, HashStringList const &Hashes,
+	     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string DescURI() const override;
+   [[nodiscard]] std::string ShortDesc() const override;
+   void Finished() override;
+   [[nodiscard]] bool IsTrusted() const override;
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] bool HashesRequired() const override;
 
    /** \brief Create a new pkgAcqArchive.
     *
@@ -1014,7 +1014,7 @@ class APT_PUBLIC pkgAcqArchive : public pkgAcquire::Item
    pkgAcqArchive(pkgAcquire * const Owner,pkgSourceList * const Sources,
 		 pkgRecords * const Recs,pkgCache::VerIterator const &Version,
 		 std::string &StoreFilename);
-   virtual ~pkgAcqArchive();
+   ~pkgAcqArchive() override;
 };
 									/*}}}*/
 /** \brief Retrieve the changelog for the given version			{{{
@@ -1033,14 +1033,14 @@ class APT_PUBLIC pkgAcqChangelog : public pkgAcquire::Item
    public:
    // we will never have hashes for changelogs.
    // If you need verified ones, download the deb and extract the changelog.
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE { return HashStringList(); }
-   virtual bool HashesRequired() const APT_OVERRIDE { return false; }
+   [[nodiscard]] HashStringList GetExpectedHashes() const override { return {}; }
+   [[nodiscard]] bool HashesRequired() const override { return false; }
 
    // Specialized action members
-   virtual void Failed(std::string const &Message,pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &CalcHashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Desc.URI;};
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const *Cnf) override;
+   void Done(std::string const &Message, HashStringList const &CalcHashes,
+	     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string DescURI() const override { return Desc.URI; };
 
    /** returns the URI to the changelog of this version
     *
@@ -1126,7 +1126,7 @@ class APT_PUBLIC pkgAcqChangelog : public pkgAcquire::Item
 	 char const * const SrcName, char const * const SrcVersion,
 	 std::string const &DestDir="", std::string const &DestFilename="");
 
-   virtual ~pkgAcqChangelog();
+   ~pkgAcqChangelog() override;
 
 private:
    APT_HIDDEN void Init(std::string const &DestDir, std::string const &DestFilename);
@@ -1147,14 +1147,14 @@ class APT_PUBLIC pkgAcqFile : public pkgAcquire::Item
 
    HashStringList const ExpectedHashes;
    public:
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE;
-   virtual bool HashesRequired() const APT_OVERRIDE;
+   [[nodiscard]] HashStringList GetExpectedHashes() const override;
+   [[nodiscard]] bool HashesRequired() const override;
 
    // Specialized action members
-   virtual void Done(std::string const &Message, HashStringList const &CalcHashes,
-		     pkgAcquire::MethodConfig const * const Cnf) APT_OVERRIDE;
-   virtual std::string DescURI() const APT_OVERRIDE {return Desc.URI;};
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
+   void Done(std::string const &Message, HashStringList const &CalcHashes,
+	     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string DescURI() const override { return Desc.URI; };
+   [[nodiscard]] std::string Custom600Headers() const override;
 
    /** \brief Create a new pkgAcqFile object.
     *
@@ -1191,7 +1191,7 @@ class APT_PUBLIC pkgAcqFile : public pkgAcquire::Item
 	      std::string const &Desc, std::string const &ShortDesc,
 	      std::string const &DestDir="", std::string const &DestFilename="",
 	      bool const IsIndexFile=false);
-   virtual ~pkgAcqFile();
+   ~pkgAcqFile() override;
 };
 									/*}}}*/
 class APT_HIDDEN pkgAcqAuxFile final : public pkgAcqFile		/*{{{*/
@@ -1201,16 +1201,16 @@ class APT_HIDDEN pkgAcqAuxFile final : public pkgAcqFile		/*{{{*/
    unsigned long long MaximumSize;
 
    public:
-   virtual void Failed(std::string const &Message, pkgAcquire::MethodConfig const *const Cnf) APT_OVERRIDE;
-   virtual void Done(std::string const &Message, HashStringList const &CalcHashes,
-		     pkgAcquire::MethodConfig const *const Cnf) APT_OVERRIDE;
-   virtual std::string Custom600Headers() const APT_OVERRIDE;
-   virtual void Finished() APT_OVERRIDE;
+   void Failed(std::string const &Message, pkgAcquire::MethodConfig const * Cnf) override;
+   void Done(std::string const &Message, HashStringList const &CalcHashes,
+	     pkgAcquire::MethodConfig const *Cnf) override;
+   [[nodiscard]] std::string Custom600Headers() const override;
+   void Finished() override;
 
    pkgAcqAuxFile(pkgAcquire::Item *const Owner, pkgAcquire::Worker *const Worker,
 		 std::string const &ShortDesc, std::string const &Desc, std::string const &URI,
 		 HashStringList const &Hashes, unsigned long long const MaximumSize);
-   virtual ~pkgAcqAuxFile();
+   ~pkgAcqAuxFile() override;
 };
 									/*}}}*/
 /** @} */
diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 387d0984d..bad0935d6 100644
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -102,7 +102,7 @@ class APT_PUBLIC pkgAcqMethod
    bool MediaFail(std::string Required,std::string Drive);
    virtual void Exit() {};
 
-   APT_DEPRECATED_MSG("Use SendMessage instead") void PrintStatus(char const * const header, const char* Format, va_list &args) const;
+   [[deprecated("Use SendMessage instead")]] void PrintStatus(char const * const header, const char* Format, va_list &args) const;
 
    public:
    enum CnfFlags
diff --git a/apt-pkg/algorithms.h b/apt-pkg/algorithms.h
index 558beecd3..038015049 100644
--- a/apt-pkg/algorithms.h
+++ b/apt-pkg/algorithms.h
@@ -54,7 +54,7 @@ class APT_PUBLIC pkgSimulate : public pkgPackageManager				/*{{{*/
       pkgDepCache *Cache;
       public:
       
-      virtual VerIterator GetCandidateVer(PkgIterator const &Pkg) APT_OVERRIDE
+      VerIterator GetCandidateVer(PkgIterator const &Pkg) override
       {
 	 return (*Cache)[Pkg].CandidateVerIter(*Cache);
       }
@@ -69,11 +69,11 @@ class APT_PUBLIC pkgSimulate : public pkgPackageManager				/*{{{*/
    pkgDepCache::ActionGroup group;
 
    // The Actual installation implementation
-   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
-   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
-   virtual bool Remove(PkgIterator Pkg,bool Purge) APT_OVERRIDE;
+   bool Install(PkgIterator Pkg, std::string File) override;
+   bool Configure(PkgIterator Pkg) override;
+   bool Remove(PkgIterator Pkg, bool Purge) override;
 
-public:
+   public:
    bool Go(APT::Progress::PackageManager * progress) override;
 
 private:
diff --git a/apt-pkg/cachefilter-patterns.h b/apt-pkg/cachefilter-patterns.h
index 75784e040..1714bbb62 100644
--- a/apt-pkg/cachefilter-patterns.h
+++ b/apt-pkg/cachefilter-patterns.h
@@ -475,12 +475,7 @@ struct APT_HIDDEN VersionIsPriority : public VersionAnyMatcher
    explicit VersionIsPriority(std::string name) : name(name) {}
    bool operator()(pkgCache::VerIterator const &Ver) override
    {
-      std::string Mapping[] = {"", "required","important","standard",
-                            "optional","extra"};
-      if (Ver->Priority > 0 && Ver->Priority < APT_ARRAY_SIZE(Mapping)) {
-         return name == Mapping[Ver->Priority];
-      }
-      return false;
+      return Ver->Priority > 0 && name == pkgCache::Priority_NoL10n(Ver->Priority);
    }
 };
 
diff --git a/apt-pkg/cachefilter.h b/apt-pkg/cachefilter.h
index 4027178bf..6d5858b28 100644
--- a/apt-pkg/cachefilter.h
+++ b/apt-pkg/cachefilter.h
@@ -29,35 +29,35 @@ public:
 
 class APT_PUBLIC PackageMatcher : public Matcher {
 public:
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE = 0;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE { return (*this)(Ver.ParentPkg()); }
-   bool operator() (pkgCache::GrpIterator const &/*Grp*/) APT_OVERRIDE { return false; }
-   ~PackageMatcher() APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override = 0;
+   bool operator() (pkgCache::VerIterator const &Ver) override { return (*this)(Ver.ParentPkg()); }
+   bool operator() (pkgCache::GrpIterator const &/*Grp*/) override { return false; }
+   ~PackageMatcher() override;
 };
 
 // Generica like True, False, NOT, AND, OR				/*{{{*/
 class APT_PUBLIC TrueMatcher : public Matcher {
 public:
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override;
+   bool operator() (pkgCache::GrpIterator const &Grp) override;
+   bool operator() (pkgCache::VerIterator const &Ver) override;
 };
 
 class APT_PUBLIC FalseMatcher : public Matcher {
 public:
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override;
+   bool operator() (pkgCache::GrpIterator const &Grp) override;
+   bool operator() (pkgCache::VerIterator const &Ver) override;
 };
 
 class APT_PUBLIC NOTMatcher : public Matcher {
    Matcher * const matcher;
 public:
    explicit NOTMatcher(Matcher * const matcher);
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;
-   ~NOTMatcher() APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override;
+   bool operator() (pkgCache::GrpIterator const &Grp) override;
+   bool operator() (pkgCache::VerIterator const &Ver) override;
+   ~NOTMatcher() override;
 };
 
 class APT_PUBLIC ANDMatcher : public Matcher {
@@ -71,10 +71,10 @@ public:
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ANDMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ANDMatcher& AND(Matcher * const matcher);
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;
-   ~ANDMatcher() APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override;
+   bool operator() (pkgCache::GrpIterator const &Grp) override;
+   bool operator() (pkgCache::VerIterator const &Ver) override;
+   ~ANDMatcher() override;
 };
 class APT_PUBLIC ORMatcher : public Matcher {
    std::vector<Matcher *> matchers;
@@ -87,28 +87,28 @@ public:
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4);
    ORMatcher(Matcher * const matcher1, Matcher * const matcher2, Matcher * const matcher3, Matcher * const matcher4, Matcher * const matcher5);
    ORMatcher& OR(Matcher * const matcher);
-   bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-   bool operator() (pkgCache::VerIterator const &Ver) APT_OVERRIDE;
-   ~ORMatcher() APT_OVERRIDE;
+   bool operator() (pkgCache::PkgIterator const &Pkg) override;
+   bool operator() (pkgCache::GrpIterator const &Grp) override;
+   bool operator() (pkgCache::VerIterator const &Ver) override;
+   ~ORMatcher() override;
 };
 									/*}}}*/
 class APT_PUBLIC PackageNameMatchesRegEx : public PackageMatcher {			/*{{{*/
 	regex_t* pattern;
 public:
 	explicit PackageNameMatchesRegEx(std::string const &Pattern);
-	bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-	bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-	~PackageNameMatchesRegEx() APT_OVERRIDE;
+	bool operator() (pkgCache::PkgIterator const &Pkg) override;
+	bool operator() (pkgCache::GrpIterator const &Grp) override;
+	~PackageNameMatchesRegEx() override;
 };
 									/*}}}*/
 class APT_PUBLIC PackageNameMatchesFnmatch : public PackageMatcher {		/*{{{*/
 	const std::string Pattern;
 public:
 	explicit PackageNameMatchesFnmatch(std::string const &Pattern);
-	bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-	bool operator() (pkgCache::GrpIterator const &Grp) APT_OVERRIDE;
-	~PackageNameMatchesFnmatch() APT_OVERRIDE = default;
+	bool operator() (pkgCache::PkgIterator const &Pkg) override;
+	bool operator() (pkgCache::GrpIterator const &Grp) override;
+	~PackageNameMatchesFnmatch() override = default;
 };
 									/*}}}*/
 class APT_PUBLIC PackageArchitectureMatchesSpecification : public PackageMatcher {	/*{{{*/
@@ -134,8 +134,8 @@ public:
 	PackageArchitectureMatchesSpecification(std::string const &pattern, bool const isPattern = true);
 	bool operator() (char const * const &arch);
 	using PackageMatcher::operator();
-	bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-	~PackageArchitectureMatchesSpecification() APT_OVERRIDE;
+	bool operator() (pkgCache::PkgIterator const &Pkg) override;
+	~PackageArchitectureMatchesSpecification() override;
 };
 									/*}}}*/
 class APT_PUBLIC PackageIsNewInstall : public PackageMatcher {			/*{{{*/
@@ -143,8 +143,8 @@ class APT_PUBLIC PackageIsNewInstall : public PackageMatcher {			/*{{{*/
 public:
 	explicit PackageIsNewInstall(pkgCacheFile * const Cache);
 	using PackageMatcher::operator();
-	bool operator() (pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-	~PackageIsNewInstall() APT_OVERRIDE;
+	bool operator() (pkgCache::PkgIterator const &Pkg) override;
+	~PackageIsNewInstall() override;
 };
 									/*}}}*/
 
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index 9ed5c1719..31ce1b295 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -177,8 +177,8 @@ class APT_PUBLIC pkgCache::PkgIterator: public Iterator<Package, PkgIterator> {
 	OkState State() const APT_PURE;
 	const char *CurVersion() const APT_PURE;
 
-	//Nice printable representation
-	APT_DEPRECATED_MSG("Use APT::PrettyPkg instead") friend std::ostream& operator <<(std::ostream& out, PkgIterator i);
+	// for a nice printable representation you likely want APT::PrettyPkg instead
+	friend std::ostream& operator<<(std::ostream& out, PkgIterator i);
 	std::string FullName(bool const &Pretty = false) const;
 
 	// Constructors
@@ -364,8 +364,8 @@ class APT_PUBLIC pkgCache::DepIterator : public Iterator<Dependency, DepIterator
 		S2 = static_cast<DependencyData *>(newMap) + (S2 - static_cast<DependencyData const *>(oldMap));
 	}
 
-	//Nice printable representation
-	APT_DEPRECATED_MSG("Use APT::PrettyDep instead") friend std::ostream& operator <<(std::ostream& out, DepIterator D);
+	// for a nice printable representation you likely want APT::PrettyDep instead
+	friend std::ostream& operator<<(std::ostream& out, DepIterator D);
 
 	inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
 		Iterator<Dependency, DepIterator>(Owner, Trg), Type(DepVer), S2(Trg == 0 ? Owner.DepDataP : (Owner.DepDataP + Trg->DependencyData)) {
diff --git a/apt-pkg/cacheset.h b/apt-pkg/cacheset.h
index 1c67a65d6..f3f3e967f 100644
--- a/apt-pkg/cacheset.h
+++ b/apt-pkg/cacheset.h
@@ -366,13 +366,13 @@ public:									/*{{{*/
 	typedef typename Container::size_type size_type;
 	typedef typename Container::allocator_type allocator_type;
 
-	bool insert(pkgCache::PkgIterator const &P) APT_OVERRIDE { if (P.end() == true) return false; _cont.insert(P); return true; }
+	bool insert(pkgCache::PkgIterator const &P) override { if (P.end() == true) return false; _cont.insert(P); return true; }
 	template<class Cont> void insert(PackageContainer<Cont> const &pkgcont) { _cont.insert((typename Cont::const_iterator)pkgcont.begin(), (typename Cont::const_iterator)pkgcont.end()); }
 	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }
 
-	bool empty() const APT_OVERRIDE { return _cont.empty(); }
-	void clear() APT_OVERRIDE { return _cont.clear(); }
-	size_t size() const APT_OVERRIDE { return _cont.size(); }
+	[[nodiscard]] bool empty() const override { return _cont.empty(); }
+	void clear() override { return _cont.clear(); }
+	[[nodiscard]] size_t size() const override { return _cont.size(); }
 #if __GNUC__ >= 5 || (__GNUC_MINOR__ >= 9 && __GNUC__ >= 4)
 	iterator erase( const_iterator pos ) { return iterator(_cont.erase(pos._iter)); }
 	iterator erase( const_iterator first, const_iterator last ) { return iterator(_cont.erase(first._iter, last._iter)); }
@@ -658,9 +658,8 @@ public:
 	typedef const_iterator::difference_type difference_type;
 	typedef std::make_unsigned<const_iterator::difference_type>::type size_type;
 
-
-	bool empty() const APT_OVERRIDE { return false; }
-	size_t size() const APT_OVERRIDE { return _cont->Head().PackageCount; }
+	[[nodiscard]] bool empty() const override { return false; }
+	[[nodiscard]] size_t size() const override { return _cont->Head().PackageCount; }
 
 	const_iterator begin() const { return const_iterator(_cont->PkgBegin()); }
 	const_iterator end() const { return const_iterator(_cont->PkgEnd()); }
@@ -676,11 +675,11 @@ public:
 	virtual ~PackageUniverse();
 
 private:
-	APT_HIDDEN bool insert(pkgCache::PkgIterator const &) APT_OVERRIDE { return true; }
+	APT_HIDDEN bool insert(pkgCache::PkgIterator const &/*P*/) override { return true; }
 	template<class Cont> APT_HIDDEN void insert(PackageContainer<Cont> const &) { }
 	APT_HIDDEN void insert(const_iterator, const_iterator) { }
 
-	APT_HIDDEN void clear() APT_OVERRIDE { }
+	APT_HIDDEN void clear() override { }
 	APT_HIDDEN iterator erase( const_iterator pos );
 	APT_HIDDEN iterator erase( const_iterator first, const_iterator last );
 };
@@ -821,12 +820,12 @@ public:									/*{{{*/
 	typedef typename Container::size_type size_type;
 	typedef typename Container::allocator_type allocator_type;
 
-	bool insert(pkgCache::VerIterator const &V) APT_OVERRIDE { if (V.end() == true) return false; _cont.insert(V); return true; }
+	bool insert(pkgCache::VerIterator const &V) override { if (V.end() == true) return false; _cont.insert(V); return true; }
 	template<class Cont> void insert(VersionContainer<Cont> const &vercont) { _cont.insert((typename Cont::const_iterator)vercont.begin(), (typename Cont::const_iterator)vercont.end()); }
 	void insert(const_iterator begin, const_iterator end) { _cont.insert(begin, end); }
-	bool empty() const APT_OVERRIDE { return _cont.empty(); }
-	void clear() APT_OVERRIDE { return _cont.clear(); }
-	size_t size() const APT_OVERRIDE { return _cont.size(); }
+	[[nodiscard]] bool empty() const override { return _cont.empty(); }
+	void clear() override { return _cont.clear(); }
+	[[nodiscard]] size_t size() const override { return _cont.size(); }
 #if APT_GCC_VERSION >= 0x409
 	iterator erase( const_iterator pos ) { return iterator(_cont.erase(pos._iter)); }
 	iterator erase( const_iterator first, const_iterator last ) { return iterator(_cont.erase(first._iter, last._iter)); }
diff --git a/apt-pkg/contrib/error.h b/apt-pkg/contrib/error.h
index 792232010..f61b44b87 100644
--- a/apt-pkg/contrib/error.h
+++ b/apt-pkg/contrib/error.h
@@ -367,6 +367,6 @@ private:								/*{{{*/
 APT_PUBLIC GlobalError *_GetErrorObj();
 static struct {
 	inline GlobalError* operator ->() { return _GetErrorObj(); }
-} _error APT_UNUSED;
+} _error [[maybe_unused]];
 
 #endif
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 67c5acee2..e57662abc 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1070,7 +1070,7 @@ struct APT_HIDDEN simple_buffer {							/*{{{*/
       reset();
    }
    void reset() { bufferend = bufferstart = 0; }
-   ssize_t read(void *to, unsigned long long requested_size) APT_MUSTCHECK
+   [[nodiscard]] ssize_t read(void *to, unsigned long long requested_size)
    {
       if (size() < requested_size)
 	 requested_size = size();
@@ -1080,7 +1080,7 @@ struct APT_HIDDEN simple_buffer {							/*{{{*/
 	 bufferstart = bufferend = 0;
       return requested_size;
    }
-   ssize_t write(const void *from, unsigned long long requested_size) APT_MUSTCHECK
+   [[nodiscard]] ssize_t write(const void *from, unsigned long long requested_size)
    {
       if (free() < requested_size)
 	 requested_size = free();
@@ -1298,63 +1298,63 @@ public:
    explicit BufferedWriteFileFdPrivate(FileFdPrivate *Priv) :
       FileFdPrivate(Priv->filefd), wrapped(Priv) {};
 
-   virtual APT::Configuration::Compressor get_compressor() const APT_OVERRIDE
+   [[nodiscard]] APT::Configuration::Compressor get_compressor() const override
    {
       return wrapped->get_compressor();
    }
-   virtual void set_compressor(APT::Configuration::Compressor const &compressor)  APT_OVERRIDE
+   void set_compressor(APT::Configuration::Compressor const &compressor) override
    {
       return wrapped->set_compressor(compressor);
    }
-   virtual unsigned int get_openmode() const  APT_OVERRIDE
+   [[nodiscard]] unsigned int get_openmode() const override
    {
       return wrapped->get_openmode();
    }
-   virtual void set_openmode(unsigned int openmode)  APT_OVERRIDE
+   void set_openmode(unsigned int openmode) override
    {
       return wrapped->set_openmode(openmode);
    }
-   virtual bool get_is_pipe() const  APT_OVERRIDE
+   [[nodiscard]] bool get_is_pipe() const override
    {
       return wrapped->get_is_pipe();
    }
-   virtual void set_is_pipe(bool is_pipe) APT_OVERRIDE
+   void set_is_pipe(bool is_pipe) override
    {
       FileFdPrivate::set_is_pipe(is_pipe);
       wrapped->set_is_pipe(is_pipe);
    }
-   virtual unsigned long long get_seekpos() const APT_OVERRIDE
+   [[nodiscard]] unsigned long long get_seekpos() const override
    {
       return wrapped->get_seekpos();
    }
-   virtual void set_seekpos(unsigned long long seekpos) APT_OVERRIDE
+   void set_seekpos(unsigned long long seekpos) override
    {
       return wrapped->set_seekpos(seekpos);
    }
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
+   bool InternalOpen(int const iFd, unsigned int const Mode) override
    {
       if (InternalFlush() == false)
 	 return false;
       return wrapped->InternalOpen(iFd, Mode);
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       if (InternalFlush() == false)
 	 return -1;
       return wrapped->InternalUnbufferedRead(To, Size);
 
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       return wrapped->InternalReadError();
    }
-   virtual char * InternalReadLine(char * To, unsigned long long Size) APT_OVERRIDE
+   char *InternalReadLine(char *To, unsigned long long Size) override
    {
       if (InternalFlush() == false)
 	 return nullptr;
       return wrapped->InternalReadLine(To, Size);
    }
-   virtual bool InternalFlush() APT_OVERRIDE
+   bool InternalFlush() override
    {
       while (writebuffer.empty() == false) {
 	 auto written = wrapped->InternalWrite(writebuffer.get(),
@@ -1370,7 +1370,7 @@ public:
       writebuffer.reset();
       return wrapped->InternalFlush();
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       // Optimisation: If the buffer is empty and we have more to write than
       // would fit in the buffer (or equal number of bytes), write directly.
@@ -1385,45 +1385,45 @@ public:
 
       return written;
    }
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       return wrapped->InternalWriteError();
    }
-   virtual bool InternalSeek(unsigned long long const To) APT_OVERRIDE
+   bool InternalSeek(unsigned long long const To) override
    {
       if (InternalFlush() == false)
 	 return false;
       return wrapped->InternalSeek(To);
    }
-   virtual bool InternalSkip(unsigned long long Over) APT_OVERRIDE
+   bool InternalSkip(unsigned long long Over) override
    {
       if (InternalFlush() == false)
 	 return false;
       return wrapped->InternalSkip(Over);
    }
-   virtual bool InternalTruncate(unsigned long long const Size) APT_OVERRIDE
+   bool InternalTruncate(unsigned long long const Size) override
    {
       if (InternalFlush() == false)
 	 return false;
       return wrapped->InternalTruncate(Size);
    }
-   virtual unsigned long long InternalTell() APT_OVERRIDE
+   unsigned long long InternalTell() override
    {
       if (InternalFlush() == false)
 	 return -1;
       return wrapped->InternalTell();
    }
-   virtual unsigned long long InternalSize() APT_OVERRIDE
+   unsigned long long InternalSize() override
    {
       if (InternalFlush() == false)
 	 return -1;
       return wrapped->InternalSize();
    }
-   virtual bool InternalClose(std::string const &FileName) APT_OVERRIDE
+   bool InternalClose(std::string const &FileName) override
    {
       return wrapped->InternalClose(FileName);
    }
-   virtual bool InternalAlwaysAutoClose() const APT_OVERRIDE
+   [[nodiscard]] bool InternalAlwaysAutoClose() const override
    {
       return wrapped->InternalAlwaysAutoClose();
    }
@@ -1437,7 +1437,7 @@ class APT_HIDDEN GzipFileFdPrivate: public FileFdPrivate {				/*{{{*/
 #ifdef HAVE_ZLIB
 public:
    gzFile gz;
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
+   bool InternalOpen(int const iFd, unsigned int const Mode) override
    {
       if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
 	 gz = gzdopen(iFd, "r+");
@@ -1448,11 +1448,11 @@ public:
       filefd->Flags |= FileFd::Compressed;
       return gz != nullptr;
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       return gzread(gz, To, Size);
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       int err;
       char const * const errmsg = gzerror(gz, &err);
@@ -1460,15 +1460,15 @@ public:
 	 return filefd->FileFdError("gzread: %s (%d: %s)", _("Read error"), err, errmsg);
       return FileFdPrivate::InternalReadError();
    }
-   virtual char * InternalReadLine(char * To, unsigned long long Size) APT_OVERRIDE
+   char *InternalReadLine(char *To, unsigned long long Size) override
    {
       return gzgets(gz, To, Size);
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       return gzwrite(gz,From,Size);
    }
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       int err;
       char const * const errmsg = gzerror(gz, &err);
@@ -1476,7 +1476,7 @@ public:
 	 return filefd->FileFdError("gzwrite: %s (%d: %s)", _("Write error"), err, errmsg);
       return FileFdPrivate::InternalWriteError();
    }
-   virtual bool InternalSeek(unsigned long long const To) APT_OVERRIDE
+   bool InternalSeek(unsigned long long const To) override
    {
       off_t const res = gzseek(gz, To, SEEK_SET);
       if (res != (off_t)To)
@@ -1485,7 +1485,7 @@ public:
       buffer.reset();
       return true;
    }
-   virtual bool InternalSkip(unsigned long long Over) APT_OVERRIDE
+   bool InternalSkip(unsigned long long Over) override
    {
       if (Over >= buffer.size())
       {
@@ -1505,11 +1505,11 @@ public:
       seekpos = res;
       return true;
    }
-   virtual unsigned long long InternalTell() APT_OVERRIDE
+   unsigned long long InternalTell() override
    {
       return gztell(gz) - buffer.size();
    }
-   virtual unsigned long long InternalSize() APT_OVERRIDE
+   unsigned long long InternalSize() override
    {
       unsigned long long filesize = FileFdPrivate::InternalSize();
       // only check gzsize if we are actually a gzip file, just checking for
@@ -1543,7 +1543,7 @@ public:
       }
       return size;
    }
-   virtual bool InternalClose(std::string const &FileName) APT_OVERRIDE
+   bool InternalClose(std::string const &FileName) override
    {
       if (gz == nullptr)
 	 return true;
@@ -1564,22 +1564,22 @@ class APT_HIDDEN Bz2FileFdPrivate: public FileFdPrivate {				/*{{{*/
 #ifdef HAVE_BZ2
    BZFILE* bz2;
 public:
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
-   {
-      if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
-	 bz2 = BZ2_bzdopen(iFd, "r+");
-      else if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
-	 bz2 = BZ2_bzdopen(iFd, "w");
-      else
-	 bz2 = BZ2_bzdopen(iFd, "r");
-      filefd->Flags |= FileFd::Compressed;
-      return bz2 != nullptr;
+bool InternalOpen(int const iFd, unsigned int const Mode) override
+{
+   if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
+      bz2 = BZ2_bzdopen(iFd, "r+");
+   else if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
+      bz2 = BZ2_bzdopen(iFd, "w");
+   else
+      bz2 = BZ2_bzdopen(iFd, "r");
+   filefd->Flags |= FileFd::Compressed;
+   return bz2 != nullptr;
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       return BZ2_bzread(bz2, To, Size);
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       int err;
       char const * const errmsg = BZ2_bzerror(bz2, &err);
@@ -1587,11 +1587,11 @@ public:
 	 return filefd->FileFdError("BZ2_bzread: %s %s (%d: %s)", filefd->FileName.c_str(), _("Read error"), err, errmsg);
       return FileFdPrivate::InternalReadError();
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       return BZ2_bzwrite(bz2, (void*)From, Size);
    }
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       int err;
       char const * const errmsg = BZ2_bzerror(bz2, &err);
@@ -1599,8 +1599,8 @@ public:
 	 return filefd->FileFdError("BZ2_bzwrite: %s %s (%d: %s)", filefd->FileName.c_str(), _("Write error"), err, errmsg);
       return FileFdPrivate::InternalWriteError();
    }
-   virtual bool InternalStream() const APT_OVERRIDE { return true; }
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE
+   [[nodiscard]] bool InternalStream() const override { return true; }
+   bool InternalClose(std::string const &/*FileName*/) override
    {
       if (bz2 == nullptr)
 	 return true;
@@ -1626,40 +1626,42 @@ class APT_HIDDEN Lz4FileFdPrivate: public FileFdPrivate {				/*{{{*/
    // Count of bytes that the decompressor expects to read next, or buffer size.
    size_t next_to_load = APT_BUFFER_SIZE;
 public:
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
+bool InternalOpen(int const iFd, unsigned int const Mode) override
+{
+   if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
+      return _error->Error("lz4 only supports write or read mode");
+
+   if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
    {
-      if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
-	 return _error->Error("lz4 only supports write or read mode");
+      res = LZ4F_createCompressionContext(&cctx, LZ4F_VERSION);
+      lz4_buffer.reset(LZ4F_compressBound(APT_BUFFER_SIZE, nullptr) + LZ4_HEADER_SIZE + LZ4_FOOTER_SIZE);
+   }
+   else
+   {
+      res = LZ4F_createDecompressionContext(&dctx, LZ4F_VERSION);
+      lz4_buffer.reset(APT_BUFFER_SIZE);
+   }
 
-      if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly) {
-	 res = LZ4F_createCompressionContext(&cctx, LZ4F_VERSION);
-	 lz4_buffer.reset(LZ4F_compressBound(APT_BUFFER_SIZE, nullptr)
-			  + LZ4_HEADER_SIZE + LZ4_FOOTER_SIZE);
-      } else {
-	 res = LZ4F_createDecompressionContext(&dctx, LZ4F_VERSION);
-	 lz4_buffer.reset(APT_BUFFER_SIZE);
-      }
+   filefd->Flags |= FileFd::Compressed;
 
-      filefd->Flags |= FileFd::Compressed;
+   if (LZ4F_isError(res))
+      return false;
 
-      if (LZ4F_isError(res))
-	 return false;
+   unsigned int flags = (Mode & (FileFd::WriteOnly | FileFd::ReadOnly));
+   if (backend.OpenDescriptor(iFd, flags, FileFd::None, true) == false)
+      return false;
 
-      unsigned int flags = (Mode & (FileFd::WriteOnly|FileFd::ReadOnly));
-      if (backend.OpenDescriptor(iFd, flags, FileFd::None, true) == false)
+   // Write the file header
+   if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
+   {
+      res = LZ4F_compressBegin(cctx, lz4_buffer.buffer, lz4_buffer.buffersize_max, nullptr);
+      if (LZ4F_isError(res) || backend.Write(lz4_buffer.buffer, res) == false)
 	 return false;
+   }
 
-      // Write the file header
-      if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
-      {
-	 res = LZ4F_compressBegin(cctx, lz4_buffer.buffer, lz4_buffer.buffersize_max, nullptr);
-	 if (LZ4F_isError(res) || backend.Write(lz4_buffer.buffer, res) == false)
-	    return false;
-      }
-
-      return true;
+   return true;
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       /* Keep reading as long as the compressor still wants to read */
       while (next_to_load) {
@@ -1697,13 +1699,13 @@ public:
 
       return 0;
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       char const * const errmsg = LZ4F_getErrorName(res);
 
       return filefd->FileFdError("LZ4F: %s %s (%zu: %s)", filefd->FileName.c_str(), _("Read error"), res, errmsg);
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       unsigned long long const towrite = std::min(APT_BUFFER_SIZE, Size);
 
@@ -1716,20 +1718,20 @@ public:
 
       return towrite;
    }
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       char const * const errmsg = LZ4F_getErrorName(res);
 
       return filefd->FileFdError("LZ4F: %s %s (%zu: %s)", filefd->FileName.c_str(), _("Write error"), res, errmsg);
    }
-   virtual bool InternalStream() const APT_OVERRIDE { return true; }
+   [[nodiscard]] bool InternalStream() const override { return true; }
 
-   virtual bool InternalFlush() APT_OVERRIDE
+   bool InternalFlush() override
    {
       return backend.Flush();
    }
 
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE
+   bool InternalClose(std::string const &/*FileName*/) override
    {
       /* Reset variables */
       res = 0;
@@ -1785,7 +1787,7 @@ class APT_HIDDEN ZstdFileFdPrivate : public FileFdPrivate		/*{{{*/
    size_t next_to_load = APT_BUFFER_SIZE;
 
    public:
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
+   bool InternalOpen(int const iFd, unsigned int const Mode) override
    {
       if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
 	 return _error->Error("zstd only supports write or read mode");
@@ -1814,7 +1816,7 @@ class APT_HIDDEN ZstdFileFdPrivate : public FileFdPrivate		/*{{{*/
 
       return true;
    }
-   virtual ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       /* Keep reading as long as the compressor still wants to read */
       while (true)
@@ -1872,13 +1874,13 @@ class APT_HIDDEN ZstdFileFdPrivate : public FileFdPrivate		/*{{{*/
 
       return 0;
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       char const *const errmsg = ZSTD_getErrorName(res);
 
       return filefd->FileFdError("ZSTD: %s %s (%zu: %s)", filefd->FileName.c_str(), _("Read error"), res, errmsg);
    }
-   virtual ssize_t InternalWrite(void const *const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       // Drain compressed buffer as far as possible.
       ZSTD_outBuffer out = {
@@ -1900,20 +1902,20 @@ class APT_HIDDEN ZstdFileFdPrivate : public FileFdPrivate		/*{{{*/
       return in.pos;
    }
 
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       char const *const errmsg = ZSTD_getErrorName(res);
 
       return filefd->FileFdError("ZSTD: %s %s (%zu: %s)", filefd->FileName.c_str(), _("Write error"), res, errmsg);
    }
-   virtual bool InternalStream() const APT_OVERRIDE { return true; }
+   [[nodiscard]] bool InternalStream() const override { return true; }
 
-   virtual bool InternalFlush() APT_OVERRIDE
+   bool InternalFlush() override
    {
       return backend.Flush();
    }
 
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE
+   bool InternalClose(std::string const &/*FileName*/) override
    {
       /* Reset variables */
       res = 0;
@@ -2052,51 +2054,51 @@ class APT_HIDDEN LzmaFileFdPrivate: public FileFdPrivate {		/*{{{*/
       return 6;
    }
 public:
-   virtual bool InternalOpen(int const iFd, unsigned int const Mode) APT_OVERRIDE
-   {
-      if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
-	 return filefd->FileFdError("ReadWrite mode is not supported for lzma/xz files %s", filefd->FileName.c_str());
+bool InternalOpen(int const iFd, unsigned int const Mode) override
+{
+   if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
+      return filefd->FileFdError("ReadWrite mode is not supported for lzma/xz files %s", filefd->FileName.c_str());
 
-      if (lzma == nullptr)
-	 lzma = new LzmaFileFdPrivate::LZMAFILE(filefd);
-      if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
-	 lzma->file = fdopen(iFd, "w");
-      else
-	 lzma->file = fdopen(iFd, "r");
-      filefd->Flags |= FileFd::Compressed;
-      if (lzma->file == nullptr)
-	 return false;
+   if (lzma == nullptr)
+      lzma = new LzmaFileFdPrivate::LZMAFILE(filefd);
+   if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
+      lzma->file = fdopen(iFd, "w");
+   else
+      lzma->file = fdopen(iFd, "r");
+   filefd->Flags |= FileFd::Compressed;
+   if (lzma->file == nullptr)
+      return false;
 
-      lzma_stream tmp_stream = LZMA_STREAM_INIT;
-      lzma->stream = tmp_stream;
+   lzma_stream tmp_stream = LZMA_STREAM_INIT;
+   lzma->stream = tmp_stream;
 
-      if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
+   if ((Mode & FileFd::WriteOnly) == FileFd::WriteOnly)
+   {
+      uint32_t const xzlevel = findXZlevel(compressor.CompressArgs);
+      if (compressor.Name == "xz")
       {
-	 uint32_t const xzlevel = findXZlevel(compressor.CompressArgs);
-	 if (compressor.Name == "xz")
-	 {
-	    if (lzma_easy_encoder(&lzma->stream, xzlevel, LZMA_CHECK_CRC64) != LZMA_OK)
-	       return false;
-	 }
-	 else
-	 {
-	    lzma_options_lzma options;
-	    lzma_lzma_preset(&options, xzlevel);
-	    if (lzma_alone_encoder(&lzma->stream, &options) != LZMA_OK)
-	       return false;
-	 }
-	 lzma->compressing = true;
+	 if (lzma_easy_encoder(&lzma->stream, xzlevel, LZMA_CHECK_CRC64) != LZMA_OK)
+	    return false;
       }
       else
       {
-	 uint64_t constexpr memlimit = 1024 * 1024 * 500;
-	 if (lzma_auto_decoder(&lzma->stream, memlimit, 0) != LZMA_OK)
+	 lzma_options_lzma options;
+	 lzma_lzma_preset(&options, xzlevel);
+	 if (lzma_alone_encoder(&lzma->stream, &options) != LZMA_OK)
 	    return false;
-	 lzma->compressing = false;
       }
-      return true;
+      lzma->compressing = true;
+   }
+   else
+   {
+      uint64_t constexpr memlimit = 1024 * 1024 * 500;
+      if (lzma_auto_decoder(&lzma->stream, memlimit, 0) != LZMA_OK)
+	 return false;
+      lzma->compressing = false;
+   }
+   return true;
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       ssize_t Res;
       if (lzma->eof == true)
@@ -2132,11 +2134,11 @@ public:
       }
       return Res;
    }
-   virtual bool InternalReadError() APT_OVERRIDE
+   bool InternalReadError() override
    {
       return filefd->FileFdError("lzma_read: %s (%d)", _("Read error"), lzma->err);
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       ssize_t Res;
       lzma->stream.next_in = (uint8_t *)From;
@@ -2165,12 +2167,12 @@ public:
       }
       return Res;
    }
-   virtual bool InternalWriteError() APT_OVERRIDE
+   bool InternalWriteError() override
    {
       return filefd->FileFdError("lzma_write: %s (%d)", _("Write error"), lzma->err);
    }
-   virtual bool InternalStream() const APT_OVERRIDE { return true; }
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE
+   [[nodiscard]] bool InternalStream() const override { return true; }
+   bool InternalClose(std::string const &/*FileName*/) override
    {
       delete lzma;
       lzma = nullptr;
@@ -2187,117 +2189,118 @@ class APT_HIDDEN PipedFileFdPrivate: public FileFdPrivate				/*{{{*/
    by executing a specified binary and pipe in/out what we need */
 {
 public:
-   virtual bool InternalOpen(int const, unsigned int const Mode) APT_OVERRIDE
+bool InternalOpen(int const /*iFd*/, unsigned int const Mode) override
+{
+   // collect zombies here in case we reopen
+   if (compressor_pid > 0)
+      ExecWait(compressor_pid, "FileFdCompressor", true);
+
+   if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
+      return filefd->FileFdError("ReadWrite mode is not supported for file %s", filefd->FileName.c_str());
+   if (compressor.Binary == "false")
+      return filefd->FileFdError("libapt has inbuilt support for the %s compression,"
+				 " but was forced to ignore it in favor of an external binary – which isn't installed.",
+				 compressor.Name.c_str());
+
+   bool const Comp = (Mode & FileFd::WriteOnly) == FileFd::WriteOnly;
+   if (Comp == false && filefd->iFd != -1)
    {
-      // collect zombies here in case we reopen
-      if (compressor_pid > 0)
-	 ExecWait(compressor_pid, "FileFdCompressor", true);
+      // Handle 'decompression' of empty files
+      struct stat Buf;
+      if (fstat(filefd->iFd, &Buf) != 0)
+	 return filefd->FileFdErrno("fstat", "Could not stat fd %d for file %s", filefd->iFd, filefd->FileName.c_str());
+      if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false)
+	 return true;
 
-      if ((Mode & FileFd::ReadWrite) == FileFd::ReadWrite)
-	 return filefd->FileFdError("ReadWrite mode is not supported for file %s", filefd->FileName.c_str());
-      if (compressor.Binary == "false")
-	 return filefd->FileFdError("libapt has inbuilt support for the %s compression,"
-	       " but was forced to ignore it in favor of an external binary – which isn't installed.", compressor.Name.c_str());
-
-      bool const Comp = (Mode & FileFd::WriteOnly) == FileFd::WriteOnly;
-      if (Comp == false && filefd->iFd != -1)
-      {
-	 // Handle 'decompression' of empty files
-	 struct stat Buf;
-	 if (fstat(filefd->iFd, &Buf) != 0)
-	    return filefd->FileFdErrno("fstat", "Could not stat fd %d for file %s", filefd->iFd, filefd->FileName.c_str());
-	 if (Buf.st_size == 0 && S_ISFIFO(Buf.st_mode) == false)
-	    return true;
-
-	 // We don't need the file open - instead let the compressor open it
-	 // as he properly knows better how to efficiently read from 'his' file
-	 if (filefd->FileName.empty() == false)
-	 {
-	    close(filefd->iFd);
-	    filefd->iFd = -1;
-	 }
+      // We don't need the file open - instead let the compressor open it
+      // as he properly knows better how to efficiently read from 'his' file
+      if (filefd->FileName.empty() == false)
+      {
+	 close(filefd->iFd);
+	 filefd->iFd = -1;
       }
+   }
 
-      // Create a data pipe
-      int Pipe[2] = {-1,-1};
-      if (pipe(Pipe) != 0)
-	 return filefd->FileFdErrno("pipe",_("Failed to create subprocess IPC"));
-      for (int J = 0; J != 2; J++)
-	 SetCloseExec(Pipe[J],true);
+   // Create a data pipe
+   int Pipe[2] = {-1, -1};
+   if (pipe(Pipe) != 0)
+      return filefd->FileFdErrno("pipe", _("Failed to create subprocess IPC"));
+   for (int J = 0; J != 2; J++)
+      SetCloseExec(Pipe[J], true);
 
-      compressed_fd = filefd->iFd;
-      set_is_pipe(true);
+   compressed_fd = filefd->iFd;
+   set_is_pipe(true);
 
+   if (Comp == true)
+      filefd->iFd = Pipe[1];
+   else
+      filefd->iFd = Pipe[0];
+
+   // The child..
+   compressor_pid = ExecFork();
+   if (compressor_pid == 0)
+   {
       if (Comp == true)
-	 filefd->iFd = Pipe[1];
+      {
+	 dup2(compressed_fd, STDOUT_FILENO);
+	 dup2(Pipe[0], STDIN_FILENO);
+      }
       else
-	 filefd->iFd = Pipe[0];
-
-      // The child..
-      compressor_pid = ExecFork();
-      if (compressor_pid == 0)
       {
-	 if (Comp == true)
-	 {
-	    dup2(compressed_fd,STDOUT_FILENO);
-	    dup2(Pipe[0],STDIN_FILENO);
-	 }
-	 else
-	 {
-	    if (compressed_fd != -1)
-	       dup2(compressed_fd,STDIN_FILENO);
-	    dup2(Pipe[1],STDOUT_FILENO);
-	 }
-	 int const nullfd = open("/dev/null", O_WRONLY);
-	 if (nullfd != -1)
-	 {
-	    dup2(nullfd,STDERR_FILENO);
-	    close(nullfd);
-	 }
+	 if (compressed_fd != -1)
+	    dup2(compressed_fd, STDIN_FILENO);
+	 dup2(Pipe[1], STDOUT_FILENO);
+      }
+      int const nullfd = open("/dev/null", O_WRONLY);
+      if (nullfd != -1)
+      {
+	 dup2(nullfd, STDERR_FILENO);
+	 close(nullfd);
+      }
 
-	 SetCloseExec(STDOUT_FILENO,false);
-	 SetCloseExec(STDIN_FILENO,false);
-
-	 std::vector<char const*> Args;
-	 Args.push_back(compressor.Binary.c_str());
-	 std::vector<std::string> const * const addArgs =
-	    (Comp == true) ? &(compressor.CompressArgs) : &(compressor.UncompressArgs);
-	 for (std::vector<std::string>::const_iterator a = addArgs->begin();
-	       a != addArgs->end(); ++a)
-	    Args.push_back(a->c_str());
-	 if (Comp == false && filefd->FileName.empty() == false)
-	 {
-	    // commands not needing arguments, do not need to be told about using standard output
-	    // in reality, only testcases with tools like cat, rev, rot13, … are able to trigger this
-	    if (compressor.CompressArgs.empty() == false && compressor.UncompressArgs.empty() == false)
-	       Args.push_back("--stdout");
-	    if (filefd->TemporaryFileName.empty() == false)
-	       Args.push_back(filefd->TemporaryFileName.c_str());
-	    else
-	       Args.push_back(filefd->FileName.c_str());
-	 }
-	 Args.push_back(NULL);
+      SetCloseExec(STDOUT_FILENO, false);
+      SetCloseExec(STDIN_FILENO, false);
 
-	 execvp(Args[0],(char **)&Args[0]);
-	 cerr << _("Failed to exec compressor ") << Args[0] << endl;
-	 _exit(100);
+      std::vector<char const *> Args;
+      Args.push_back(compressor.Binary.c_str());
+      std::vector<std::string> const *const addArgs =
+	 (Comp == true) ? &(compressor.CompressArgs) : &(compressor.UncompressArgs);
+      for (std::vector<std::string>::const_iterator a = addArgs->begin();
+	   a != addArgs->end(); ++a)
+	 Args.push_back(a->c_str());
+      if (Comp == false && filefd->FileName.empty() == false)
+      {
+	 // commands not needing arguments, do not need to be told about using standard output
+	 // in reality, only testcases with tools like cat, rev, rot13, … are able to trigger this
+	 if (compressor.CompressArgs.empty() == false && compressor.UncompressArgs.empty() == false)
+	    Args.push_back("--stdout");
+	 if (filefd->TemporaryFileName.empty() == false)
+	    Args.push_back(filefd->TemporaryFileName.c_str());
+	 else
+	    Args.push_back(filefd->FileName.c_str());
       }
-      if (Comp == true)
-	 close(Pipe[0]);
-      else
-	 close(Pipe[1]);
+      Args.push_back(NULL);
 
-      return true;
+      execvp(Args[0], (char **)&Args[0]);
+      cerr << _("Failed to exec compressor ") << Args[0] << endl;
+      _exit(100);
    }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
+   if (Comp == true)
+      close(Pipe[0]);
+   else
+      close(Pipe[1]);
+
+   return true;
+   }
+   ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
    {
       return read(filefd->iFd, To, Size);
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       return write(filefd->iFd, From, Size);
    }
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE
+   bool InternalClose(std::string const &/*FileName*/) override
    {
       bool Ret = true;
       if (filefd->iFd != -1)
@@ -2317,12 +2320,12 @@ public:
 class APT_HIDDEN DirectFileFdPrivate: public FileFdPrivate				/*{{{*/
 {
 public:
-   virtual bool InternalOpen(int const, unsigned int const) APT_OVERRIDE { return true; }
-   virtual ssize_t InternalUnbufferedRead(void * const To, unsigned long long const Size) APT_OVERRIDE
-   {
-      return read(filefd->iFd, To, Size);
+bool InternalOpen(int const /*iFd*/, unsigned int const /*Mode*/) override { return true; }
+ssize_t InternalUnbufferedRead(void *const To, unsigned long long const Size) override
+{
+   return read(filefd->iFd, To, Size);
    }
-   virtual ssize_t InternalWrite(void const * const From, unsigned long long const Size) APT_OVERRIDE
+   ssize_t InternalWrite(void const *const From, unsigned long long const Size) override
    {
       // files opened read+write are strange and only really "supported" for direct files
       if (buffer.size() != 0)
@@ -2332,7 +2335,7 @@ public:
       }
       return write(filefd->iFd, From, Size);
    }
-   virtual bool InternalSeek(unsigned long long const To) APT_OVERRIDE
+   bool InternalSeek(unsigned long long const To) override
    {
       off_t const res = lseek(filefd->iFd, To, SEEK_SET);
       if (res != (off_t)To)
@@ -2341,7 +2344,7 @@ public:
       buffer.reset();
       return true;
    }
-   virtual bool InternalSkip(unsigned long long Over) APT_OVERRIDE
+   bool InternalSkip(unsigned long long Over) override
    {
       if (Over >= buffer.size())
       {
@@ -2361,7 +2364,7 @@ public:
       seekpos = res;
       return true;
    }
-   virtual bool InternalTruncate(unsigned long long const To) APT_OVERRIDE
+   bool InternalTruncate(unsigned long long const To) override
    {
       if (buffer.size() != 0)
       {
@@ -2377,16 +2380,16 @@ public:
 	 return filefd->FileFdError("Unable to truncate to %llu",To);
       return true;
    }
-   virtual unsigned long long InternalTell() APT_OVERRIDE
+   unsigned long long InternalTell() override
    {
       return lseek(filefd->iFd,0,SEEK_CUR) - buffer.size();
    }
-   virtual unsigned long long InternalSize() APT_OVERRIDE
+   unsigned long long InternalSize() override
    {
       return filefd->FileSize();
    }
-   virtual bool InternalClose(std::string const &) APT_OVERRIDE { return true; }
-   virtual bool InternalAlwaysAutoClose() const APT_OVERRIDE { return false; }
+   bool InternalClose(std::string const &/*FileName*/) override { return true; }
+   [[nodiscard]] bool InternalAlwaysAutoClose() const override { return false; }
 
    explicit DirectFileFdPrivate(FileFd * const filefd) : FileFdPrivate(filefd) {}
    virtual ~DirectFileFdPrivate() { InternalClose(""); }
diff --git a/apt-pkg/contrib/gpgv.cc b/apt-pkg/contrib/gpgv.cc
index 48d31a44c..237ddc856 100644
--- a/apt-pkg/contrib/gpgv.cc
+++ b/apt-pkg/contrib/gpgv.cc
@@ -111,8 +111,6 @@ static bool operator!=(LineBuffer const &buf, std::string_view const exp) noexce
    clear-signed files (=the complete content of the file is signed and
    the content isn't encoded) we do a divide and conquer approach here
    and split up the clear-signed file in message and signature for gpg.
-   And as a cherry on the cake, we use our apt-key wrapper to do part
-   of the lifting in regards to merging keyrings. Fun for the whole family.
 */
 #define apt_error(...) apt_msg("ERROR", __VA_ARGS__)
 #define apt_warning(...) apt_msg("WARNING", __VA_ARGS__)
@@ -290,7 +288,7 @@ void ExecGPGV(std::string const &File, std::string const &FileGPG,
    bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
    struct exiter {
       std::vector<std::string> files;
-      void operator ()(int code) APT_NORETURN {
+      [[noreturn]] void operator ()(int code) {
 	 std::for_each(files.begin(), files.end(), [](auto f)
 		       { unlink(f.c_str()); });
 	 exit(code);
diff --git a/apt-pkg/contrib/gpgv.h b/apt-pkg/contrib/gpgv.h
index 0b84f6bb7..f4f0a2ac7 100644
--- a/apt-pkg/contrib/gpgv.h
+++ b/apt-pkg/contrib/gpgv.h
@@ -47,11 +47,11 @@ APT_PUBLIC std::pair<std::string, std::forward_list<std::string>> FindGPGV(bool
  * @param fd is used as a pipe for the standard output of gpgv
  * @param key is the specific one to be used instead of using all
  */
-APT_PUBLIC void ExecGPGV(std::string const &File, std::string const &FileSig,
-			 int const &statusfd, int fd[2], std::vector<std::string> const &KeyFiles) APT_NORETURN;
-APT_PUBLIC void ExecGPGV(std::string const &File, std::string const &FileSig,
-      int const &statusfd, int fd[2], std::string const &Key = "") APT_NORETURN;
-inline APT_NORETURN void ExecGPGV(std::string const &File, std::string const &FileSig,
+[[noreturn]] APT_PUBLIC void ExecGPGV(std::string const &File, std::string const &FileSig,
+				      int const &statusfd, int fd[2], std::vector<std::string> const &KeyFiles);
+[[noreturn]] APT_PUBLIC void ExecGPGV(std::string const &File, std::string const &FileSig,
+				      int const &statusfd, int fd[2], std::string const &Key = "");
+[[noreturn]] inline void ExecGPGV(std::string const &File, std::string const &FileSig,
       int const &statusfd = -1) {
    int fd[2];
    ExecGPGV(File, FileSig, statusfd, fd);
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index d6f9c2f98..60aba30f4 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -17,16 +17,6 @@
 #ifndef MACROS_H
 #define MACROS_H
 
-/* Useful count macro, use on an array of things and it will return the
-   number of items in the array */
-#define APT_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
-
-// Flag Macros
-#define	FLAG(f)			(1L << (f))
-#define	SETFLAG(v,f)	((v) |= FLAG(f))
-#define CLRFLAG(v,f)	((v) &=~FLAG(f))
-#define	CHKFLAG(v,f)	((v) &  FLAG(f) ? true : false)
-
 #ifdef __GNUC__
 #define APT_GCC_VERSION (__GNUC__ << 8 | __GNUC_MINOR__)
 #else
@@ -46,30 +36,20 @@
 #endif
 
 #if APT_GCC_VERSION >= 0x0300
-	#define APT_DEPRECATED	__attribute__ ((deprecated))
-	#define APT_DEPRECATED_MSG(X)	__attribute__ ((deprecated(X)))
 	// __attribute__((const)) is too dangerous for us, we end up using it wrongly
 	#define APT_PURE	__attribute__((pure))
-	#define APT_NORETURN	__attribute__((noreturn))
 	#define APT_PRINTF(n)	__attribute__((format(printf, n, n + 1)))
 	#define APT_WEAK        __attribute__((weak));
-	#define APT_UNUSED      __attribute__((unused))
 #else
-	#define APT_DEPRECATED
-	#define APT_DEPRECATED_MSG
 	#define APT_PURE
-	#define APT_NORETURN
 	#define APT_PRINTF(n)
 	#define APT_WEAK
-	#define APT_UNUSED
 #endif
 
 #if APT_GCC_VERSION > 0x0302
 	#define APT_NONNULL(...)	__attribute__((nonnull(__VA_ARGS__)))
-	#define APT_MUSTCHECK		__attribute__((warn_unused_result))
 #else
 	#define APT_NONNULL(...)
-	#define APT_MUSTCHECK
 #endif
 
 #if APT_GCC_VERSION >= 0x0400
@@ -98,21 +78,9 @@
 		_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 	#define APT_IGNORE_DEPRECATED_POP \
 		_Pragma("GCC diagnostic pop")
-	/* gcc has various problems with this shortcut, so prefer the long form */
-	#define APT_IGNORE_DEPRECATED(XXX) \
-		APT_IGNORE_DEPRECATED_PUSH \
-		XXX \
-		APT_IGNORE_DEPRECATED_POP
 #else
 	#define APT_IGNORE_DEPRECATED_PUSH
 	#define APT_IGNORE_DEPRECATED_POP
-	#define APT_IGNORE_DEPRECATED(XXX) XXX
-#endif
-
-#if __cplusplus >= 201103L
-	#define APT_OVERRIDE override
-#else
-	#define APT_OVERRIDE /* no c++11 standard */
 #endif
 
 // These lines are extracted by the makefiles and the buildsystem
@@ -135,8 +103,37 @@ struct AptScopeWrapper {
 };
 template <class F>
 AptScopeWrapper(F) -> AptScopeWrapper<F>;
-#define PASTE2(a, b) a##b
-#define PASTE(a, b) PASTE2(a, b)
-#define DEFER(lambda) AptScopeWrapper PASTE(defer, __LINE__){lambda};
+#define APT_PASTE2(a, b) a##b
+#define APT_PASTE(a, b) APT_PASTE2(a, b)
+#define DEFER(lambda) AptScopeWrapper APT_PASTE(defer, __LINE__){lambda};
 
+
+#ifndef APT_COMPILING_APT
+#if APT_PKG_ABI <= 600
+#if __cplusplus >= 201103L
+	#define APT_OVERRIDE override
+#else
+	#define APT_OVERRIDE /* no c++11 standard */
+#endif
+#define APT_ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#define	FLAG(f)			(1L << (f))
+#define	SETFLAG(v,f)	((v) |= FLAG(f))
+#define CLRFLAG(v,f)	((v) &=~FLAG(f))
+#define	CHKFLAG(v,f)	((v) &  FLAG(f) ? true : false)
+#if APT_GCC_VERSION >= 0x0300
+	#define APT_DEPRECATED	__attribute__ ((deprecated))
+	#define APT_DEPRECATED_MSG(X)	__attribute__ ((deprecated(X)))
+	#define APT_NORETURN	__attribute__((noreturn))
+	#define APT_UNUSED	__attribute__((unused))
+	#define APT_MUSTCHECK		__attribute__((warn_unused_result))
+#else
+	#define APT_DEPRECATED
+	#define APT_DEPRECATED_MSG(X)
+	#define APT_NORETURN
+	#define APT_UNUSED
+	#define APT_MUSTCHECK
+#endif
+#define APT_IGNORE_DEPRECATED(XXX) XXX
+#endif
+#endif
 #endif
diff --git a/apt-pkg/contrib/progress.h b/apt-pkg/contrib/progress.h
index d6a698af3..7721530b8 100644
--- a/apt-pkg/contrib/progress.h
+++ b/apt-pkg/contrib/progress.h
@@ -71,12 +71,12 @@ class APT_PUBLIC OpTextProgress : public OpProgress
    bool NoUpdate;
    bool NoDisplay;
    unsigned long LastLen;
-   virtual void Update() APT_OVERRIDE;
+   void Update() override;
    void Write(const char *S);
    
    public:
 
-   virtual void Done() APT_OVERRIDE;
+   void Done() override;
    
    explicit OpTextProgress(bool NoUpdate = false) : NoUpdate(NoUpdate),
                 NoDisplay(false), LastLen(0) {};
diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h
index 91f5fe44b..fdaa23766 100644
--- a/apt-pkg/contrib/strutl.h
+++ b/apt-pkg/contrib/strutl.h
@@ -56,7 +56,7 @@ namespace APT {
 APT_PUBLIC bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::string *dest);
 APT_PUBLIC char *_strstrip(char *String);
 APT_PUBLIC char *_strrstrip(char *String); // right strip only
-APT_DEPRECATED_MSG("Use SubstVar to avoid memory headaches") APT_PUBLIC char *_strtabexpand(char *String,size_t Len);
+[[deprecated("Use SubstVar to avoid memory headaches")]] APT_PUBLIC char *_strtabexpand(char *String,size_t Len);
 APT_PUBLIC bool ParseQuoteWord(const char *&String,std::string &Res);
 APT_PUBLIC bool ParseCWord(const char *&String,std::string &Res);
 APT_PUBLIC std::string QuoteString(const std::string &Str,const char *Bad);
@@ -97,8 +97,8 @@ APT_PUBLIC std::string TimeRFC1123(time_t Date, bool const NumericTimezone);
  *    parsing is successful, undefined otherwise.
  * @return \b true if parsing was successful, otherwise \b false.
  */
-APT_PUBLIC bool RFC1123StrToTime(const std::string &str,time_t &time) APT_MUSTCHECK;
-APT_PUBLIC bool FTPMDTMStrToTime(const char* const str,time_t &time) APT_MUSTCHECK;
+[[nodiscard]] APT_PUBLIC bool RFC1123StrToTime(const std::string &str,time_t &time);
+[[nodiscard, deprecated("Unused and untested in src:apt")]] APT_PUBLIC bool FTPMDTMStrToTime(const char *str, time_t &time);
 APT_PUBLIC std::string LookupTag(const std::string &Message,const char *Tag,const char *Default = 0);
 APT_PUBLIC int StringToBool(const std::string &Text,int Default = -1);
 APT_PUBLIC bool ReadMessages(int Fd, std::vector<std::string> &List);
diff --git a/apt-pkg/deb/debfile.h b/apt-pkg/deb/debfile.h
index 48a75ae55..887ee7142 100644
--- a/apt-pkg/deb/debfile.h
+++ b/apt-pkg/deb/debfile.h
@@ -56,8 +56,7 @@ class APT_PUBLIC debDebFile
 class APT_PUBLIC debDebFile::ControlExtract : public pkgDirStream
 {
    public:
-   
-   virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
+   bool DoItem(Item &Itm, int &Fd) override;
 };
 
 class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
@@ -72,9 +71,9 @@ class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
    std::string Member;
    
    // Members from DirStream
-   virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;
-   virtual bool Process(Item &Itm,const unsigned char *Data,
-			unsigned long long Size,unsigned long long Pos) APT_OVERRIDE;
+   bool DoItem(Item &Itm, int &Fd) override;
+   bool Process(Item &Itm, const unsigned char *Data,
+		unsigned long long Size, unsigned long long Pos) override;
 
    // Helpers
    bool Read(debDebFile &Deb);
@@ -82,7 +81,7 @@ class APT_PUBLIC debDebFile::MemControlExtract : public pkgDirStream
 
    MemControlExtract() : IsControl(false), Control(0), Length(0), Member("control") {};
    explicit MemControlExtract(std::string Member) : IsControl(false), Control(0), Length(0), Member(Member) {};
-   ~MemControlExtract() {delete [] Control;};   
+   ~MemControlExtract() override { delete[] Control; };
 };
 									/*}}}*/
 
diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc
index c4115e53e..306018858 100644
--- a/apt-pkg/deb/debindexfile.cc
+++ b/apt-pkg/deb/debindexfile.cc
@@ -325,7 +325,7 @@ class APT_HIDDEN debIFTypeSrc : public pkgIndexFile::Type
 class APT_HIDDEN debIFTypePkg : public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+   [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };
@@ -339,7 +339,7 @@ class APT_HIDDEN debIFTypeTrans : public debIFTypePkg
 class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+   [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
    {
       return new debRecordParser(File.FileName(),*File.Cache());
    };
@@ -348,7 +348,7 @@ class APT_HIDDEN debIFTypeStatus : public pkgIndexFile::Type
 class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const APT_OVERRIDE
+   [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &File) const override
    {
       return new debDebFileRecordParser(File.FileName());
    };
@@ -357,7 +357,7 @@ class APT_HIDDEN debIFTypeDebPkgFile : public pkgIndexFile::Type
 class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
 {
    public:
-   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const APT_OVERRIDE
+   [[nodiscard]] pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &DscFile) const override
    {
       return new debDscRecordParser(DscFile, NULL);
    };
@@ -366,7 +366,7 @@ class APT_HIDDEN debIFTypeDscFile : public pkgIndexFile::Type
 class APT_HIDDEN debIFTypeDebianSourceDir : public pkgIndexFile::Type
 {
    public:
-   virtual pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const APT_OVERRIDE
+   [[nodiscard]] pkgSrcRecords::Parser *CreateSrcPkgParser(std::string const &SourceDir) const override
    {
       return new debDscRecordParser(SourceDir + std::string("/debian/control"), NULL);
    };
diff --git a/apt-pkg/deb/debindexfile.h b/apt-pkg/deb/debindexfile.h
index 57b37385e..e9b22ff29 100644
--- a/apt-pkg/deb/debindexfile.h
+++ b/apt-pkg/deb/debindexfile.h
@@ -29,87 +29,85 @@ class debStatusIndex : public pkgDebianIndexRealFile
 {
    void * const d;
 protected:
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual std::string GetComponent() const APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] std::string GetComponent() const override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
 
 public:
 
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE {return true;};
+   [[nodiscard]] bool HasPackages() const override { return true; };
    // Abort if the file does not exist.
-   virtual bool Exists() const APT_OVERRIDE {return true;};
+   [[nodiscard]] bool Exists() const override { return true; };
 
-   virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+   pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
 
    explicit debStatusIndex(std::string const &File);
-   virtual ~debStatusIndex();
+   ~debStatusIndex() override;
 };
 
 class debPackagesIndex : public pkgDebianIndexTargetFile
 {
    void * const d;
 protected:
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
 
 public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    // Stuff for accessing files on remote items
-   virtual std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const APT_OVERRIDE;
+   [[nodiscard]] std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE {return true;};
+   [[nodiscard]] bool HasPackages() const override {return true;};
 
    debPackagesIndex(IndexTarget const &Target, bool const Trusted);
-   virtual ~debPackagesIndex();
+   ~debPackagesIndex() override;
 };
 
 class debTranslationsIndex : public pkgDebianIndexTargetFile
 {
    void * const d;
 protected:
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
-   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
+   bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+   APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
 
 public:
-
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE;
+   [[nodiscard]] bool HasPackages() const override;
 
    explicit debTranslationsIndex(IndexTarget const &Target);
-   virtual ~debTranslationsIndex();
+   ~debTranslationsIndex() override;
 };
 
 class debSourcesIndex : public pkgDebianIndexTargetFile
 {
    void * const d;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
-   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
-
-   public:
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
+   bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+   APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
 
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+public:
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    // Stuff for accessing files on remote items
-   virtual std::string SourceInfo(pkgSrcRecords::Parser const &Record,
-			     pkgSrcRecords::File const &File) const APT_OVERRIDE;
+   [[nodiscard]] std::string SourceInfo(pkgSrcRecords::Parser const &Record,
+					pkgSrcRecords::File const &File) const override;
 
    // Interface for the record parsers
-   virtual pkgSrcRecords::Parser *CreateSrcParser() const APT_OVERRIDE;
+   [[nodiscard]] pkgSrcRecords::Parser *CreateSrcParser() const override;
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE {return false;};
+   [[nodiscard]] bool HasPackages() const override { return false; };
 
    debSourcesIndex(IndexTarget const &Target, bool const Trusted);
-   virtual ~debSourcesIndex();
+   ~debSourcesIndex() override;
 };
 
 class debDebPkgFileIndex : public pkgDebianIndexRealFile
@@ -118,14 +116,14 @@ class debDebPkgFileIndex : public pkgDebianIndexRealFile
    std::string DebFile;
 
 protected:
-   virtual std::string GetComponent() const APT_OVERRIDE;
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
-   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
+   [[nodiscard]] std::string GetComponent() const override;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
+   bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+   APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
 
 public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    /** get the control (file) content of the deb file
     *
@@ -136,15 +134,15 @@ public:
    static bool GetContent(std::ostream &content, std::string const &debfile);
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE {return true;}
-   virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const APT_OVERRIDE;
+   [[nodiscard]] bool HasPackages() const override { return true; }
+   pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const override;
 
    // Interface for acquire
 
    explicit debDebPkgFileIndex(std::string const &DebFile);
-   virtual ~debDebPkgFileIndex();
+   ~debDebPkgFileIndex() override;
 
-   std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
+   [[nodiscard]] std::string ArchiveInfo(pkgCache::VerIterator const &Ver) const override;
 };
 
 class APT_PUBLIC debDscFileIndex : public pkgDebianIndexRealFile
@@ -152,14 +150,14 @@ class APT_PUBLIC debDscFileIndex : public pkgDebianIndexRealFile
    void * const d;
 
 protected:
-   virtual std::string GetComponent() const APT_OVERRIDE;
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetComponent() const override;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
 
 public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
-   virtual pkgSrcRecords::Parser *CreateSrcParser() const APT_OVERRIDE;
-   virtual bool HasPackages() const APT_OVERRIDE {return false;};
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
+   [[nodiscard]] pkgSrcRecords::Parser *CreateSrcParser() const override;
+   [[nodiscard]] bool HasPackages() const override { return false; };
 
    explicit debDscFileIndex(std::string const &DscFile);
    virtual ~debDscFileIndex();
@@ -168,29 +166,29 @@ public:
 class debDebianSourceDirIndex : public debDscFileIndex
 {
 protected:
-   virtual std::string GetComponent() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetComponent() const override;
 
 public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+[[nodiscard]] const Type *GetType() const override APT_PURE;
 };
 
 class APT_PUBLIC debStringPackageIndex : public pkgDebianIndexRealFile
 {
    void * const d;
 protected:
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual std::string GetComponent() const APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] std::string GetComponent() const override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
 
-public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   public:
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    // Interface for the Cache Generator
-   virtual bool HasPackages() const APT_OVERRIDE {return true;};
+   [[nodiscard]] bool HasPackages() const override { return true; };
    // Abort if the file does not exist.
-   virtual bool Exists() const APT_OVERRIDE {return true;};
+   [[nodiscard]] bool Exists() const override { return true; };
 
    explicit debStringPackageIndex(std::string const &content);
-   virtual ~debStringPackageIndex();
+   ~debStringPackageIndex() override;
 };
 #endif
diff --git a/apt-pkg/deb/deblistparser.h b/apt-pkg/deb/deblistparser.h
index 637063f94..aec09ed2e 100644
--- a/apt-pkg/deb/deblistparser.h
+++ b/apt-pkg/deb/deblistparser.h
@@ -59,21 +59,21 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
    APT_PUBLIC static unsigned char GetPrio(std::string Str);
 
    // These all operate against the current section
-   virtual std::string Package() APT_OVERRIDE;
-   virtual bool ArchitectureAll() APT_OVERRIDE;
-   virtual std::string_view Architecture() APT_OVERRIDE;
-   virtual std::string_view Version() APT_OVERRIDE;
-   virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
-   virtual std::string_view Description_md5() APT_OVERRIDE;
-   virtual uint32_t VersionHash() APT_OVERRIDE;
-   virtual bool SameVersion(uint32_t Hash, pkgCache::VerIterator const &Ver) APT_OVERRIDE;
-   virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
-			   pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual map_filesize_t Offset() APT_OVERRIDE {return iOffset;};
-   virtual map_filesize_t Size() APT_OVERRIDE {return Section.size();};
-
-   virtual bool Step() APT_OVERRIDE;
+   std::string Package() override;
+   bool ArchitectureAll() override;
+   std::string_view Architecture() override;
+   std::string_view Version() override;
+   bool NewVersion(pkgCache::VerIterator &Ver) override;
+   std::vector<std::string> AvailableDescriptionLanguages() override;
+   std::string_view Description_md5() override;
+   uint32_t VersionHash() override;
+   bool SameVersion(uint32_t Hash, pkgCache::VerIterator const &Ver) override;
+   bool UsePackage(pkgCache::PkgIterator &Pkg,
+		   pkgCache::VerIterator &Ver) override;
+   map_filesize_t Offset() override { return iOffset; };
+   map_filesize_t Size() override { return Section.size(); };
+
+   bool Step() override;
 
    APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop,
 					      std::string &Package, std::string &Ver, unsigned int &Op,
@@ -82,24 +82,25 @@ class APT_HIDDEN debListParser : public pkgCacheListParser
 					      std::string const &Arch = "");
 
 #if APT_PKG_ABI <= 600
+   [[deprecated("Use std::string_view variant instead")]]
    APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop,
 					      APT::StringView &Package,
 					      APT::StringView &Ver, unsigned int &Op,
-					      bool const ParseArchFlags = false, bool StripMultiArch = true,
-					      bool const ParseRestrictionsList = false,
-					      std::string Arch = "") APT_DEPRECATED_MSG("Use std::string_view variant instead");
+					      bool ParseArchFlags = false, bool StripMultiArch = true,
+					      bool ParseRestrictionsList = false,
+					      std::string Arch = "");
 #endif
    APT_PUBLIC static const char *ParseDepends(const char *Start, const char *Stop,
 					      std::string_view &Package,
 					      std::string_view &Ver, unsigned int &Op,
-					      bool const ParseArchFlags = false, bool StripMultiArch = true,
-					      bool const ParseRestrictionsList = false,
+					      bool ParseArchFlags = false, bool StripMultiArch = true,
+					      bool ParseRestrictionsList = false,
 					      std::string Arch = "");
 
    APT_PUBLIC static const char *ConvertRelation(const char *I,unsigned int &Op);
 
    explicit debListParser(FileFd *File);
-   virtual ~debListParser();
+   ~debListParser() override;
 
 #ifdef APT_COMPILING_APT
    std::string_view SHA256() const
@@ -116,25 +117,25 @@ class APT_HIDDEN debDebFileParser : public debListParser
 
  public:
    debDebFileParser(FileFd *File, std::string const &DebFile);
-   virtual bool UsePackage(pkgCache::PkgIterator &Pkg,
-			   pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool UsePackage(pkgCache::PkgIterator &Pkg,
+		   pkgCache::VerIterator &Ver) override;
 };
 
 class APT_HIDDEN debTranslationsParser : public debListParser
 {
  public:
    // a translation can never be a real package
-   virtual std::string_view Architecture() APT_OVERRIDE { return ""; }
-   virtual std::string_view Version() APT_OVERRIDE { return ""; }
+ std::string_view Architecture() override { return {}; }
+ std::string_view Version() override { return {}; }
 
-   explicit debTranslationsParser(FileFd *File)
-      : debListParser(File) {};
+ explicit debTranslationsParser(FileFd *File)
+     : debListParser(File) {};
 };
 
 class APT_HIDDEN debStatusListParser : public debListParser
 {
  public:
-   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) override;
    explicit debStatusListParser(FileFd *File)
       : debListParser(File) {};
 };
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc
index b9369a898..c53b00881 100644
--- a/apt-pkg/deb/debmetaindex.cc
+++ b/apt-pkg/deb/debmetaindex.cc
@@ -75,7 +75,7 @@ static std::string NormalizeSignedBy(std::string SignedBy, bool const Introducer
       return os.str();
    }
 
-   // we could go all fancy and allow short/long/string matches as gpgv/apt-key does,
+   // we could go all fancy and allow short/long/string matches as gpgv does,
    // but fingerprints are harder to fake than the others and this option is set once,
    // not interactively all the time so easy to type is not really a concern.
    std::transform(SignedBy.begin(), SignedBy.end(), SignedBy.begin(), [](char const c) {
@@ -1475,7 +1475,7 @@ class APT_HIDDEN debSLTypeDeb : public debSLTypeDebian			/*{{{*/
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
 		   std::string const &Dist, std::string const &Section,
-		   std::map<std::string, std::string> const &Options) const APT_OVERRIDE
+		   std::map<std::string, std::string> const &Options) const override
    {
       return CreateItemInternal(List, URI, Dist, Section, false, Options);
    }
@@ -1491,7 +1491,7 @@ class APT_HIDDEN debSLTypeDebSrc : public debSLTypeDebian		/*{{{*/
 
    bool CreateItem(std::vector<metaIndex *> &List, std::string const &URI,
 		   std::string const &Dist, std::string const &Section,
-		   std::map<std::string, std::string> const &Options) const APT_OVERRIDE
+		   std::map<std::string, std::string> const &Options) const override
    {
       return CreateItemInternal(List, URI, Dist, Section, true, Options);
    }
diff --git a/apt-pkg/deb/debmetaindex.h b/apt-pkg/deb/debmetaindex.h
index a1a9c41b5..7a6f1fbb4 100644
--- a/apt-pkg/deb/debmetaindex.h
+++ b/apt-pkg/deb/debmetaindex.h
@@ -30,20 +30,20 @@ class APT_HIDDEN debReleaseIndex : public metaIndex
 
    debReleaseIndex(std::string const &URI, std::string const &Dist, std::map<std::string,std::string> const &Options);
    debReleaseIndex(std::string const &URI, std::string const &Dist, bool const Trusted, std::map<std::string,std::string> const &Options);
-   virtual ~debReleaseIndex();
+   ~debReleaseIndex() override;
 
-   virtual std::string ArchiveURI(std::string const &File) const APT_OVERRIDE;
-   virtual bool GetIndexes(pkgAcquire *Owner, bool const &GetAll=false) APT_OVERRIDE;
-   virtual std::vector<IndexTarget> GetIndexTargets() const APT_OVERRIDE;
+   [[nodiscard]] std::string ArchiveURI(std::string const &File) const override;
+   bool GetIndexes(pkgAcquire *Owner, bool const &GetAll = false) override;
+   [[nodiscard]] std::vector<IndexTarget> GetIndexTargets() const override;
 
-   virtual std::string Describe() const APT_OVERRIDE;
-   virtual pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool const ModifyCheck) const APT_OVERRIDE;
-   virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const APT_OVERRIDE;
+   [[nodiscard]] std::string Describe() const override;
+   pkgCache::RlsFileIterator FindInCache(pkgCache &Cache, bool ModifyCheck) const override;
+   bool Merge(pkgCacheGenerator &Gen, OpProgress *Prog) const override;
 
-   virtual bool Load(std::string const &Filename, std::string * const ErrorText) APT_OVERRIDE;
-   virtual metaIndex * UnloadedClone() const APT_OVERRIDE;
+   bool Load(std::string const &Filename, std::string *ErrorText) override;
+   [[nodiscard]] metaIndex *UnloadedClone() const override;
 
-   virtual std::vector <pkgIndexFile *> *GetIndexFiles() APT_OVERRIDE;
+   std::vector<pkgIndexFile *> *GetIndexFiles() override;
 
    bool SetTrusted(TriState const Trusted);
    bool SetCheckValidUntil(TriState const Trusted);
@@ -56,12 +56,12 @@ class APT_HIDDEN debReleaseIndex : public metaIndex
    bool SetSignedBy(std::string const &SignedBy);
    std::map<std::string, std::string> GetReleaseOptions();
 
-   virtual bool IsTrusted() const APT_OVERRIDE;
-   bool IsArchitectureSupported(std::string const &arch) const override;
-   bool IsArchitectureAllSupportedFor(IndexTarget const &target) const override;
-   bool HasSupportForComponent(std::string const &component) const override;
+   [[nodiscard]] bool IsTrusted() const override;
+   [[nodiscard]] bool IsArchitectureSupported(std::string const &arch) const override;
+   [[nodiscard]] bool IsArchitectureAllSupportedFor(IndexTarget const &target) const override;
+   [[nodiscard]] bool HasSupportForComponent(std::string const &component) const override;
 
-   APT_PURE time_t GetNotBefore() const override;
+   [[nodiscard]] time_t GetNotBefore() const override APT_PURE;
 
    void AddComponent(std::string const &sourcesEntry,
 	 bool const isSrc, std::string const &Name,
diff --git a/apt-pkg/deb/debrecords.h b/apt-pkg/deb/debrecords.h
index 10ef91768..050f0399f 100644
--- a/apt-pkg/deb/debrecords.h
+++ b/apt-pkg/deb/debrecords.h
@@ -29,26 +29,26 @@ class APT_HIDDEN debRecordParserBase : public pkgRecords::Parser
 
  public:
    // These refer to the archive file for the Version
-   virtual std::string FileName() APT_OVERRIDE;
-   virtual std::string SourcePkg() APT_OVERRIDE;
-   virtual std::string SourceVer() APT_OVERRIDE;
+   std::string FileName() override;
+   std::string SourcePkg() override;
+   std::string SourceVer() override;
 
-   virtual HashStringList Hashes() const APT_OVERRIDE;
+   [[nodiscard]] HashStringList Hashes() const override;
 
    // These are some general stats about the package
-   virtual std::string Maintainer() APT_OVERRIDE;
-   virtual std::string ShortDesc(std::string const &lang) APT_OVERRIDE;
-   virtual std::string LongDesc(std::string const &lang) APT_OVERRIDE;
-   virtual std::string Name() APT_OVERRIDE;
-   virtual std::string Homepage() APT_OVERRIDE;
+   std::string Maintainer() override;
+   std::string ShortDesc(std::string const &lang) override;
+   std::string LongDesc(std::string const &lang) override;
+   std::string Name() override;
+   std::string Homepage() override;
 
    // An arbitrary custom field
-   virtual std::string RecordField(const char *fieldName) APT_OVERRIDE;
+   std::string RecordField(const char *fieldName) override;
 
-   virtual void GetRec(const char *&Start,const char *&Stop) APT_OVERRIDE;
+   void GetRec(const char *&Start, const char *&Stop) override;
 
    debRecordParserBase();
-   virtual ~debRecordParserBase();
+   ~debRecordParserBase() override;
 };
 
 class APT_HIDDEN debRecordParser : public debRecordParserBase
@@ -58,12 +58,12 @@ class APT_HIDDEN debRecordParser : public debRecordParserBase
    FileFd File;
    pkgTagFile Tags;
 
-   virtual bool Jump(pkgCache::VerFileIterator const &Ver) APT_OVERRIDE;
-   virtual bool Jump(pkgCache::DescFileIterator const &Desc) APT_OVERRIDE;
+   bool Jump(pkgCache::VerFileIterator const &Ver) override;
+   bool Jump(pkgCache::DescFileIterator const &Desc) override;
 
  public:
    debRecordParser(std::string FileName,pkgCache &Cache);
-   virtual ~debRecordParser();
+   ~debRecordParser() override;
 };
 
 // custom record parser that reads deb files directly
@@ -76,14 +76,14 @@ class APT_HIDDEN debDebFileRecordParser : public debRecordParserBase
    APT_HIDDEN bool LoadContent();
  protected:
    // single file files, so no jumping whatsoever
-   bool Jump(pkgCache::VerFileIterator const &) APT_OVERRIDE;
-   bool Jump(pkgCache::DescFileIterator const &) APT_OVERRIDE;
+ bool Jump(pkgCache::VerFileIterator const &/*Ver*/) override;
+ bool Jump(pkgCache::DescFileIterator const & /*Desc*/) override;
 
  public:
-   virtual std::string FileName() APT_OVERRIDE;
+ std::string FileName() override;
 
-   explicit debDebFileRecordParser(std::string FileName);
-   virtual ~debDebFileRecordParser();
+ explicit debDebFileRecordParser(std::string FileName);
+ ~debDebFileRecordParser() override;
 };
 
 #endif
diff --git a/apt-pkg/deb/debsrcrecords.h b/apt-pkg/deb/debsrcrecords.h
index dedcb6dbe..a439efa82 100644
--- a/apt-pkg/deb/debsrcrecords.h
+++ b/apt-pkg/deb/debsrcrecords.h
@@ -35,28 +35,27 @@ class APT_HIDDEN debSrcRecordParser : public pkgSrcRecords::Parser
    char *Buffer;
 
    public:
+   bool Restart() override { return Jump(0); }
+   bool Step() override {iOffset = Tags.Offset(); return Tags.Step(Sect);}
+   bool Jump(unsigned long const &Off) override {iOffset = Off; return Tags.Jump(Sect,Off);}
 
-   virtual bool Restart() APT_OVERRIDE {return Jump(0);};
-   virtual bool Step() APT_OVERRIDE {iOffset = Tags.Offset(); return Tags.Step(Sect);};
-   virtual bool Jump(unsigned long const &Off) APT_OVERRIDE {iOffset = Off; return Tags.Jump(Sect,Off);};
-
-   virtual std::string Package() const APT_OVERRIDE;
-   virtual std::string Version() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Version)};};
-   virtual std::string Maintainer() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Maintainer)};};
-   virtual std::string Section() const APT_OVERRIDE {return std::string{Sect.Find(pkgTagSection::Key::Section)};};
-   virtual const char **Binaries() APT_OVERRIDE;
-   virtual bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) APT_OVERRIDE;
-   virtual unsigned long Offset() APT_OVERRIDE {return iOffset;};
-   virtual std::string AsStr() APT_OVERRIDE
+   [[nodiscard]] std::string Package() const override;
+   [[nodiscard]] std::string Version() const override { return std::string{Sect.Find(pkgTagSection::Key::Version)}; }
+   [[nodiscard]] std::string Maintainer() const override { return std::string{Sect.Find(pkgTagSection::Key::Maintainer)}; }
+   [[nodiscard]] std::string Section() const override { return std::string{Sect.Find(pkgTagSection::Key::Section)}; }
+   const char **Binaries() override;
+   bool BuildDepends(std::vector<BuildDepRec> &BuildDeps, bool const &ArchOnly, bool const &StripMultiArch = true) override;
+   unsigned long Offset() override { return iOffset; }
+   std::string AsStr() override
    {
       const char *Start=0,*Stop=0;
       Sect.GetSection(Start,Stop);
       return std::string(Start,Stop);
    };
-   virtual bool Files(std::vector<pkgSrcRecords::File> &F) APT_OVERRIDE;
+   bool Files(std::vector<pkgSrcRecords::File> &F) override;
 
    debSrcRecordParser(std::string const &File,pkgIndexFile const *Index);
-   virtual ~debSrcRecordParser();
+   ~debSrcRecordParser() override;
 };
 
 class APT_HIDDEN debDscRecordParser : public debSrcRecordParser
diff --git a/apt-pkg/deb/debsystem.h b/apt-pkg/deb/debsystem.h
index c426faf81..294ae1819 100644
--- a/apt-pkg/deb/debsystem.h
+++ b/apt-pkg/deb/debsystem.h
@@ -27,18 +27,18 @@ class debSystem : public pkgSystem
    APT_HIDDEN bool CheckUpdates();
 
    public:
-   virtual bool Lock(OpProgress *const Progress) APT_OVERRIDE;
-   virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE;
-   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE;
-   virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
-   virtual bool ArchiveSupported(const char *Type) APT_OVERRIDE;
-   virtual signed Score(Configuration const &Cnf) APT_OVERRIDE;
-   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) APT_OVERRIDE;
-   virtual bool FindIndex(pkgCache::PkgFileIterator File,
-			  pkgIndexFile *&Found) const APT_OVERRIDE;
+   bool Lock(OpProgress *Progress) override;
+   bool UnLock(bool NoErrors = false) override;
+   pkgPackageManager *CreatePM(pkgDepCache *Cache) const override;
+   bool Initialize(Configuration &Cnf) override;
+   bool ArchiveSupported(const char *Type) override;
+   signed Score(Configuration const &Cnf) override;
+   bool AddStatusFiles(std::vector<pkgIndexFile *> &List) override;
+   bool FindIndex(pkgCache::PkgFileIterator File,
+		  pkgIndexFile *&Found) const override;
 
    debSystem();
-   virtual ~debSystem();
+   ~debSystem() override;
 
    APT_HIDDEN static std::string GetDpkgExecutable();
    APT_HIDDEN static std::vector<std::string> GetDpkgBaseCommand();
diff --git a/apt-pkg/deb/debversion.h b/apt-pkg/deb/debversion.h
index 5c328a985..6d82e5889 100644
--- a/apt-pkg/deb/debversion.h
+++ b/apt-pkg/deb/debversion.h
@@ -23,15 +23,15 @@ class APT_PUBLIC debVersioningSystem : public pkgVersioningSystem
 			  const char *BEnd) APT_PURE;
 
    // Compare versions..
-   virtual int DoCmpVersion(const char *A,const char *Aend,
-			  const char *B,const char *Bend) APT_OVERRIDE APT_PURE;
-   virtual bool CheckDep(const char *PkgVer,int Op,const char *DepVer) APT_OVERRIDE APT_PURE;
-   virtual APT_PURE int DoCmpReleaseVer(const char *A,const char *Aend,
-			     const char *B,const char *Bend) APT_OVERRIDE
+   int DoCmpVersion(const char *A, const char *Aend,
+		    const char *B, const char *Bend) override APT_PURE;
+   bool CheckDep(const char *PkgVer, int Op, const char *DepVer) override APT_PURE;
+   int DoCmpReleaseVer(const char *A, const char *Aend,
+		       const char *B, const char *Bend) override APT_PURE
    {
       return DoCmpVersion(A,Aend,B,Bend);
    }
-   virtual std::string UpstreamVersion(const char *A) APT_OVERRIDE;
+   std::string UpstreamVersion(const char *A) override;
 
    debVersioningSystem();
 };
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 8cadd2712..d176e85fc 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1488,7 +1488,7 @@ public:
    auto begin() const { return args.cbegin(); }
    auto end() const { return args.cend(); }
    auto& front() const { return args.front(); }
-   APT_NORETURN void execute(char const *const errmsg) {
+   [[noreturn]] void execute(char const *const errmsg) {
       args.push_back(nullptr);
       execvp(args.front(), &args.front());
       std::cerr << errmsg << std::endl;
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index ed0b67b31..5ce9dc110 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -113,18 +113,18 @@ class APT_PUBLIC pkgDPkgPM : public pkgPackageManager
    void ProcessDpkgStatusLine(char *line);
 
    // The Actual installation implementation
-   virtual bool Install(PkgIterator Pkg,std::string File) APT_OVERRIDE;
-   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE;
-   virtual bool Remove(PkgIterator Pkg,bool Purge = false) APT_OVERRIDE;
+   bool Install(PkgIterator Pkg,std::string File) override;
+   bool Configure(PkgIterator Pkg) override;
+   bool Remove(PkgIterator Pkg, bool Purge = false) override;
 
-   virtual bool Go(APT::Progress::PackageManager *progress) APT_OVERRIDE;
+   bool Go(APT::Progress::PackageManager *progress) override;
+
+   void Reset() override;
 
-   virtual void Reset() APT_OVERRIDE;
-   
    public:
 
    explicit pkgDPkgPM(pkgDepCache *Cache);
-   virtual ~pkgDPkgPM();
+   ~pkgDPkgPM() override;
 
    APT_HIDDEN static bool ExpandPendingCalls(std::vector<Item> &List, pkgDepCache &Cache);
 };
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 4e8f5222a..fcc974ae3 100644
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -62,9 +62,9 @@ class DefaultRootSetFunc2 : public pkgDepCache::DefaultRootSetFunc
 
    public:
    DefaultRootSetFunc2(pkgCache *cache) : Kernels(APT::KernelAutoRemoveHelper::GetProtectedKernelsFilter(cache)){};
-   virtual ~DefaultRootSetFunc2(){};
+   ~DefaultRootSetFunc2() override = default;
 
-   bool InRootSet(const pkgCache::PkgIterator &pkg) APT_OVERRIDE { return pkg.end() == false && ((*Kernels)(pkg) || DefaultRootSetFunc::InRootSet(pkg)); };
+   bool InRootSet(const pkgCache::PkgIterator &pkg) override { return pkg.end() == false && ((*Kernels)(pkg) || DefaultRootSetFunc::InRootSet(pkg)); };
 };
 
 									/*}}}*/
diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h
index 23047b97a..49ef4f441 100644
--- a/apt-pkg/depcache.h
+++ b/apt-pkg/depcache.h
@@ -178,9 +178,9 @@ class APT_PUBLIC pkgDepCache : protected pkgCache::Namespace
    {
    public:
      DefaultRootSetFunc() : Configuration::MatchAgainstConfig("APT::NeverAutoRemove") {};
-     virtual ~DefaultRootSetFunc() {};
+     ~DefaultRootSetFunc() override = default;
 
-     bool InRootSet(const pkgCache::PkgIterator &pkg) APT_OVERRIDE { return pkg.end() == false && Match(pkg.Name()); };
+     bool InRootSet(const pkgCache::PkgIterator &pkg) override { return pkg.end() == false && Match(pkg.Name()); };
    };
 
    struct APT_PUBLIC StateCache
diff --git a/apt-pkg/edsp.cc b/apt-pkg/edsp.cc
index d3ce830ea..88f572f18 100644
--- a/apt-pkg/edsp.cc
+++ b/apt-pkg/edsp.cc
@@ -41,17 +41,6 @@
 
 using std::string;
 
-// we could use pkgCache::DepType and ::Priority, but these would be localized strings…
-constexpr char const * const PrioMap[] = {
-   nullptr, "important", "required", "standard",
-   "optional", "extra"
-};
-constexpr char const * const DepMap[] = {
-   nullptr, "Depends", "Pre-Depends", "Suggests",
-   "Recommends" , "Conflicts", "Replaces",
-   "Obsoletes", "Breaks", "Enhances"
-};
-
 // WriteOkay - varaidic helper to easily Write to a FileFd		/*{{{*/
 static bool WriteOkay_fn(FileFd &) { return true; }
 template<typename... Tail> static bool WriteOkay_fn(FileFd &output, std::string_view data, Tail... more_data)
@@ -99,7 +88,7 @@ static bool WriteScenarioVersion(FileFd &output, pkgCache::PkgIterator const &Pk
 // WriteScenarioDependency						/*{{{*/
 static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const &Ver, bool const OnlyCritical)
 {
-   std::array<std::string, APT_ARRAY_SIZE(DepMap)> dependencies;
+   std::array<std::string, 10> dependencies;
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {
@@ -123,7 +112,7 @@ static bool WriteScenarioDependency(FileFd &output, pkgCache::VerIterator const
    bool Okay = output.Failed() == false;
    for (size_t i = 1; i < dependencies.size(); ++i)
       if (dependencies[i].empty() == false)
-	 WriteOkay(Okay, output, "\n", DepMap[i], ": ", dependencies[i]);
+	 WriteOkay(Okay, output, "\n", pkgCache::DepType_NoL10n(i), ": ", dependencies[i]);
    std::vector<std::string> provides;
    for (auto Prv = Ver.ProvidesList(); not Prv.end(); ++Prv)
    {
@@ -152,7 +141,7 @@ static bool WriteScenarioLimitedDependency(FileFd &output,
 					  std::vector<bool> const &pkgset,
 					  bool const OnlyCritical)
 {
-   std::array<std::string, APT_ARRAY_SIZE(DepMap)> dependencies;
+   std::array<std::string, 10> dependencies;
    bool orGroup = false;
    for (pkgCache::DepIterator Dep = Ver.DependsList(); Dep.end() == false; ++Dep)
    {
@@ -189,7 +178,7 @@ static bool WriteScenarioLimitedDependency(FileFd &output,
    bool Okay = output.Failed() == false;
    for (size_t i = 1; i < dependencies.size(); ++i)
       if (dependencies[i].empty() == false)
-	 WriteOkay(Okay, output, "\n", DepMap[i], ": ", dependencies[i]);
+	 WriteOkay(Okay, output, "\n", pkgCache::DepType_NoL10n(i), ": ", dependencies[i]);
    string provides;
    for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
    {
@@ -250,8 +239,8 @@ static bool WriteScenarioEDSPVersion(pkgDepCache &Cache, FileFd &output, pkgCach
 {
    bool Okay = WriteOkay(output, "\nSource: ", Ver.SourcePkgName(),
 	 "\nSource-Version: ", Ver.SourceVerStr());
-   if (PrioMap[Ver->Priority] != nullptr)
-      WriteOkay(Okay, output, "\nPriority: ", PrioMap[Ver->Priority]);
+   if (auto const Prio = pkgCache::Priority_NoL10n(Ver->Priority); not Prio.empty())
+      WriteOkay(Okay, output, "\nPriority: ", Prio);
    if (Ver->Section != 0)
       WriteOkay(Okay, output, "\nSection: ", Ver.Section());
    if (Pkg.CurrentVer() == Ver)
diff --git a/apt-pkg/edsp/edspindexfile.cc b/apt-pkg/edsp/edspindexfile.cc
index e97f16894..99947f4fb 100644
--- a/apt-pkg/edsp/edspindexfile.cc
+++ b/apt-pkg/edsp/edspindexfile.cc
@@ -28,7 +28,7 @@ edspLikeIndex::edspLikeIndex(std::string const &File) : pkgDebianIndexRealFile(F
 }
 std::string edspLikeIndex::GetArchitecture() const
 {
-   return std::string();
+   return {};
 }
 bool edspLikeIndex::HasPackages() const
 {
@@ -94,10 +94,10 @@ pkgCacheListParser * eippIndex::CreateListParser(FileFd &Pkg)
 class APT_HIDDEN edspIFType: public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &) const APT_OVERRIDE
+   [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &/*PkgFile*/) const override
    {
       // we don't have a record parser for this type as the file is not persistent
-      return NULL;
+      return nullptr;
    };
    edspIFType() {Label = "EDSP scenario file";};
 };
@@ -110,10 +110,10 @@ const pkgIndexFile::Type *edspIndex::GetType() const
 class APT_HIDDEN eippIFType: public pkgIndexFile::Type
 {
    public:
-   virtual pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &) const APT_OVERRIDE
+   [[nodiscard]] pkgRecords::Parser *CreatePkgParser(pkgCache::PkgFileIterator const &/*PkgFile*/) const override
    {
       // we don't have a record parser for this type as the file is not persistent
-      return NULL;
+      return nullptr;
    };
    eippIFType() {Label = "EIPP scenario file";};
 };
@@ -124,6 +124,6 @@ const pkgIndexFile::Type *eippIndex::GetType() const
 }
 									/*}}}*/
 
-edspLikeIndex::~edspLikeIndex() {}
-edspIndex::~edspIndex() {}
-eippIndex::~eippIndex() {}
+edspLikeIndex::~edspLikeIndex() = default;
+edspIndex::~edspIndex() = default;
+eippIndex::~eippIndex() = default;
diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 42ef3fea3..ee1079aa4 100644
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -18,42 +18,42 @@ class pkgCacheGenerator;
 class APT_HIDDEN edspLikeIndex : public pkgDebianIndexRealFile
 {
 protected:
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &File) APT_OVERRIDE;
-   virtual uint8_t GetIndexFlags() const APT_OVERRIDE;
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
+   bool OpenListFile(FileFd &Pkg, std::string const &File) override;
+   [[nodiscard]] uint8_t GetIndexFlags() const override;
+   [[nodiscard]] std::string GetArchitecture() const override;
 
-public:
-   virtual bool Exists() const APT_OVERRIDE;
-   virtual bool HasPackages() const APT_OVERRIDE;
+   public:
+   [[nodiscard]] bool Exists() const override;
+   [[nodiscard]] bool HasPackages() const override;
 
    explicit edspLikeIndex(std::string const &File);
-   virtual ~edspLikeIndex();
+   ~edspLikeIndex() override;
 };
 
 class APT_HIDDEN edspIndex : public edspLikeIndex
 {
 protected:
-   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
-   virtual std::string GetComponent() const APT_OVERRIDE;
+   APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
+   [[nodiscard]] std::string GetComponent() const override;
 
 public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    explicit edspIndex(std::string const &File);
-   virtual ~edspIndex();
+   ~edspIndex() override;
 };
 
 class APT_HIDDEN eippIndex : public edspLikeIndex
 {
 protected:
-   APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg) APT_OVERRIDE;
-   virtual std::string GetComponent() const APT_OVERRIDE;
+   APT_HIDDEN pkgCacheListParser *CreateListParser(FileFd &Pkg) override;
+   [[nodiscard]] std::string GetComponent() const override;
 
-public:
-   virtual const Type *GetType() const APT_OVERRIDE APT_PURE;
+   public:
+   [[nodiscard]] const Type *GetType() const override APT_PURE;
 
    explicit eippIndex(std::string const &File);
-   virtual ~eippIndex();
+   ~eippIndex() override;
 };
 
 #endif
diff --git a/apt-pkg/edsp/edsplistparser.h b/apt-pkg/edsp/edsplistparser.h
index 3f0f3e64c..a7ad9830c 100644
--- a/apt-pkg/edsp/edsplistparser.h
+++ b/apt-pkg/edsp/edsplistparser.h
@@ -21,13 +21,13 @@
 class APT_HIDDEN edspLikeListParser : public debListParser
 {
    public:
-   virtual bool NewVersion(pkgCache::VerIterator &Ver) APT_OVERRIDE;
-   virtual std::vector<std::string> AvailableDescriptionLanguages() APT_OVERRIDE;
-   virtual std::string_view Description_md5() APT_OVERRIDE;
-   virtual uint32_t VersionHash() APT_OVERRIDE;
+   bool NewVersion(pkgCache::VerIterator &Ver) override;
+   std::vector<std::string> AvailableDescriptionLanguages() override;
+   std::string_view Description_md5() override;
+   uint32_t VersionHash() override;
 
    explicit edspLikeListParser(FileFd *File);
-   virtual ~edspLikeListParser();
+   ~edspLikeListParser() override;
 };
 
 class APT_HIDDEN edspListParser : public edspLikeListParser
@@ -36,20 +36,20 @@ class APT_HIDDEN edspListParser : public edspLikeListParser
    FileFd preferences;
 
 protected:
-   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool ParseStatus(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver) override;
 
 public:
    explicit edspListParser(FileFd *File);
-   virtual ~edspListParser();
+   ~edspListParser() override;
 };
 
 class APT_HIDDEN eippListParser : public edspLikeListParser
 {
 protected:
-   virtual bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) APT_OVERRIDE;
+   bool ParseStatus(pkgCache::PkgIterator &Pkg,pkgCache::VerIterator &Ver) override;
 
 public:
    explicit eippListParser(FileFd *File);
-   virtual ~eippListParser();
+   ~eippListParser() override;
 };
 #endif
diff --git a/apt-pkg/edsp/edspsystem.h b/apt-pkg/edsp/edspsystem.h
index 97c2d66e2..e34c4ecce 100644
--- a/apt-pkg/edsp/edspsystem.h
+++ b/apt-pkg/edsp/edspsystem.h
@@ -29,24 +29,24 @@ protected:
    std::unique_ptr<pkgIndexFile> StatusFile;
 
 public:
-   virtual bool Lock(OpProgress * const Progress) APT_OVERRIDE APT_PURE;
-   virtual bool UnLock(bool NoErrors = false) APT_OVERRIDE APT_PURE;
-   virtual pkgPackageManager *CreatePM(pkgDepCache *Cache) const APT_OVERRIDE APT_PURE;
-   virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
-   virtual bool ArchiveSupported(const char *Type) APT_OVERRIDE APT_PURE;
-   virtual signed Score(Configuration const &Cnf) APT_OVERRIDE;
-   virtual bool FindIndex(pkgCache::PkgFileIterator File,
-			  pkgIndexFile *&Found) const APT_OVERRIDE;
-
-   bool MultiArchSupported() const override { return true; }
-   std::vector<std::string> ArchitecturesSupported() const override { return {}; };
-
-   bool LockInner(OpProgress * const, int) override { return _error->Error("LockInner is not implemented"); };
-   bool UnLockInner(bool) override { return _error->Error("UnLockInner is not implemented"); };
+   bool Lock(OpProgress *Progress) override APT_PURE;
+   bool UnLock(bool NoErrors = false) override APT_PURE;
+   pkgPackageManager *CreatePM(pkgDepCache *Cache) const override APT_PURE;
+   bool Initialize(Configuration &Cnf) override;
+   bool ArchiveSupported(const char *Type) override APT_PURE;
+   signed Score(Configuration const &Cnf) override;
+   bool FindIndex(pkgCache::PkgFileIterator File,
+		  pkgIndexFile *&Found) const override;
+
+   [[nodiscard]] bool MultiArchSupported() const override { return true; }
+   [[nodiscard]] std::vector<std::string> ArchitecturesSupported() const override { return {}; };
+
+   bool LockInner(OpProgress * const /*Progress*/, int /*timeOutSec*/) override { return _error->Error("LockInner is not implemented"); };
+   bool UnLockInner(bool /*NoErrors*/) override { return _error->Error("UnLockInner is not implemented"); };
    bool IsLocked() override { return true; };
 
    explicit edspLikeSystem(char const * const Label);
-   virtual ~edspLikeSystem();
+   ~edspLikeSystem() override;
 };
 
 class APT_HIDDEN edspSystem : public edspLikeSystem
@@ -56,20 +56,20 @@ class APT_HIDDEN edspSystem : public edspLikeSystem
    std::string tempPrefsFile;
 
 public:
-   virtual bool Initialize(Configuration &Cnf) APT_OVERRIDE;
-   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) APT_OVERRIDE;
+   bool Initialize(Configuration &Cnf) override;
+   bool AddStatusFiles(std::vector<pkgIndexFile *> &List) override;
 
    edspSystem();
-   virtual ~edspSystem();
+   ~edspSystem() override;
 };
 
 class APT_HIDDEN eippSystem : public edspLikeSystem
 {
    public:
-   virtual bool AddStatusFiles(std::vector<pkgIndexFile *> &List) APT_OVERRIDE;
+   bool AddStatusFiles(std::vector<pkgIndexFile *> &List) override;
 
    eippSystem();
-   virtual ~eippSystem();
+   ~eippSystem() override;
 };
 
 #endif
diff --git a/apt-pkg/indexcopy.h b/apt-pkg/indexcopy.h
index 5fcce20d0..d81bc092f 100644
--- a/apt-pkg/indexcopy.h
+++ b/apt-pkg/indexcopy.h
@@ -55,30 +55,28 @@ class APT_PUBLIC PackageCopy : public IndexCopy					/*{{{*/
 {
    void * const d;
    protected:
-
-   virtual bool GetFile(std::string &Filename,unsigned long long &Size) APT_OVERRIDE;
-   virtual bool RewriteEntry(FileFd &Target, std::string const &File) APT_OVERRIDE;
-   virtual const char *GetFileName() APT_OVERRIDE {return "Packages";};
-   virtual const char *Type() APT_OVERRIDE {return "Package";};
+   bool GetFile(std::string &Filename, unsigned long long &Size) override;
+   bool RewriteEntry(FileFd &Target, std::string const &File) override;
+   const char *GetFileName() override { return "Packages"; }
+   const char *Type() override { return "Package"; }
 
    public:
    PackageCopy();
-   virtual ~PackageCopy();
+   ~PackageCopy() override;
 };
 									/*}}}*/
 class APT_PUBLIC SourceCopy : public IndexCopy					/*{{{*/
 {
    void * const d;
    protected:
-   
-   virtual bool GetFile(std::string &Filename,unsigned long long &Size) APT_OVERRIDE;
-   virtual bool RewriteEntry(FileFd &Target, std::string const &File) APT_OVERRIDE;
-   virtual const char *GetFileName() APT_OVERRIDE {return "Sources";};
-   virtual const char *Type() APT_OVERRIDE {return "Source";};
+   bool GetFile(std::string &Filename, unsigned long long &Size) override;
+   bool RewriteEntry(FileFd &Target, std::string const &File) override;
+   const char *GetFileName() override { return "Sources"; }
+   const char *Type() override { return "Source"; };
 
    public:
    SourceCopy();
-   virtual ~SourceCopy();
+   ~SourceCopy() override;
 };
 									/*}}}*/
 class APT_PUBLIC  TranslationsCopy							/*{{{*/
diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 95cee5dbc..ce57745ea 100644
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -163,11 +163,11 @@ protected:
    APT_HIDDEN virtual pkgCacheListParser * CreateListParser(FileFd &Pkg);
 
 public:
-   virtual bool Merge(pkgCacheGenerator &Gen, OpProgress* const Prog) APT_OVERRIDE;
-   virtual pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const APT_OVERRIDE;
+   bool Merge(pkgCacheGenerator &Gen, OpProgress *Prog) override;
+   pkgCache::PkgFileIterator FindInCache(pkgCache &Cache) const override;
 
    explicit pkgDebianIndexFile(bool const Trusted);
-   virtual ~pkgDebianIndexFile();
+   ~pkgDebianIndexFile() override;
 };
 
 class APT_PUBLIC pkgDebianIndexTargetFile : public pkgDebianIndexFile
@@ -176,21 +176,21 @@ class APT_PUBLIC pkgDebianIndexTargetFile : public pkgDebianIndexFile
 protected:
    IndexTarget const Target;
 
-   virtual std::string IndexFileName() const APT_OVERRIDE;
-   virtual std::string GetComponent() const APT_OVERRIDE;
-   virtual std::string GetArchitecture() const APT_OVERRIDE;
-   virtual std::string GetProgressDescription() const APT_OVERRIDE;
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
+   std::string IndexFileName() const override;
+   [[nodiscard]] std::string GetComponent() const override;
+   [[nodiscard]] std::string GetArchitecture() const override;
+   [[nodiscard]] std::string GetProgressDescription() const override;
+   bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
 
-public:
-   virtual std::string ArchiveURI(std::string const &File) const APT_OVERRIDE;
-   virtual std::string Describe(bool const Short = false) const APT_OVERRIDE;
-   virtual bool Exists() const APT_OVERRIDE;
-   virtual unsigned long Size() const APT_OVERRIDE;
+   public:
+   [[nodiscard]] std::string ArchiveURI(std::string const &File) const override;
+   [[nodiscard]] std::string Describe(bool Short = false) const override;
+   [[nodiscard]] bool Exists() const override;
+   [[nodiscard]] unsigned long Size() const override;
    IndexTarget GetIndexTarget() const APT_HIDDEN;
 
    pkgDebianIndexTargetFile(IndexTarget const &Target, bool const Trusted);
-   virtual ~pkgDebianIndexTargetFile();
+   ~pkgDebianIndexTargetFile() override;
 };
 
 class APT_PUBLIC pkgDebianIndexRealFile : public pkgDebianIndexFile
@@ -199,17 +199,18 @@ class APT_PUBLIC pkgDebianIndexRealFile : public pkgDebianIndexFile
 protected:
    std::string File;
 
-   virtual std::string IndexFileName() const APT_OVERRIDE;
-   virtual std::string GetProgressDescription() const APT_OVERRIDE;
-   virtual bool OpenListFile(FileFd &Pkg, std::string const &FileName) APT_OVERRIDE;
-public:
-   virtual std::string Describe(bool const /*Short*/ = false) const APT_OVERRIDE;
-   virtual bool Exists() const APT_OVERRIDE;
-   virtual unsigned long Size() const APT_OVERRIDE;
-   virtual std::string ArchiveURI(std::string const &/*File*/) const APT_OVERRIDE;
+   [[nodiscard]] std::string IndexFileName() const override;
+   [[nodiscard]] std::string GetProgressDescription() const override;
+   bool OpenListFile(FileFd &Pkg, std::string const &FileName) override;
+
+   public:
+   [[nodiscard]] std::string Describe(bool /*Short*/ = false) const override;
+   [[nodiscard]] bool Exists() const override;
+   [[nodiscard]] unsigned long Size() const override;
+   [[nodiscard]] std::string ArchiveURI(std::string const & /*File*/) const override;
 
    pkgDebianIndexRealFile(std::string const &File, bool const Trusted);
-   virtual ~pkgDebianIndexRealFile();
+   ~pkgDebianIndexRealFile() override;
 };
 
 #endif
diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index db060b3bc..499ac238f 100644
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -70,24 +70,23 @@ namespace Progress {
 
  public:
     explicit PackageManagerProgressFd(int progress_fd);
-    virtual ~PackageManagerProgressFd();
-
-    virtual void StartDpkg() APT_OVERRIDE;
-    virtual void Stop() APT_OVERRIDE;
-
-    virtual bool StatusChanged(std::string PackageName,
-                               unsigned int StepsDone,
-                               unsigned int TotalSteps,
-                               std::string HumanReadableAction) APT_OVERRIDE;
-    virtual void Error(std::string PackageName,
-                       unsigned int StepsDone,
-                       unsigned int TotalSteps,
-                          std::string ErrorMessage) APT_OVERRIDE;
-    virtual void ConffilePrompt(std::string PackageName,
-                                unsigned int StepsDone,
-                                unsigned int TotalSteps,
-                                   std::string ConfMessage) APT_OVERRIDE;
-
+    ~PackageManagerProgressFd() override;
+
+    void StartDpkg() override;
+    void Stop() override;
+
+    bool StatusChanged(std::string PackageName,
+		       unsigned int StepsDone,
+		       unsigned int TotalSteps,
+		       std::string HumanReadableAction) override;
+    void Error(std::string PackageName,
+	       unsigned int StepsDone,
+	       unsigned int TotalSteps,
+	       std::string ErrorMessage) override;
+    void ConffilePrompt(std::string PackageName,
+			unsigned int StepsDone,
+			unsigned int TotalSteps,
+			std::string ConfMessage) override;
  };
 
  class APT_PUBLIC PackageManagerProgressDeb822Fd : public PackageManager
@@ -101,23 +100,23 @@ namespace Progress {
 
  public:
     explicit PackageManagerProgressDeb822Fd(int progress_fd);
-    virtual ~PackageManagerProgressDeb822Fd();
-
-    virtual void StartDpkg() APT_OVERRIDE;
-    virtual void Stop() APT_OVERRIDE;
-
-    virtual bool StatusChanged(std::string PackageName,
-                               unsigned int StepsDone,
-                               unsigned int TotalSteps,
-                               std::string HumanReadableAction) APT_OVERRIDE;
-    virtual void Error(std::string PackageName,
-                       unsigned int StepsDone,
-                       unsigned int TotalSteps,
-                          std::string ErrorMessage) APT_OVERRIDE;
-    virtual void ConffilePrompt(std::string PackageName,
-                                unsigned int StepsDone,
-                                unsigned int TotalSteps,
-                                   std::string ConfMessage) APT_OVERRIDE;
+    ~PackageManagerProgressDeb822Fd() override;
+
+    void StartDpkg() override;
+    void Stop() override;
+
+    bool StatusChanged(std::string PackageName,
+		       unsigned int StepsDone,
+		       unsigned int TotalSteps,
+		       std::string HumanReadableAction) override;
+    void Error(std::string PackageName,
+	       unsigned int StepsDone,
+	       unsigned int TotalSteps,
+	       std::string ErrorMessage) override;
+    void ConffilePrompt(std::string PackageName,
+			unsigned int StepsDone,
+			unsigned int TotalSteps,
+			std::string ConfMessage) override;
  };
 
  class APT_PUBLIC PackageManagerFancy : public PackageManager
@@ -146,14 +145,14 @@ namespace Progress {
 
  public:
     PackageManagerFancy();
-    virtual ~PackageManagerFancy();
-    virtual void Pulse() APT_OVERRIDE;
-    virtual void Start(int child_pty=-1) APT_OVERRIDE;
-    virtual void Stop() APT_OVERRIDE;
-    virtual bool StatusChanged(std::string PackageName,
-                               unsigned int StepsDone,
-                               unsigned int TotalSteps,
-                               std::string HumanReadableAction) APT_OVERRIDE;
+    ~PackageManagerFancy() override;
+    void Pulse() override;
+    void Start(int child_pty = -1) override;
+    void Stop() override;
+    bool StatusChanged(std::string PackageName,
+		       unsigned int StepsDone,
+		       unsigned int TotalSteps,
+		       std::string HumanReadableAction) override;
 
     // return a progress bar of the given size for the given progress 
     // percent between 0.0 and 1.0 in the form "[####...]"
@@ -164,13 +163,13 @@ namespace Progress {
  {
     void * const d;
  public:
-    virtual bool StatusChanged(std::string PackageName,
-                               unsigned int StepsDone,
-                               unsigned int TotalSteps,
-                               std::string HumanReadableAction) APT_OVERRIDE;
+    bool StatusChanged(std::string PackageName,
+		       unsigned int StepsDone,
+		       unsigned int TotalSteps,
+		       std::string HumanReadableAction) override;
 
     PackageManagerText();
-    virtual ~PackageManagerText();
+    ~PackageManagerText() override;
  };
 
 
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index d4cc3c63c..559bbe0c9 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -78,10 +78,10 @@ class APT_PUBLIC pkgPackageManager : protected pkgCache::Namespace
    
    // Install helpers
    bool ConfigureAll();
-   bool SmartConfigure(PkgIterator Pkg, int const Depth) APT_MUSTCHECK;
-   bool SmartUnPack(PkgIterator Pkg, bool const Immediate = true, int const Depth = 0) APT_MUSTCHECK;
-   bool SmartRemove(PkgIterator Pkg) APT_MUSTCHECK;
-   bool EarlyRemove(PkgIterator Pkg, DepIterator const * const Dep) APT_MUSTCHECK;
+   [[nodiscard]] bool SmartConfigure(PkgIterator Pkg, int Depth);
+   [[nodiscard]] bool SmartUnPack(PkgIterator Pkg, bool Immediate = true, int Depth = 0);
+   [[nodiscard]] bool SmartRemove(PkgIterator Pkg);
+   [[nodiscard]] bool EarlyRemove(PkgIterator Pkg, DepIterator const *Dep);
 
    // The Actual installation implementation
    virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
@@ -130,9 +130,9 @@ class APT_PUBLIC pkgPackageManager : protected pkgCache::Namespace
    private:
    void * const d;
    enum APT_HIDDEN SmartAction { UNPACK_IMMEDIATE, UNPACK, CONFIGURE };
-   APT_HIDDEN bool NonLoopingSmart(SmartAction const action, pkgCache::PkgIterator &Pkg,
-      pkgCache::PkgIterator DepPkg, int const Depth, bool const PkgLoop,
-      bool * const Bad, bool * const Changed) APT_MUSTCHECK;
+   [[nodiscard]] APT_HIDDEN bool NonLoopingSmart(SmartAction action, pkgCache::PkgIterator &Pkg,
+						 pkgCache::PkgIterator DepPkg, int Depth, bool PkgLoop,
+						 bool *Bad, bool *Changed);
 };
 
 #endif
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index ffe30fa92..1f5f12885 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -32,6 +32,7 @@
 #include <apt-pkg/version.h>
 
 #include <algorithm>
+#include <array>
 #include <cstddef>
 #include <cstring>
 #include <sstream>
@@ -244,7 +245,7 @@ uint32_t pkgCache::CacheHash()
 
    XXH3_64bits_update(state,
 		      reinterpret_cast<const unsigned char *>(PACKAGE_VERSION),
-		      APT_ARRAY_SIZE(PACKAGE_VERSION));
+		      strlen(PACKAGE_VERSION));
 
    XXH3_64bits_update(state,
 		      reinterpret_cast<const unsigned char *>(&header),
@@ -340,24 +341,40 @@ const char *pkgCache::CompType(unsigned char Comp)
 /* */
 const char *pkgCache::DepType(unsigned char Type)
 {
-   const char *Types[] = {"",_("Depends"),_("PreDepends"),_("Suggests"),
-                          _("Recommends"),_("Conflicts"),_("Replaces"),
-                          _("Obsoletes"),_("Breaks"), _("Enhances")};
-   if (Type < sizeof(Types)/sizeof(*Types))
+   std::array<char const *, 12> Types{nullptr, _("Depends"), _("PreDepends"), _("Suggests"),
+				      _("Recommends"), _("Conflicts"), _("Replaces"),
+				      _("Obsoletes"), _("Breaks"), _("Enhances")};
+   if (Type < Types.size())
       return Types[Type];
    return "";
 }
+std::string_view pkgCache::DepType_NoL10n(unsigned char Type)
+{
+   std::array<std::string_view, 12> Types{"", "Depends", "PreDepends", "Suggests",
+					  "Recommends", "Conflicts", "Replaces",
+					  "Obsoletes", "Breaks", "Enhances"};
+   if (Type < Types.size())
+      return Types[Type];
+   return {};
+}
 									/*}}}*/
 // Cache::Priority - Convert a priority value to a string		/*{{{*/
-// ---------------------------------------------------------------------
-/* */
 const char *pkgCache::Priority(unsigned char Prio)
 {
-   const char *Mapping[] = {0,_("required"),_("important"),_("standard"),
-                            _("optional"),_("extra")};
-   if (Prio < APT_ARRAY_SIZE(Mapping))
+   std::array<char const *, 6> Mapping{nullptr, _("required"), _("important"), _("standard"),
+				       _("optional"), _("extra")};
+   if (Prio < Mapping.size())
+      return Mapping[Prio];
+   return nullptr;
+}
+std::string_view pkgCache::Priority_NoL10n(unsigned char Prio)
+{
+   constexpr std::array<std::string_view, 6> const Mapping{
+      "", "required", "important", "standard", "optional", "extra"
+   };
+   if (Prio < Mapping.size())
       return Mapping[Prio];
-   return 0;
+   return {};
 }
 									/*}}}*/
 // GrpIterator::FindPkg - Locate a package by arch			/*{{{*/
diff --git a/apt-pkg/pkgcache.h b/apt-pkg/pkgcache.h
index 7c16f0dee..476a01514 100644
--- a/apt-pkg/pkgcache.h
+++ b/apt-pkg/pkgcache.h
@@ -245,7 +245,8 @@ class APT_PUBLIC pkgCache								/*{{{*/
 
    // Useful transformation things
    static const char *Priority(unsigned char Priority);
-   
+   static std::string_view Priority_NoL10n(unsigned char Prio);
+
    // Accessors
    GrpIterator FindGrp(APT::StringView Name);
    PkgIterator FindPkg(APT::StringView Name);
@@ -278,6 +279,7 @@ class APT_PUBLIC pkgCache								/*{{{*/
    static const char *CompTypeDeb(unsigned char Comp) APT_PURE;
    static const char *CompType(unsigned char Comp) APT_PURE;
    static const char *DepType(unsigned char Dep);
+   static std::string_view DepType_NoL10n(unsigned char Dep);
 
    pkgCache(MMap *Map,bool DoMap = true);
    virtual ~pkgCache();
diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 589cebcde..3a377fe25 100644
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -72,9 +72,9 @@ class APT_PUBLIC pkgPolicy : public pkgDepCache::Policy
 		  std::string Data,signed short Priority);
 
    // Things for the cache interface.
-   virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   virtual signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) APT_OVERRIDE;
-   virtual signed short GetPriority(pkgCache::PkgFileIterator const &File) APT_OVERRIDE;
+   pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) override;
+   signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) override;
+   signed short GetPriority(pkgCache::PkgFileIterator const &File) override;
 
    void SetPriority(pkgCache::VerIterator const &Ver, signed short Priority);
    void SetPriority(pkgCache::PkgFileIterator const &File, signed short Priority);
diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc
index 00663ddca..da80222e8 100644
--- a/apt-pkg/solver3.cc
+++ b/apt-pkg/solver3.cc
@@ -162,9 +162,9 @@ class DefaultRootSetFunc2 : public pkgDepCache::DefaultRootSetFunc
 
    public:
    DefaultRootSetFunc2(pkgCache *cache) : Kernels(APT::KernelAutoRemoveHelper::GetProtectedKernelsFilter(cache)) {};
-   virtual ~DefaultRootSetFunc2() {};
+   ~DefaultRootSetFunc2() override = default;
 
-   bool InRootSet(const pkgCache::PkgIterator &pkg) APT_OVERRIDE { return pkg.end() == false && ((*Kernels)(pkg) || DefaultRootSetFunc::InRootSet(pkg)); };
+   bool InRootSet(const pkgCache::PkgIterator &pkg) override { return pkg.end() == false && ((*Kernels)(pkg) || DefaultRootSetFunc::InRootSet(pkg)); };
 }; // FIXME: DEDUP with pkgDepCache.
 /*}}}*/
 
diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index b32317cec..cf012eb8b 100644
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -120,7 +120,7 @@ class APT_PUBLIC pkgTagSection
     * @return \b true if section end was found, \b false otherwise.
     *  Beware that internal state will be inconsistent if \b false is returned!
     */
-   APT_MUSTCHECK bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
+   [[nodiscard]] bool Scan(const char *Start, unsigned long MaxLength, bool const Restart = true);
 
    inline unsigned long size() const {return Stop - Section;};
    void Trim();
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index b4015861c..a26047f1c 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -30,17 +30,16 @@ class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
    APT_HIDDEN void AssignItemID(pkgAcquire::ItemDesc &Itm);
 
    public:
-
-   virtual bool ReleaseInfoChanges(metaIndex const * const LastRelease, metaIndex const * const CurrentRelease, std::vector<ReleaseInfoChange> &&Changes) APT_OVERRIDE;
-   virtual bool MediaChange(std::string Media,std::string Drive) APT_OVERRIDE;
-   virtual void IMSHit(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Fetch(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Done(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Fail(pkgAcquire::ItemDesc &Itm) APT_OVERRIDE;
-   virtual void Start() APT_OVERRIDE;
-   virtual void Stop() APT_OVERRIDE;
-
-   bool Pulse(pkgAcquire *Owner) APT_OVERRIDE;
+   bool ReleaseInfoChanges(metaIndex const *LastRelease, metaIndex const *CurrentRelease, std::vector<ReleaseInfoChange> &&Changes) override;
+   bool MediaChange(std::string Media, std::string Drive) override;
+   void IMSHit(pkgAcquire::ItemDesc &Itm) override;
+   void Fetch(pkgAcquire::ItemDesc &Itm) override;
+   void Done(pkgAcquire::ItemDesc &Itm) override;
+   void Fail(pkgAcquire::ItemDesc &Itm) override;
+   void Start() override;
+   void Stop() override;
+
+   bool Pulse(pkgAcquire *Owner) override;
 
    AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet);
 };
diff --git a/apt-private/private-cacheset.h b/apt-private/private-cacheset.h
index cad8e4a00..887878004 100644
--- a/apt-private/private-cacheset.h
+++ b/apt-private/private-cacheset.h
@@ -86,9 +86,9 @@ class CacheSetHelperVirtuals: public APT::CacheSetHelper {
 public:
    APT::PackageSet virtualPkgs;
 
-   virtual pkgCache::VerIterator canNotGetVersion(enum CacheSetHelper::VerSelector const select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   virtual void canNotFindVersion(enum CacheSetHelper::VerSelector const select, APT::VersionContainerInterface * vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-   virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) APT_OVERRIDE;
+   pkgCache::VerIterator canNotGetVersion(enum CacheSetHelper::VerSelector select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) override;
+   void canNotFindVersion(enum CacheSetHelper::VerSelector select, APT::VersionContainerInterface *vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) override;
+   pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) override;
 
    CacheSetHelperVirtuals(bool const ShowErrors = true, GlobalError::MsgType const &ErrorType = GlobalError::NOTICE);
 };
@@ -108,20 +108,20 @@ public:
 
 	explicit CacheSetHelperAPTGet(std::ostream &out);
 
-	virtual void showPackageSelection(pkgCache::PkgIterator const &Pkg, enum PkgSelector const select, std::string const &pattern) APT_OVERRIDE;
+	void showPackageSelection(pkgCache::PkgIterator const &Pkg, enum PkgSelector select, std::string const &pattern) override;
 	void showTaskSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern);
 	void showFnmatchSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern);
 	void showRegExSelection(pkgCache::PkgIterator const &Pkg, std::string const &pattern);
-	void showVersionSelection(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver, enum VerSelector const select, std::string const &pattern) APT_OVERRIDE;
+	void showVersionSelection(pkgCache::PkgIterator const &Pkg, pkgCache::VerIterator const &Ver, enum VerSelector select, std::string const &pattern) override;
 	bool showVirtualPackageErrors(pkgCacheFile &Cache);
 
-	pkgCache::VerIterator canNotGetVersion(enum VerSelector const select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
-	void canNotFindVersion(enum VerSelector const select, APT::VersionContainerInterface * const vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
+	pkgCache::VerIterator canNotGetVersion(enum VerSelector select, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) override;
+	void canNotFindVersion(enum VerSelector select, APT::VersionContainerInterface *vci, pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg) override;
 	pkgCache::VerIterator canNotFindCandidateVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg);
 	pkgCache::VerIterator canNotFindNewestVer(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg);
 	pkgCache::VerIterator canNotFindVersionNumber(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, std::string const &verstr);
 	pkgCache::VerIterator canNotFindVersionRelease(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg, std::string const &verstr);
-	virtual pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) APT_OVERRIDE;
+	pkgCache::PkgIterator canNotFindPkgName(pkgCacheFile &Cache, std::string const &str) override;
 
 	APT::VersionSet tryVirtualPackage(pkgCacheFile &Cache, pkgCache::PkgIterator const &Pkg,
 						CacheSetHelper::VerSelector const select);
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 3f473b840..338ffae9b 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -357,7 +357,7 @@ bool DoDistClean(CommandLine &)
  class LogCleaner : public pkgArchiveCleaner
 {
    protected:
-      virtual void Erase(int const dirfd, char const * const File, std::string const &Pkg, std::string const &Ver,struct stat const &St) APT_OVERRIDE
+      void Erase(int const dirfd, char const * const File, std::string const &Pkg, std::string const &Ver,struct stat const &St) override
       {
 	 c1out << "Del " << Pkg << " " << Ver << " [" << SizeToStr(St.st_size) << "B]" << std::endl;
 
diff --git a/apt-private/private-list.cc b/apt-private/private-list.cc
index 6536c8df7..c5589aff0 100644
--- a/apt-private/private-list.cc
+++ b/apt-private/private-list.cc
@@ -63,12 +63,12 @@ class PackageNameMatcher : public Matcher
          filters.push_back(cachefilter);
       }
    }
-   virtual ~PackageNameMatcher()
+   ~PackageNameMatcher() override
    {
       for(J=filters.begin(); J != filters.end(); ++J)
          delete *J;
    }
-   virtual bool operator () (const pkgCache::PkgIterator &P) APT_OVERRIDE
+   bool operator()(const pkgCache::PkgIterator &P) override
    {
       for(J=filters.begin(); J != filters.end(); ++J)
       {
diff --git a/apt-private/private-output.h b/apt-private/private-output.h
index aaa9a8ed9..ebc840874 100644
--- a/apt-private/private-output.h
+++ b/apt-private/private-output.h
@@ -26,7 +26,7 @@ APT_PUBLIC extern std::ofstream devnull;
 APT_PUBLIC extern unsigned int ScreenWidth;
 
 APT_PUBLIC bool InitOutput(std::basic_streambuf<char> * const out = std::cout.rdbuf());
-APT_PUBLIC bool InitOutputPager() APT_MUSTCHECK;
+[[nodiscard]] APT_PUBLIC bool InitOutputPager();
 APT_PUBLIC bool IsStdoutAtty();
 
 void ListSingleVersion(pkgCacheFile &CacheFile, pkgRecords &records,
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index 4f0296046..694480a96 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -21,32 +21,11 @@
 
 #include <ostream>
 #include <string>
-#include <tuple>
 
 #include <apti18n.h>
 									/*}}}*/
 
 // DoUpdate - Update the package lists					/*{{{*/
-static bool isDebianBookwormRelease(pkgCache::RlsFileIterator const &RlsFile)
-{
-   std::tuple<std::string_view, std::string_view, std::string_view> const affected[] = {
-      {"Debian", "Debian", "bookworm"},
-      {"Debian", "Debian", "sid"},
-   };
-   if (RlsFile.end() || RlsFile->Origin == nullptr || RlsFile->Label == nullptr || RlsFile->Codename == nullptr)
-      return false;
-   std::tuple<std::string_view, std::string_view, std::string_view> const release{RlsFile.Origin(), RlsFile.Label(), RlsFile.Codename()};
-   return std::find(std::begin(affected), std::end(affected), release) != std::end(affected);
-}
-static void suggestDebianNonFreeFirmware(char const *const repo, char const *const val,
-					 char const *const from, char const *const to)
-{
-   // Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-   _error->Notice(_("Repository '%s' changed its '%s' value from '%s' to '%s'"), repo, val, from, to);
-   std::string notes;
-   strprintf(notes, "https://www.debian.org/releases/bookworm/%s/release-notes/ch-information.html#non-free-split", _config->Find("APT::Architecture").c_str());
-   _error->Notice(_("More information about this can be found online in the Release notes at: %s"), notes.c_str());
-}
 bool DoUpdate(CommandLine &CmdL)
 {
    if (CmdL.FileSize() != 1)
@@ -125,114 +104,6 @@ bool DoUpdate()
       }
    }
 
-   if (_config->FindB("APT::Get::Update::SourceListWarnings::NonFreeFirmware", SLWarnings))
-   {
-      // If a Debian source has a non-free component, suggest adding non-free-firmware
-      bool found_affected_release = false;
-      bool found_non_free = false;
-      bool found_non_free_firmware = false;
-      for (auto *S : *List)
-      {
-	 if (not isDebianBookwormRelease(S->FindInCache(Cache, false)))
-	    continue;
-
-	 for (auto PkgFile = Cache.GetPkgCache()->FileBegin(); not PkgFile.end(); ++PkgFile)
-	 {
-	    if (PkgFile.Flagged(pkgCache::Flag::NoPackages))
-	       continue;
-	    found_affected_release = true;
-	    const auto * const comp = PkgFile.Component();
-	    if (comp == nullptr)
-	      continue;
-	    if (strcmp(comp, "non-free") == 0)
-	       found_non_free = true;
-	    else if (strcmp(comp, "non-free-firmware") == 0)
-	    {
-	       found_non_free_firmware = true;
-	       break;
-	    }
-	 }
-	 if (found_non_free_firmware)
-	    break;
-      }
-      if (not found_non_free_firmware && found_non_free && found_affected_release)
-      {
-	 /* See if a well-known firmware package is installable from this codename
-	    if so, we likely operate with new apt on an old snapshot not supporting non-free-firmware */
-	 bool suggest_non_free_firmware = true;
-	 if (auto const Grp = Cache.GetPkgCache()->FindGrp("firmware-linux-nonfree"); not Grp.end())
-	 {
-	    for (auto Pkg = Grp.PackageList(); not Pkg.end() && suggest_non_free_firmware; Pkg = Grp.NextPkg(Pkg))
-	    {
-	       for (auto Ver = Pkg.VersionList(); not Ver.end(); ++Ver)
-	       {
-		  if (not Ver.Downloadable())
-		     continue;
-		  for (auto VerFile = Ver.FileList(); not VerFile.end(); ++VerFile)
-		  {
-		     auto const PkgFile = VerFile.File();
-		     if (PkgFile.end())
-			continue;
-		     if (not isDebianBookwormRelease(PkgFile.ReleaseFile()))
-			continue;
-		     suggest_non_free_firmware = false;
-		     break;
-		  }
-		  if (not suggest_non_free_firmware)
-		     break;
-	       }
-	    }
-	 }
-	 if (suggest_non_free_firmware)
-	    suggestDebianNonFreeFirmware("Debian bookworm", "non-free component", "non-free", "non-free non-free-firmware");
-      }
-
-      if (not found_non_free_firmware && not found_non_free && found_affected_release)
-      {
-	 /* Try to notify users who have installed firmware packages at some point, but
-	    have not enabled non-free currently – they might want to opt into updates now */
-	 std::string_view const affected_pkgs[] = {
-	    "amd64-microcode", "atmel-firmware", "bluez-firmware", "dahdi-firmware-nonfree",
-	    "firmware-amd-graphics", "firmware-ast", "firmware-atheros", "firmware-bnx2",
-	    "firmware-bnx2x", "firmware-brcm80211", "firmware-cavium", "firmware-intel-sound",
-	    "firmware-intelwimax", "firmware-ipw2x00", "firmware-ivtv", "firmware-iwlwifi",
-	    "firmware-libertas", "firmware-linux", "firmware-linux-nonfree", "firmware-misc-nonfree",
-	    "firmware-myricom", "firmware-netronome", "firmware-netxen", "firmware-qcom-media",
-	    "firmware-qcom-soc", "firmware-qlogic", "firmware-realtek", "firmware-realtek-rtl8723cs-bt",
-	    "firmware-samsung", "firmware-siano", "firmware-sof-signed", "firmware-ti-connectivity",
-	    "firmware-zd1211", "intel-microcode", "midisport-firmware", "raspi-firmware",
-	 };
-	 bool suggest_non_free_firmware = false;
-	 for (auto pkgname : affected_pkgs)
-	 {
-	    auto const Grp = Cache.GetPkgCache()->FindGrp(pkgname);
-	    if (Grp.end())
-	       continue;
-	    for (auto Pkg = Grp.PackageList(); not Pkg.end(); Pkg = Grp.NextPkg(Pkg))
-	    {
-	       auto const Ver = Pkg.CurrentVer();
-	       if (Ver.end() || Ver.Downloadable())
-		  continue;
-	       bool another = false;
-	       for (auto V = Pkg.VersionList(); not V.end(); ++V)
-		  if (V.Downloadable())
-		  {
-		     another = true;
-		     break;
-		  }
-	       if (another)
-		  continue;
-	       suggest_non_free_firmware = true;
-	       break;
-	    }
-	    if (suggest_non_free_firmware)
-	       break;
-	 }
-	 if (suggest_non_free_firmware)
-	    suggestDebianNonFreeFirmware("Debian bookworm", "firmware component", "non-free", "non-free-firmware");
-      }
-   }
-
    if (_config->FindB("APT::Get::Update::SourceListWarnings::SignedBy", SLWarnings))
    {
       for (auto *S : *List)
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index 94202d9e1..13d875366 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -44,12 +44,12 @@ protected:
    OpTextProgress Progress;
    void Prompt(const char *Text);
    string PromptLine(const char *Text);
-   bool AskCdromName(string &name) APT_OVERRIDE;
+   bool AskCdromName(string &name) override;
 
 public:
-   virtual void Update(string text, int current) APT_OVERRIDE;
-   virtual bool ChangeCdrom() APT_OVERRIDE;
-   virtual OpProgress* GetOpProgress() APT_OVERRIDE;
+   void Update(string text, int current) override;
+   bool ChangeCdrom() override;
+   OpProgress* GetOpProgress() override;
 };
 
 void pkgCdromTextStatus::Prompt(const char *Text)
diff --git a/cmdline/apt-extracttemplates.h b/cmdline/apt-extracttemplates.h
index bbd926e61..e0451ec51 100644
--- a/cmdline/apt-extracttemplates.h
+++ b/cmdline/apt-extracttemplates.h
@@ -24,10 +24,10 @@ class DebFile : public pkgDirStream
 	
 public:
 	explicit DebFile(const char *FileName);
-	~DebFile();
-	bool DoItem(Item &I, int &fd) APT_OVERRIDE;
-	bool Process(pkgDirStream::Item &I, const unsigned char *data, 
-		unsigned long long size, unsigned long long pos) APT_OVERRIDE;
+	~DebFile() override;
+	bool DoItem(Item &I, int &fd) override;
+	bool Process(pkgDirStream::Item &I, const unsigned char *data,
+		unsigned long long size, unsigned long long pos) override;
 
 	bool Go();
 	bool ParseInfo();
diff --git a/cmdline/apt-internal-planner.cc b/cmdline/apt-internal-planner.cc
index c77997a7a..b850ed628 100644
--- a/cmdline/apt-internal-planner.cc
+++ b/cmdline/apt-internal-planner.cc
@@ -51,7 +51,7 @@ static bool ShowHelp(CommandLine &)					/*{{{*/
 	return true;
 }
 									/*}}}*/
-APT_NORETURN static void DIE(std::string const &message) {		/*{{{*/
+[[noreturn]] static void DIE(std::string const &message) {		/*{{{*/
 	std::cerr << "ERROR: " << message << std::endl;
 	_error->DumpErrors(std::cerr);
 	exit(EXIT_FAILURE);
@@ -68,17 +68,17 @@ class PMOutput: public pkgPackageManager				/*{{{*/
    bool const Debug;
 
 protected:
-   virtual bool Install(PkgIterator Pkg,std::string) APT_OVERRIDE
+   bool Install(PkgIterator Pkg,std::string /*filename*/) override
    {
       //std::cerr << "INSTALL: " << APT::PrettyPkg(&Cache, Pkg) << std::endl;
       return EDSP::WriteSolutionStanza(output, "Unpack", Cache[Pkg].InstVerIter(Cache));
    }
-   virtual bool Configure(PkgIterator Pkg) APT_OVERRIDE
+   bool Configure(PkgIterator Pkg) override
    {
       //std::cerr << "CONFIGURE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl;
       return EDSP::WriteSolutionStanza(output, "Configure", Cache[Pkg].InstVerIter(Cache));
    }
-   virtual bool Remove(PkgIterator Pkg,bool) APT_OVERRIDE
+   bool Remove(PkgIterator Pkg, bool /*Purge*/) override
    {
       //std::cerr << "REMOVE: " << APT::PrettyPkg(&Cache, Pkg) << " " << std::endl;
       return EDSP::WriteSolutionStanza(output, "Remove", Pkg.CurrentVer());
diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index d596dcb5e..ceedd96c7 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -51,7 +51,7 @@ static bool ShowHelp(CommandLine &)					/*{{{*/
 	return true;
 }
 									/*}}}*/
-APT_NORETURN static void DIE(std::string const &message) {		/*{{{*/
+[[noreturn]] static void DIE(std::string const &message) {		/*{{{*/
 	std::cerr << "ERROR: " << message << std::endl;
 	_error->DumpErrors(std::cerr);
 	exit(EXIT_FAILURE);
diff --git a/debian/control b/debian/control
index 1022efa37..aa106ff50 100644
--- a/debian/control
+++ b/debian/control
@@ -69,7 +69,8 @@ Description: commandline package manager
     as well as installable packages
   * apt-cdrom to use removable media as a source for packages
   * apt-config as an interface to the configuration settings
-  * apt-key as an interface to manage authentication keys
+  * apt-extracttemplates is used by debconf to prompt for configuration
+    questions before installation.
 
 Package: libapt-pkg6.0t64
 Replaces: libapt-pkg6.0
@@ -95,8 +96,8 @@ Description: package management runtime library
     solver or by interfacing with an external one
   * authenticating the sources and validating the retrieved data
   * installation and removal of packages in the system
-  * providing different transports to retrieve data over cdrom, ftp,
-    http(s), rsh as well as an interface to add more transports like
+  * providing different transports to retrieve data over cdrom and
+    http(s) as well as an interface to add more transports like
     tor+http(s) (apt-transport-tor).
 
 Package: apt-doc
@@ -146,8 +147,6 @@ Description: package management related utility programs
  This package contains some less used commandline utilities related
  to package management with APT.
  .
-  * apt-extracttemplates is used by debconf to prompt for configuration
-    questions before installation.
   * apt-ftparchive is used to create Packages and other index files
     needed to publish an archive of Debian packages
   * apt-sortpkgs is a Packages/Sources file normalizer.
diff --git a/doc/apt-verbatim.ent b/doc/apt-verbatim.ent
index 67977ccc8..61db5888b 100644
--- a/doc/apt-verbatim.ent
+++ b/doc/apt-verbatim.ent
@@ -69,12 +69,6 @@
   </citerefentry>"
 >
 
-<!ENTITY apt-key "<citerefentry>
-    <refentrytitle><command>apt-key</command></refentrytitle>
-    <manvolnum>8</manvolnum>
-  </citerefentry>"
->
-
 <!ENTITY apt-secure "<citerefentry>
     <refentrytitle>apt-secure</refentrytitle>
     <manvolnum>8</manvolnum>
@@ -424,23 +418,6 @@
 		&synopsis-help;
 	</group>
 </cmdsynopsis></refsynopsisdiv>">
-<!ENTITY synopsis-param-keyid "<replaceable>&synopsis-keyid;</replaceable>">
-<!ENTITY synopsis-command-apt-key "<refsynopsisdiv><cmdsynopsis>
-	<command>apt-key</command>
-	<arg><option>--keyring &synopsis-param-filename;</option></arg>
-	<group choice='req'>
-		<arg choice='plain'>add &synopsis-param-filename;</arg>
-		<arg choice='plain'>del &synopsis-param-keyid;</arg>
-		<arg choice='plain'>export &synopsis-param-keyid;</arg>
-		<arg choice='plain'>exportall</arg>
-		<arg choice='plain'>list</arg>
-		<arg choice='plain'>finger</arg>
-		<arg choice='plain'>adv</arg>
-		<arg choice='plain'>update</arg>
-		<arg choice='plain'>net-update</arg>
-		&synopsis-help;
-	</group>
-</cmdsynopsis></refsynopsisdiv>">
 <!ENTITY synopsis-command-apt-mark "<refsynopsisdiv><cmdsynopsis>
 	<command>apt-mark</command>
 	<group choice='plain'>
diff --git a/doc/apt.conf.5.xml b/doc/apt.conf.5.xml
index 702a71c78..356427032 100644
--- a/doc/apt.conf.5.xml
+++ b/doc/apt.conf.5.xml
@@ -535,47 +535,6 @@ APT::Compressor::rev {
      manpages respectively.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term><option>ftp</option></term>
-     <listitem><para>
-     <literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.
-     It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>.
-     Per host proxies can also be specified by using the form
-     <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</literal> 
-	 meaning to use no proxies. If no one of the above settings is specified,
-	 <envar>ftp_proxy</envar> environment variable
-	 will be used. To use an FTP
-     proxy you will have to set the <literal>ftp::ProxyLogin</literal> script in the 
-     configuration file. This entry specifies the commands to send to tell 
-     the proxy server what to connect to. Please see 
-     &configureindex; for an example of 
-     how to do this. The substitution variables representing the corresponding
-     URI component are <literal>$(PROXY_USER)</literal>,
-     <literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>,
-     <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and
-     <literal>$(SITE_PORT)</literal>.</para>
-
-     <para>The option <literal>timeout</literal> sets the timeout timer used by the method;
-     this value applies to the connection as well as the data timeout.</para>
-
-     <para>Several settings are provided to control passive mode. Generally it is 
-     safe to leave passive mode on; it works in nearly every environment. 
-     However, some situations require that passive mode be disabled and port 
-     mode FTP used instead. This can be done globally or for connections that 
-     go through a proxy or for a specific host (see the sample config file 
-     for examples).</para>
-
-     <para>It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</envar>
-     environment variable to an HTTP URL - see the discussion of the http method
-     above for syntax. You cannot set this in the configuration file and it is
-     not recommended to use FTP over HTTP due to its low efficiency.</para>
-
-     <para>The setting <literal>ForceExtended</literal> controls the use of RFC2428 
-     <literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is false, which means
-     these commands are only used if the control connection is IPv6. Setting this
-     to true forces their use even on IPv4 connections. Note that most FTP servers
-     do not support RFC2428.</para></listitem>
-     </varlistentry>
-
      <varlistentry><term><option>cdrom</option></term>
      <listitem><para>
      For URIs using the <literal>cdrom</literal> method, the only configurable
@@ -1057,17 +1016,6 @@ APT::Compressor::rev {
      </varlistentry>
 
      <varlistentry>
-       <term><option>Debug::Acquire::ftp</option></term>
-
-       <listitem>
-	 <para>
-	   Print information related to downloading packages using
-	   FTP.
-	 </para>
-       </listitem>
-     </varlistentry>
-
-     <varlistentry>
        <term><option>Debug::Acquire::http</option></term>
 
        <listitem>
diff --git a/doc/apt.ent b/doc/apt.ent
index b502073a9..9034d2e66 100644
--- a/doc/apt.ent
+++ b/doc/apt.ent
@@ -258,7 +258,3 @@ or further configured by the <option>APT::Color</option> configuration option an
 
 <!-- TRANSLATOR: used as parameter for apt-ftparchive  e.g. apt-ftparchive generate section -->
 <!ENTITY synopsis-section "section">
-
-<!-- TRANSLATOR: used as in apt-key export keyid  e.g. apt-key export 473041FA -->
-<!ENTITY synopsis-keyid "keyid">
-
diff --git a/doc/design.dbk b/doc/design.dbk
index ab49d9790..2ed3800a5 100644
--- a/doc/design.dbk
+++ b/doc/design.dbk
@@ -142,7 +142,7 @@ still satisfied.
 <para>
 Handle source lists for updates from multiple sources. APT should also be able
 to handle diverse methods of acquiring new packages; local filesystem,
-mountable CD-ROM drives, FTP accessible repositories are some of the methods
+mountable CD-ROM drives, HTTP accessible repositories are some of the methods
 that come to mind. Also, the source lists can be separated into categories,
 such as main, contrib, non-local, non-free, my-very-own, etc. APT
 should be set up to retrieve the Packages files from these multiple source
@@ -203,7 +203,7 @@ midst of installation, which may cause havoc on the machine)
 <para>
 This process handles setting of user or site options, and configuration of all
 aspects of APT. It allows the user to set the location and order of package
-sources, allowing them to set up source list details, like ftp site locations,
+sources, allowing them to set up source list details, like http site locations,
 passwords, etc. Display options may also be set.
 </para>
 </listitem>
@@ -216,7 +216,7 @@ Build a list of available packages, using source lists or a base location and
 trawling for Packages files (needs to be aware of architecture). This may
 involve finding and retrieving Packages files, storing them locally for
 efficiency, and parsing the data for later use. This would entail contacting
-various underlying access modules (ftp, cdrom mounts, etc) Use a backing store
+various underlying access modules (http, cdrom mounts, etc) Use a backing store
 for speed. This may also require downloading the actual package files locally
 for speed.
 </para>
@@ -308,7 +308,7 @@ set here?
 Distinct versions of the same package are recorded separately, but if multiple
 Packages files contain the same version of a package, then only the first one
 is recorded. For this reason, the least expensive update source should be
-listed first (local file system is better than a remote ftp site)
+listed first (local file system is better than a remote http site)
 </para>
 <para>
 This module should interact with the user interface module to set and change
@@ -318,7 +318,7 @@ information in an on disk data file, to be read on future invocations.
 <orderedlist numeration="arabic">
 <listitem>
 <para>
-FTP methods
+HTTP methods
 </para>
 </listitem>
 <listitem>
@@ -394,9 +394,9 @@ module to interact with dpkg
 
 <chapter id="ch5"><title>Data flow and conversions analysis.</title>
 <screen>
-                                                          ____________
-                                                       __\|ftp modules|
-                                                      /  /|___________|
+                                                          _____________
+                                                       __\|http modules|
+                                                      /  /|____________|
                                     _ ____________   /     ________________
                                     |    update   | /     |mount/local file|
         |==========================&gt;|   module    |/_____\|  traversals    |
diff --git a/doc/examples/configure-index b/doc/examples/configure-index
index 15338c17d..ba51a9881 100644
--- a/doc/examples/configure-index
+++ b/doc/examples/configure-index
@@ -132,7 +132,6 @@ APT
         SourceListWarnings "<BOOL>"
         {
            APTAuth "<BOOL>";
-           NonFreeFirmware "<BOOL>";
            SignedBy "<BOOL>";
         };
      };
@@ -334,31 +333,6 @@ Acquire
 	User-Agent "Debian APT-CURL/1.0";
   };
 
-  ftp
-  {
-    Proxy "ftp://127.0.0.1/";
-    Proxy::http.us.debian.org "DIRECT"; // Specific per-host setting
-
-    /* Required script to perform proxy login. This example should work
-       for tisfwtk */
-    ProxyLogin
-    {
-       "USER $(PROXY_USER)";
-       "PASS $(PROXY_PASS)";
-       "USER $(SITE_USER)@$(SITE):$(SITE_PORT)";
-       "PASS $(SITE_PASS)";
-    };
-    
-    Timeout "30";
-    ConnectionAttemptDelayMsec "250";
-    
-    /* Passive mode control, proxy, non-proxy and per-host. Pasv mode
-       is preferred if possible */
-    Passive "true";
-    Proxy::Passive "true";
-    Passive::http.us.debian.org "true"; // Specific per-host setting
-  };
-  
   cdrom
   {
     AutoDetect "<BOOL>"; // do auto detection of the cdrom mountpoint
@@ -579,7 +553,6 @@ Debug
   BuildDeps "<BOOL>";
   pkgInitialize "<BOOL>";   // This one will dump the configuration space
   NoLocking "<BOOL>";
-  Acquire::Ftp "<BOOL>";    // Show ftp command traffic
   Acquire::Http "<BOOL>";   // Show http command traffic
   Acquire::Https "<BOOL>";   // Show https debug
   Acquire::tor "<BOOL>";
diff --git a/doc/files.dbk b/doc/files.dbk
index 95e6257e4..ac671fdba 100644
--- a/doc/files.dbk
+++ b/doc/files.dbk
@@ -85,15 +85,12 @@ The var directory structure is as follows:
 			 cdrom
 			 copy
 			 file
-			 ftp
 			 gpgv
 			 gzip
 			 http
 			 https
 			 lzma
 			 rred
-			 rsh
-			 ssh
 </screen>
 <para>
 As is specified in the FHS 2.1 /var/lib/apt is used for application data that
diff --git a/doc/guide.dbk b/doc/guide.dbk
index c5e6df257..bb314fdd5 100644
--- a/doc/guide.dbk
+++ b/doc/guide.dbk
@@ -223,7 +223,6 @@ use packages on your CD-ROM before downloading from the Internet.
 
  For example:
       file:/mnt/debian,
-      ftp://ftp.example.org/debian,
       http://deb.debian.org/debian,
 
 
diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot
index dfed6c4d5..a05bc756d 100644
--- a/doc/po/apt-doc.pot
+++ b/doc/po/apt-doc.pot
@@ -525,13 +525,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -3473,64 +3466,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of "
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal>.  Per host proxies can "
-"also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the "
-"<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
-"entry specifies the commands to send to tell the proxy server what to "
-"connect to. Please see &configureindex; for an example of how to do "
-"this. The substitution variables representing the corresponding URI "
-"component are <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> and "
-"<literal>$(SITE_PORT)</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the "
-"<envar>ftp_proxy</envar> environment variable to an HTTP URL - see the "
-"discussion of the http method above for syntax. You cannot set this in the "
-"configuration file and it is not recommended to use FTP over HTTP due to its "
-"low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -4192,11 +4127,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
@@ -6140,42 +6070,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
 "APT."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -6318,14 +6218,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6333,7 +6233,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
@@ -6341,16 +6241,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6358,7 +6258,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
@@ -9109,7 +9009,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
diff --git a/doc/po/de.po b/doc/po/de.po
index 71b7ead94..e25317f1a 100644
--- a/doc/po/de.po
+++ b/doc/po/de.po
@@ -697,13 +697,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"Abschnitt\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4987,98 +4980,6 @@ msgstr ""
 "Protokolle HTTP und HTTPS abwickelt. Sie sind in den Handbuchseiten &apt-"
 "transport-http; beziehungsweise &apt-transport-https; dokumentiert."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
-"benutzt werden soll. Er wird in der Standardform <literal>ftp://[[Benutzer][:"
-"Passwort]@]Rechner[:Port]/</literal> angegeben. Proxys pro Rechner können "
-"außerdem in der Form <literal>ftp::Proxy::&lt;Rechner&gt;</literal> "
-"angegeben werden. Hierbei bedeutet das spezielle Schlüsselwort "
-"<literal>DIRECT</literal>, dass keine Proxys benutzt werden. Falls keine der "
-"obigen Einstellungen angegeben wurde, wird die Umgebungsvariable "
-"<envar>ftp_proxy</envar> benutzt. Um einen FTP-Proxy zu benutzen, müssen Sie "
-"in der Konfigurationsdatei das Skript <literal>ftp::ProxyLogin</literal> "
-"setzen. Dieser Eintrag gibt die Befehle an, die gesendet werden müssen, um "
-"dem Proxy-Server mitzuteilen, womit er sich verbinden soll. Ein Beispiel, "
-"wie das funktioniert, finden Sie unter &configureindex;. Die "
-"Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, sind "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> und <literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"Die Option <literal>timeout</literal> stellt den Zeitnehmer, der von der "
-"Methode benutzt wird. Dieser Wert wird auf die Verbindungs- sowie die "
-"Datenzeitüberschreitungen angewendet."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Mehrere Einstellungen werden zum Steuern des passiven Modus bereitgestellt. "
-"Generell ist es sicher, den passiven Modus eingeschaltet zu lassen, er "
-"funktioniert in nahezu jeder Umgebung. Jedoch erfordern einige Situationen, "
-"dass der passive Modus ausgeschaltet und stattdessen Port-Modus-FTP benutzt "
-"wird. Dies kann global eingestellt werden oder für Verbindungen, die durch "
-"einen Proxy oder zu einem bestimmten Rechner gehen (Beispiele finden Sie in "
-"der Musterkonfigurationsdatei)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Es ist möglich, FTP über HTTP zu leiten, indem die Umgebungsvariable "
-"<envar>ftp_proxy</envar> auf eine HTTP-URL gesetzt wird – lesen Sie die "
-"Besprechung der HTTP-Methode oberhalb bezüglich der Syntax. Sie können dies "
-"nicht in der Konfigurationsdatei setzen und es wird wegen der geringen "
-"Effizienz nicht empfohlen, FTP über HTTP zu benutzen."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"Die Einstellung <literal>ForceExtended</literal> steuert die Benutzung der "
-"RFC-2428-Befehle <literal>EPSV</literal> und <literal>EPRT</literal>. Die "
-"Vorgabe ist »false«, was bedeutet, dass diese Befehle nur benutzt werden, "
-"wenn die Steuerverbindung IPv6 ist. Durch Stellen auf »true« wird die "
-"Benutzung selbst auf IPv4-Verbindungen erzwungen. Beachten Sie, dass die "
-"wenigsten FTP-Server RFC 2428 unterstützen."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -6094,13 +5995,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"gibt Informationen aus, die sich auf das Herunterladen von Paketen per FTP "
-"beziehen."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "gibt Informationen aus, die sich auf das Herunterladen von Paketen per HTTP "
@@ -8881,39 +8775,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"Das Schema »ftp« gibt einen FTP-Server für ein Archiv an. Die Verwendung von "
-"FTP geht zu Gunsten von <literal>http</literal> und <literal>https</literal> "
-"zurück und viele Archive haben entweder nie FTP-Zugriff geboten oder ziehen "
-"diesen zurück. Falls Sie diese Methode immer noch benötigen, sind dafür "
-"viele Konfigurationsoptionen im Bereich <literal>Acquire::ftp</literal> "
-"verfügbar und ausführlich in &apt-conf; erklärt."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Bitte beachten Sie, dass ein FTP-Proxy durch Benutzung der <envar>ftp_proxy</"
-"envar>-Umgebungsvariablen angegeben werden kann. Es ist mittels dieser "
-"Umgebungsvariable und <emphasis>nur</emphasis> dieser Umgebungsvariable "
-"möglich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server verstehen oft auch "
-"FTP-URLs). Proxys, die HTTP benutzen und in der Konfigurationsdatei "
-"festgelegt sind, werden ignoriert."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8924,20 +8785,6 @@ msgstr ""
 "Herkunftsort benutzt zu werden. Dies ist für Leute nützlich, die "
 "Wechseldatenträger benutzen, um Dateien mit APT umherzukopieren."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Die Methode »rsh/ssh« ruft RSH/SSH auf, um sich mit einem Rechner in der "
-"Ferne zu verbinden und als angegebener Benutzer auf die Dateien zuzugreifen. "
-"Es wird empfohlen, vorher Rhosts oder RSA-Schlüssel zu konfigurieren. Für "
-"die Übertragung von Dateien aus der Ferne werden die Standardbefehle "
-"<command>find</command> und <command>dd</command> verwandt."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -9119,64 +8966,64 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"benutzt FTP, um auf das Archiv auf archive.debian.org unter dem debian-"
+"benutzt HTTPS, um auf das Archiv auf deb.debian.org unter dem debian-"
 "Verzeichnis zuzugreifen und nur den &debian-stable-codename;/contrib-Bereich "
 "zu benutzen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"benutzt FTP, um auf das Archiv auf ftp.example.org unter dem debian-"
+"benutzt HTTPS, um auf das Archiv auf deb.debian.org unter dem debian-"
 "Verzeichnis zuzugreifen und nur den unstable/contrib-Bereich zu benutzen. "
 "Falls diese Zeile zusammen mit der aus dem vorherigen Beispiel in der Datei "
-"<filename>sources.list</filename> auftaucht, wird eine einzelne FTP-Sitzung "
-"für beide Quellzeilen benutzt."
+"<filename>sources.list</filename> auftaucht, wird eine einzelne HTTPS-"
+"Sitzung für beide Quellzeilen benutzt."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12875,7 +12722,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12888,7 +12734,6 @@ msgstr ""
 "\n"
 " Zum Beispiel:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -14080,6 +13925,144 @@ msgstr ""
 "fortfahren, wodurch die bereits auf der Platte heruntergeladenen Archive "
 "benutzt werden."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> setzt den Standard-Proxy, der für FTP-URIs "
+#~ "benutzt werden soll. Er wird in der Standardform <literal>ftp://"
+#~ "[[Benutzer][:Passwort]@]Rechner[:Port]/</literal> angegeben. Proxys pro "
+#~ "Rechner können außerdem in der Form <literal>ftp::Proxy::&lt;Rechner&gt;</"
+#~ "literal> angegeben werden. Hierbei bedeutet das spezielle Schlüsselwort "
+#~ "<literal>DIRECT</literal>, dass keine Proxys benutzt werden. Falls keine "
+#~ "der obigen Einstellungen angegeben wurde, wird die Umgebungsvariable "
+#~ "<envar>ftp_proxy</envar> benutzt. Um einen FTP-Proxy zu benutzen, müssen "
+#~ "Sie in der Konfigurationsdatei das Skript <literal>ftp::ProxyLogin</"
+#~ "literal> setzen. Dieser Eintrag gibt die Befehle an, die gesendet werden "
+#~ "müssen, um dem Proxy-Server mitzuteilen, womit er sich verbinden soll. "
+#~ "Ein Beispiel, wie das funktioniert, finden Sie unter &configureindex;. "
+#~ "Die Platzhaltervariablen, die für den zugehörigen URI-Bestandteil stehen, "
+#~ "sind <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> und <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "Die Option <literal>timeout</literal> stellt den Zeitnehmer, der von der "
+#~ "Methode benutzt wird. Dieser Wert wird auf die Verbindungs- sowie die "
+#~ "Datenzeitüberschreitungen angewendet."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Mehrere Einstellungen werden zum Steuern des passiven Modus "
+#~ "bereitgestellt. Generell ist es sicher, den passiven Modus eingeschaltet "
+#~ "zu lassen, er funktioniert in nahezu jeder Umgebung. Jedoch erfordern "
+#~ "einige Situationen, dass der passive Modus ausgeschaltet und stattdessen "
+#~ "Port-Modus-FTP benutzt wird. Dies kann global eingestellt werden oder für "
+#~ "Verbindungen, die durch einen Proxy oder zu einem bestimmten Rechner "
+#~ "gehen (Beispiele finden Sie in der Musterkonfigurationsdatei)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Es ist möglich, FTP über HTTP zu leiten, indem die Umgebungsvariable "
+#~ "<envar>ftp_proxy</envar> auf eine HTTP-URL gesetzt wird – lesen Sie die "
+#~ "Besprechung der HTTP-Methode oberhalb bezüglich der Syntax. Sie können "
+#~ "dies nicht in der Konfigurationsdatei setzen und es wird wegen der "
+#~ "geringen Effizienz nicht empfohlen, FTP über HTTP zu benutzen."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "Die Einstellung <literal>ForceExtended</literal> steuert die Benutzung "
+#~ "der RFC-2428-Befehle <literal>EPSV</literal> und <literal>EPRT</literal>. "
+#~ "Die Vorgabe ist »false«, was bedeutet, dass diese Befehle nur benutzt "
+#~ "werden, wenn die Steuerverbindung IPv6 ist. Durch Stellen auf »true« wird "
+#~ "die Benutzung selbst auf IPv4-Verbindungen erzwungen. Beachten Sie, dass "
+#~ "die wenigsten FTP-Server RFC 2428 unterstützen."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "gibt Informationen aus, die sich auf das Herunterladen von Paketen per "
+#~ "FTP beziehen."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "Das Schema »ftp« gibt einen FTP-Server für ein Archiv an. Die Verwendung "
+#~ "von FTP geht zu Gunsten von <literal>http</literal> und <literal>https</"
+#~ "literal> zurück und viele Archive haben entweder nie FTP-Zugriff geboten "
+#~ "oder ziehen diesen zurück. Falls Sie diese Methode immer noch benötigen, "
+#~ "sind dafür viele Konfigurationsoptionen im Bereich <literal>Acquire::ftp</"
+#~ "literal> verfügbar und ausführlich in &apt-conf; erklärt."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Bitte beachten Sie, dass ein FTP-Proxy durch Benutzung der "
+#~ "<envar>ftp_proxy</envar>-Umgebungsvariablen angegeben werden kann. Es ist "
+#~ "mittels dieser Umgebungsvariable und <emphasis>nur</emphasis> dieser "
+#~ "Umgebungsvariable möglich, einen HTTP-Proxy anzugeben (HTTP-Proxy-Server "
+#~ "verstehen oft auch FTP-URLs). Proxys, die HTTP benutzen und in der "
+#~ "Konfigurationsdatei festgelegt sind, werden ignoriert."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Die Methode »rsh/ssh« ruft RSH/SSH auf, um sich mit einem Rechner in der "
+#~ "Ferne zu verbinden und als angegebener Benutzer auf die Dateien "
+#~ "zuzugreifen. Es wird empfohlen, vorher Rhosts oder RSA-Schlüssel zu "
+#~ "konfigurieren. Für die Übertragung von Dateien aus der Ferne werden die "
+#~ "Standardbefehle <command>find</command> und <command>dd</command> "
+#~ "verwandt."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"Schlüsselkennung\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/es.po b/doc/po/es.po
index 0eb8a0cbe..79b95783a 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -777,15 +777,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4956,96 +4947,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
-"para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario][:"
-"contraseña]@]máquina[:puerto]/</literal>. También se puede especificar un "
-"proxy por cada máquina usando la forma <literal>ftp::Proxy::&lt;máquina&gt;</"
-"literal> con la palabra especial <literal>DIRECT</literal>, que significa "
-"que no se use ningún proxy. La variable de entorno <envar>ftp_proxy</envar> "
-"se usará en caso de no definir ninguna de las opciones anteriores. Para usar "
-"un proxy FTP debe configurar el script <literal>ftp::ProxyLogin</literal> en "
-"el fichero de configuración. Esta entrada define las órdenes a enviar para "
-"decirle al servidor del proxy a qué conectarse. Consulte &configureindex; "
-"para un ejemplo de uso. Las variables de sustitución que representan el "
-"componente URI son <literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
-"literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-"<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"La opción <literal>timeout</literal> define el tiempo máximo de espera "
-"utilizado por el método; este valor se aplica al establecimiento de conexión "
-"y a la recepción de datos."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Puede controlar el modo pasivo a través de varias opciones. Habitualmente, "
-"es seguro dejar activado el modo pasivo, y funciona en casi todos los "
-"entornos. Sin embargo algunas situaciones requieren desactivar el modo "
-"pasivo y usar el modo puerto de FTP en su lugar. Esto se puede hacer "
-"globalmente, para conexiones a través de un proxy o para una máquina en "
-"concreto (consulte el ejemplo de fichero de configuración para ver algunos "
-"ejemplos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Es posible usar un proxy FTP a través de HTTP definiendo la variable de "
-"entorno <envar>ftp_proxy</envar> con un HTTP URL. Para la sintaxis consulte "
-"la explicación anterior del método http. Esto no puede definir en el fichero "
-"de configuración y no se recomienda el uso de FTP por encima de HTTP debido "
-"a su poca eficiencia."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"La opción <literal>ForceExtended</literal> controla el uso de las órdenes de "
-"RFC 2428 <literal>EPSV</literal> y <literal>EPRT</literal>. De forma "
-"predeterminada es «false», que significa que sólo se usa si el control de "
-"conexión es IPv6. Cambiándolo a «true» fuerza su uso incluso en conexiones "
-"IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son "
-"compatibles con la RFC 2428."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -5967,12 +5868,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Muestra la información relacionada con la descarga de paquetes mediante FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Muestra la información relacionada con la descarga de paquetes mediante HTTP."
@@ -8556,45 +8451,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"El esquema «ftp» definea un servidor FTP como el archivo de paquetes. El "
-"comportamiento de APT con FTP es muy configurable, para más información "
-"consulte la página de manual de &apt-conf;. Tenga en cuenta que puede "
-"especificar un proxy FTP mediante la variable de entorno <envar>ftp_proxy</"
-"envar>. Es posible especificar un servidor proxy HTTP (los servidores proxy "
-"HTTP normalmente comprenden los URL de tipo FTP) mediante este método y SÓLO "
-"este método. Se ignoran los proxies que utilizan HTTP definidos en el "
-"fichero de configuración."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8605,20 +8461,6 @@ msgstr ""
 "Es de utilidad para personas que utilizan dispositivos extraíbles, ya que "
 "permite realizar la copia de ficheros con APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"El método «rsh/ssh» invoca RSH/SSH para establecer una conexión con una "
-"máquina remota y acceder a los ficheros como un usuario dado. Se recomienda "
-"configurar previamente rhosts o las claves RSA. Las órdenes estándar "
-"<command>find</command> y <command>dd</command> se utilizan para realizar la "
-"transferencia de ficheros desde la máquina remota."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -8812,63 +8654,63 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Utiliza FTP para acceder al archivo de Debian en «ftp.example.org», debajo "
+"Utiliza HTTPS para acceder al archivo de Debian en «deb.debian.org», debajo "
 "del directorio «debian», y usa sólo la sección «&debian-stable-codename;/"
 "contrib»."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Utiliza FTP para acceder al archivo de Debian en «ftp.example.org», debajo "
+"Utiliza HTTPS para acceder al archivo de Debian en «deb.debian.org», debajo "
 "del directorio «debian», y usa sólo la sección unstable/contrib. Si tanto "
 "esta línea como la del ejemplo anterior aparecen en <filename>sources.list</"
-"filename>, se usará sólo una sesión FTP para ambas."
+"filename>, se usará sólo una sesión HTTPS para ambas."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12172,7 +12014,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12185,7 +12026,6 @@ msgstr ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13350,6 +13190,134 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Esto utiliza los archivos del disco previamente obtenidos."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> define el proxy predeterminado que utilizar "
+#~ "para los URI de FTP. Utiliza el formato estándar <literal>ftp://[[usuario]"
+#~ "[:contraseña]@]máquina[:puerto]/</literal>. También se puede especificar "
+#~ "un proxy por cada máquina usando la forma <literal>ftp::Proxy::&lt;"
+#~ "máquina&gt;</literal> con la palabra especial <literal>DIRECT</literal>, "
+#~ "que significa que no se use ningún proxy. La variable de entorno "
+#~ "<envar>ftp_proxy</envar> se usará en caso de no definir ninguna de las "
+#~ "opciones anteriores. Para usar un proxy FTP debe configurar el script "
+#~ "<literal>ftp::ProxyLogin</literal> en el fichero de configuración. Esta "
+#~ "entrada define las órdenes a enviar para decirle al servidor del proxy a "
+#~ "qué conectarse. Consulte &configureindex; para un ejemplo de uso. Las "
+#~ "variables de sustitución que representan el componente URI son "
+#~ "<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
+#~ "<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
+#~ "<literal>$(SITE)</literal> y <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "La opción <literal>timeout</literal> define el tiempo máximo de espera "
+#~ "utilizado por el método; este valor se aplica al establecimiento de "
+#~ "conexión y a la recepción de datos."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Puede controlar el modo pasivo a través de varias opciones. "
+#~ "Habitualmente, es seguro dejar activado el modo pasivo, y funciona en "
+#~ "casi todos los entornos. Sin embargo algunas situaciones requieren "
+#~ "desactivar el modo pasivo y usar el modo puerto de FTP en su lugar. Esto "
+#~ "se puede hacer globalmente, para conexiones a través de un proxy o para "
+#~ "una máquina en concreto (consulte el ejemplo de fichero de configuración "
+#~ "para ver algunos ejemplos)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Es posible usar un proxy FTP a través de HTTP definiendo la variable de "
+#~ "entorno <envar>ftp_proxy</envar> con un HTTP URL. Para la sintaxis "
+#~ "consulte la explicación anterior del método http. Esto no puede definir "
+#~ "en el fichero de configuración y no se recomienda el uso de FTP por "
+#~ "encima de HTTP debido a su poca eficiencia."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "La opción <literal>ForceExtended</literal> controla el uso de las órdenes "
+#~ "de RFC 2428 <literal>EPSV</literal> y <literal>EPRT</literal>. De forma "
+#~ "predeterminada es «false», que significa que sólo se usa si el control de "
+#~ "conexión es IPv6. Cambiándolo a «true» fuerza su uso incluso en "
+#~ "conexiones IPv4. Tenga en cuenta que la mayoría de los servidores de FTP "
+#~ "no son compatibles con la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Muestra la información relacionada con la descarga de paquetes mediante "
+#~ "FTP."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "El esquema «ftp» definea un servidor FTP como el archivo de paquetes. El "
+#~ "comportamiento de APT con FTP es muy configurable, para más información "
+#~ "consulte la página de manual de &apt-conf;. Tenga en cuenta que puede "
+#~ "especificar un proxy FTP mediante la variable de entorno "
+#~ "<envar>ftp_proxy</envar>. Es posible especificar un servidor proxy HTTP "
+#~ "(los servidores proxy HTTP normalmente comprenden los URL de tipo FTP) "
+#~ "mediante este método y SÓLO este método. Se ignoran los proxies que "
+#~ "utilizan HTTP definidos en el fichero de configuración."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "El método «rsh/ssh» invoca RSH/SSH para establecer una conexión con una "
+#~ "máquina remota y acceder a los ficheros como un usuario dado. Se "
+#~ "recomienda configurar previamente rhosts o las claves RSA. Las órdenes "
+#~ "estándar <command>find</command> y <command>dd</command> se utilizan para "
+#~ "realizar la transferencia de ficheros desde la máquina remota."
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/fr.po b/doc/po/fr.po
index b020c08be..f9d83a40d 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -692,13 +692,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr "<!ENTITY synopsis-section \"section\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4963,100 +4956,6 @@ msgstr ""
 "dans les pages de manuel &apt-transport-http; et &apt-transport-https; "
 "respectivement."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> est le mandataire (proxy) FTP à utiliser par "
-"défaut pour les URI FTP.  Il se présente sous la forme standard : "
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal>. On peut spécifier un "
-"mandataire particulier par hôte distant en utilisant la syntaxe : "
-"<literal>ftp::Proxy::&lt;hôte&gt;</literal>. Le mot-clé spécial "
-"<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire pour "
-"l'hôte. Si aucun des paramètres précédents n'est définis, la variable "
-"d'environnement <envar>ftp_proxy</envar> annule et replace toutes les "
-"options de mandataire FTP. Pour utiliser un mandataire FTP, vous devrez "
-"renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans le fichier de "
-"configuration. Cette entrée spécifie les commandes à envoyer au mandataire "
-"pour lui préciser à quoi il doit se connecter. Voyez &configureindex; pour "
-"savoir comment faire. Les variables de substitution qui représentent le "
-"composant d'URI correspondant sont : <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> et "
-"<literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"L'option <literal>timeout</literal> positionne le compteur d'expiration du "
-"délai (timeout) utilisé par la méthode. Cela s'applique aussi bien à la "
-"connexion qu'aux données."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Plusieurs options de configuration sont fournies pour contrôler le mode "
-"passif. Il est généralement plus sûr d'activer le mode passif et cela marche "
-"dans presque tous les environnements. Cependant, certaines situations "
-"nécessitent que le mode passif soit désactivé et que le mode « port » de ftp "
-"soit utilisé à la place. On peut le faire globalement, pour des connexions "
-"qui passent par un mandataire ou pour une machine spécifique (examinez le "
-"modèle de fichier de configuration)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Il est possible de faire transiter le trafic FTP par un mandataire HTTP en "
-"positionnant la variable d'environnement <envar>ftp_proxy</envar> à une URL "
-"HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On ne peut pas "
-"le faire dans le fichier de configuration et il n'est de toute façon pas "
-"recommandé d'utiliser FTP au travers de HTTP en raison de la faible "
-"efficacité de cette méthode."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"L'option <literal>ForceExtended</literal> contrôle l'utilisation des "
-"commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</"
-"literal>. Par défaut, elle vaut « false » ce qui signifie que ces commandes "
-"ne sont utilisées que pour une connexion de type IPv6. Quand elle vaut "
-"« true », on les utilise même si la connexion est de type IPv4. La plupart "
-"des serveurs FTP ne suivent pas la RFC 2428."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -6077,12 +5976,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Affiche les informations concernant le téléchargement de paquets par FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Affiche les informations concernant le téléchargement de paquets par HTTP."
@@ -8823,39 +8716,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. "
-"L'utilisation de FTP décline en faveur de <literal>http</literal> et "
-"<literal>https</literal> et plusieurs archives soit n'ont jamais offert "
-"d'accès FTP, soit le retirent. Si vous avez encore besoin de cette méthode, "
-"plusieurs options de configuration sont disponibles dans le champ d'action "
-"<literal>Acquire::ftp</literal> et détaillées dans &apt-conf;."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Veuillez noter qu'on peut spécifier un mandataire FTP en utilisant la "
-"variable d'environnement <envar>ftp_proxy</envar>. On peut aussi spécifier "
-"un mandataire HTTP (les serveurs mandataires HTTP comprennent souvent les "
-"URL FTP) en utilisant cette méthode et <emphasis>seulement</emphasis> cette "
-"méthode. Les mandataires qui utilisent HTTP et qui sont spécifiés dans le "
-"fichier de configuration seront ignorés."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8867,20 +8727,6 @@ msgstr ""
 "servir aux utilisateurs qui se servent d'un support amovible pour recopier "
 "des fichiers avec APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine distante "
-"et pour accéder aux fichiers en tant qu'un certain utilisateur. Il est "
-"recommandé de régler préalablement les hôtes distants (rhosts) ou les clés "
-"RSA. Les commandes standard <command>find</command> et <command>dd</command> "
-"sont utilisées pour l'accès aux fichiers de la machine distante."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -9063,63 +8909,63 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Utiliser FTP pour accéder à l'archive située à ftp.example.org, dans le "
+"Utiliser HTTPS pour accéder à l'archive située à deb.debian.org, dans le "
 "répertoire debian, et n'utiliser que la section &debian-stable-codename;/"
 "contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Utiliser FTP pour accéder à l'archive située à ftp.example.org, dans le "
+"Utiliser HTTPS pour accéder à l'archive située à deb.debian.org, dans le "
 "répertoire debian, et n'utiliser que la section unstable/contrib. Si cette "
 "ligne et celle de l'exemple précédent dans <filename>sources.list</filename> "
-"apparaissent, une seule session FTP sera utilisée pour les deux lignes."
+"apparaissent, une seule session HTTPS sera utilisée pour les deux lignes."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12717,7 +12563,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12730,7 +12575,6 @@ msgstr ""
 "\n"
 " Exemple :\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13911,6 +13755,146 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Cette commande utilisera les fichiers récupérés sur le disque."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> est le mandataire (proxy) FTP à utiliser "
+#~ "par défaut pour les URI FTP.  Il se présente sous la forme standard : "
+#~ "<literal>ftp://[[user][:pass]@]host[:port]/</literal>. On peut spécifier "
+#~ "un mandataire particulier par hôte distant en utilisant la syntaxe : "
+#~ "<literal>ftp::Proxy::&lt;hôte&gt;</literal>. Le mot-clé spécial "
+#~ "<literal>DIRECT</literal> indique alors de n'utiliser aucun mandataire "
+#~ "pour l'hôte. Si aucun des paramètres précédents n'est définis, la "
+#~ "variable d'environnement <envar>ftp_proxy</envar> annule et replace "
+#~ "toutes les options de mandataire FTP. Pour utiliser un mandataire FTP, "
+#~ "vous devrez renseigner l'entrée <literal>ftp::ProxyLogin</literal> dans "
+#~ "le fichier de configuration. Cette entrée spécifie les commandes à "
+#~ "envoyer au mandataire pour lui préciser à quoi il doit se connecter. "
+#~ "Voyez &configureindex; pour savoir comment faire. Les variables de "
+#~ "substitution qui représentent le composant d'URI correspondant sont : "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> et <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "L'option <literal>timeout</literal> positionne le compteur d'expiration "
+#~ "du délai (timeout) utilisé par la méthode. Cela s'applique aussi bien à "
+#~ "la connexion qu'aux données."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Plusieurs options de configuration sont fournies pour contrôler le mode "
+#~ "passif. Il est généralement plus sûr d'activer le mode passif et cela "
+#~ "marche dans presque tous les environnements. Cependant, certaines "
+#~ "situations nécessitent que le mode passif soit désactivé et que le mode "
+#~ "« port » de ftp soit utilisé à la place. On peut le faire globalement, "
+#~ "pour des connexions qui passent par un mandataire ou pour une machine "
+#~ "spécifique (examinez le modèle de fichier de configuration)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Il est possible de faire transiter le trafic FTP par un mandataire HTTP "
+#~ "en positionnant la variable d'environnement <envar>ftp_proxy</envar> à "
+#~ "une URL HTTP -- consultez la méthode http ci-dessus pour la syntaxe. On "
+#~ "ne peut pas le faire dans le fichier de configuration et il n'est de "
+#~ "toute façon pas recommandé d'utiliser FTP au travers de HTTP en raison de "
+#~ "la faible efficacité de cette méthode."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "L'option <literal>ForceExtended</literal> contrôle l'utilisation des "
+#~ "commandes liées à la RFC 2428, <literal>EPSV</literal> et <literal>EPRT</"
+#~ "literal>. Par défaut, elle vaut « false » ce qui signifie que ces "
+#~ "commandes ne sont utilisées que pour une connexion de type IPv6. Quand "
+#~ "elle vaut « true », on les utilise même si la connexion est de type IPv4. "
+#~ "La plupart des serveurs FTP ne suivent pas la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Affiche les informations concernant le téléchargement de paquets par FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "Le procédé <literal>ftp</literal> indique un serveur FTP comme archive. "
+#~ "L'utilisation de FTP décline en faveur de <literal>http</literal> et "
+#~ "<literal>https</literal> et plusieurs archives soit n'ont jamais offert "
+#~ "d'accès FTP, soit le retirent. Si vous avez encore besoin de cette "
+#~ "méthode, plusieurs options de configuration sont disponibles dans le "
+#~ "champ d'action <literal>Acquire::ftp</literal> et détaillées dans &apt-"
+#~ "conf;."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Veuillez noter qu'on peut spécifier un mandataire FTP en utilisant la "
+#~ "variable d'environnement <envar>ftp_proxy</envar>. On peut aussi "
+#~ "spécifier un mandataire HTTP (les serveurs mandataires HTTP comprennent "
+#~ "souvent les URL FTP) en utilisant cette méthode et <emphasis>seulement</"
+#~ "emphasis> cette méthode. Les mandataires qui utilisent HTTP et qui sont "
+#~ "spécifiés dans le fichier de configuration seront ignorés."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Le procédé rsh/ssh utilise rsh/ssh pour se connecter à une machine "
+#~ "distante et pour accéder aux fichiers en tant qu'un certain utilisateur. "
+#~ "Il est recommandé de régler préalablement les hôtes distants (rhosts) ou "
+#~ "les clés RSA. Les commandes standard <command>find</command> et "
+#~ "<command>dd</command> sont utilisées pour l'accès aux fichiers de la "
+#~ "machine distante."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr "<!ENTITY synopsis-keyid \"id_de_clé\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/it.po b/doc/po/it.po
index 75751dadb..5520933f9 100644
--- a/doc/po/it.po
+++ b/doc/po/it.po
@@ -736,15 +736,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sezione\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4969,96 +4960,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per gli "
-"URI FTP. È nella forma standard <literal>ftp://[[utente][:password]@]host[:"
-"porta]/</literal>. Si possono anche specificare proxy per ciascun host "
-"usando la forma <literal>ftp::Proxy::&lt;host&gt;</literal> con la speciale "
-"parola chiave <literal>DIRECT</literal> che indica di non usare proxy. Se "
-"nessuna delle opzioni precedenti è impostata, viene usata la variabile "
-"d'ambiente <envar>ftp_proxy</envar>. Per usare un proxy FTP è necessario "
-"impostare lo script <literal>ftp::ProxyLogin</literal> nel file di "
-"configurazione. Questa voce specifica i comandi da inviare per dire al "
-"server proxy a cosa connettersi. Vedere &configureindex; per un esempio di "
-"come utilizzarla. Le variabili di sostituzione che rappresentano i "
-"corrispondenti componenti dell'URI sono <literal>$(PROXY_USER)</literal>, "
-"<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
-"<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal> e "
-"<literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"L'opzione <literal>timeout</literal> imposta il tempo di timeout usato dal "
-"metodo; questo valore si applica sia al timeout per la connessione sia a "
-"quello per i dati."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Sono fornite diverse impostazioni per controllare la modalità passiva. "
-"Generalmente è sicuro lasciare attiva la modalità passiva; funziona in quasi "
-"tutti gli ambienti. Tuttavia in alcune situazioni è necessario disabilitare "
-"la modalità passiva e usare invece la modalità per porta FTP. Ciò può essere "
-"fatto globalmente o, per connessioni che passano attraverso un proxy, per "
-"uno specifico host (vedere il file di configurazione d'esempio)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"È possibile usare FTP attraverso un proxy via HTTP impostando la variabile "
-"d'ambiente <envar>ftp_proxy</envar> ad un URL HTTP; per la sintassi vedere "
-"la spiegazione del metodo http più sopra. Non è possibile impostare questa "
-"opzione nel file di configurazione e l'uso di FTP via HTTP non è raccomando "
-"a causa della sua bassa efficienza."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"L'impostazione <literal>ForceExtended</literal> controlla l'uso dei comandi "
-"<literal>EPSV</literal> e <literal>EPRT</literal> della RFC 2428. Il valore "
-"predefinito è falso, il che significa che questi comandi sono usati "
-"solamente se la connessione di controllo è IPv6. Impostare questo valore a "
-"vero forza il loro uso anche su connessioni IPv4. Notare che la maggior "
-"parte dei server FTP non supporta la RFC 2428."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -6060,12 +5961,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Stampa informazioni relative allo scaricamento dei pacchetti usando HTTP."
@@ -8772,44 +8667,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Il tipo ftp specifica un server FTP per l'archivio. Il comportamento FTP di "
-"APT è altamente configurabile; per maggiori informazioni vedere la pagina di "
-"manuale &apt-conf;. Notare che è possibile specificare un proxy FTP usando "
-"la variabile d'ambiente <envar>ftp_proxy</envar>. È possibile specificare un "
-"proxy HTTP (i server proxy HTTP spesso gestiscono gli URL FTP) usando questa "
-"e <emphasis>SOLO</emphasis> questa variabile d'ambiente. I proxy che usano "
-"HTTP specificati nel file di configurazione verranno ignorati."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8820,20 +8677,6 @@ msgstr ""
 "direttamente dalla loro posizione. Ciò è utile per coloro che usano supporti "
 "rimovibili, per copiare i file nelle varie posizioni con APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Il metodo rsh/ssh invoca RSH/SSH per connettersi ad un host remoto e "
-"accedere ai file come un determinato utente. È raccomandato configurare "
-"precedentemente le chiavi RSA o rhosts. Per effettuare i trasferimenti di "
-"file dall'host remoto vengono usati i comandi standard <command>find</"
-"command> e <command>dd</command>."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -9025,58 +8868,62 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Usa FTP per accedere all'archivio in ftp.example.org, nella directory debian "
-"e usa solo l'area &debian-stable-codename;/contrib."
+"Usa HTTPS per accedere all'archivio in deb.debian.org, nella directory "
+"debian e usa solo l'area &debian-stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
+"Suites: &debian-stable-codename;\n"
+"Components: contrib"
+msgstr ""
+"Types: deb\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Usa FTP per accedere all'archivio in ftp.example.org nella directory debian "
+"Usa HTTPS per accedere all'archivio in deb.debian.org nella directory debian "
 "e usa solo l'area unstable/contrib. Se in <filename>sources.list</filename> "
 "sono presenti sia questa riga sia quella nell'esempio precedente, verrà "
-"usata una sola sessione FTP per entrambe le righe."
+"usata una sola sessione HTTPS per entrambe le righe."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12507,7 +12354,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12520,7 +12366,6 @@ msgstr ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13695,6 +13540,140 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "che userà gli archivi già scaricati e presenti sul disco."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> imposta il proxy predefinito da usare per "
+#~ "gli URI FTP. È nella forma standard <literal>ftp://[[utente][:"
+#~ "password]@]host[:porta]/</literal>. Si possono anche specificare proxy "
+#~ "per ciascun host usando la forma <literal>ftp::Proxy::&lt;host&gt;</"
+#~ "literal> con la speciale parola chiave <literal>DIRECT</literal> che "
+#~ "indica di non usare proxy. Se nessuna delle opzioni precedenti è "
+#~ "impostata, viene usata la variabile d'ambiente <envar>ftp_proxy</envar>. "
+#~ "Per usare un proxy FTP è necessario impostare lo script <literal>ftp::"
+#~ "ProxyLogin</literal> nel file di configurazione. Questa voce specifica i "
+#~ "comandi da inviare per dire al server proxy a cosa connettersi. Vedere "
+#~ "&configureindex; per un esempio di come utilizzarla. Le variabili di "
+#~ "sostituzione che rappresentano i corrispondenti componenti dell'URI sono "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "L'opzione <literal>timeout</literal> imposta il tempo di timeout usato "
+#~ "dal metodo; questo valore si applica sia al timeout per la connessione "
+#~ "sia a quello per i dati."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Sono fornite diverse impostazioni per controllare la modalità passiva. "
+#~ "Generalmente è sicuro lasciare attiva la modalità passiva; funziona in "
+#~ "quasi tutti gli ambienti. Tuttavia in alcune situazioni è necessario "
+#~ "disabilitare la modalità passiva e usare invece la modalità per porta "
+#~ "FTP. Ciò può essere fatto globalmente o, per connessioni che passano "
+#~ "attraverso un proxy, per uno specifico host (vedere il file di "
+#~ "configurazione d'esempio)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "È possibile usare FTP attraverso un proxy via HTTP impostando la "
+#~ "variabile d'ambiente <envar>ftp_proxy</envar> ad un URL HTTP; per la "
+#~ "sintassi vedere la spiegazione del metodo http più sopra. Non è possibile "
+#~ "impostare questa opzione nel file di configurazione e l'uso di FTP via "
+#~ "HTTP non è raccomando a causa della sua bassa efficienza."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "L'impostazione <literal>ForceExtended</literal> controlla l'uso dei "
+#~ "comandi <literal>EPSV</literal> e <literal>EPRT</literal> della RFC 2428. "
+#~ "Il valore predefinito è falso, il che significa che questi comandi sono "
+#~ "usati solamente se la connessione di controllo è IPv6. Impostare questo "
+#~ "valore a vero forza il loro uso anche su connessioni IPv4. Notare che la "
+#~ "maggior parte dei server FTP non supporta la RFC 2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Stampa informazioni relative allo scaricamento dei pacchetti usando FTP."
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Il tipo ftp specifica un server FTP per l'archivio. Il comportamento FTP "
+#~ "di APT è altamente configurabile; per maggiori informazioni vedere la "
+#~ "pagina di manuale &apt-conf;. Notare che è possibile specificare un proxy "
+#~ "FTP usando la variabile d'ambiente <envar>ftp_proxy</envar>. È possibile "
+#~ "specificare un proxy HTTP (i server proxy HTTP spesso gestiscono gli URL "
+#~ "FTP) usando questa e <emphasis>SOLO</emphasis> questa variabile "
+#~ "d'ambiente. I proxy che usano HTTP specificati nel file di configurazione "
+#~ "verranno ignorati."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Il metodo rsh/ssh invoca RSH/SSH per connettersi ad un host remoto e "
+#~ "accedere ai file come un determinato utente. È raccomandato configurare "
+#~ "precedentemente le chiavi RSA o rhosts. Per effettuare i trasferimenti di "
+#~ "file dall'host remoto vengono usati i comandi standard <command>find</"
+#~ "command> e <command>dd</command>."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"IDchiave\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/ja.po b/doc/po/ja.po
index e223cbd6e..fffbf92aa 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -739,15 +739,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"セクション\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4782,92 +4773,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシを"
-"設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準"
-"形で表します。ホストごとのプロキシを、<literal>ftp::Proxy::&lt;host&gt;</"
-"literal> という形で指定できます。この時、プロキシを使用しないという意味の特殊"
-"キーワード <literal>DIRECT</literal> も使用できます。上記の設定をなにも指定し"
-"ないと、環境変数 <envar>ftp_proxy</envar> を使用します。FTP プロキシを使用す"
-"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
-"る必要があります。このエントリには、接続する際にプロキシサーバに送信するコマ"
-"ンドを設定します。どのようにするのかは &configureindex; の例を参照してくださ"
-"い。URI を構成するコンポーネントに対応する置換変数は、"
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal>, <literal>$(SITE_PORT)</literal> です。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時間を"
-"設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれていま"
-"す。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"設定のいくつかは、パッシブモードを制御するものです。一般的に、パッシブモード"
-"のままにしておく方が安全で、ほぼどんな環境でも動作します。しかしある状況下で"
-"は、パッシブモードが無効のため、代わりにポートモード FTP を使用する必要があり"
-"ます。この設定は、プロキシを通る接続や特定のホストへの接続全般に有効です (設"
-"定例はサンプル設定ファイルを参照してください)。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"環境変数 <envar>ftp_proxy</envar> に HTTP URL を指定すると FTP over HTTP のプ"
-"ロキシが利用可能になります。構文は前述の http についての説明を参照してくださ"
-"い。設定ファイルの中でこれをセットすることはできません。また、効率が悪いため "
-"FTP over HTTP を使用するのは推奨しません。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"<literal>ForceExtended</literal> の設定は RFC2428 の <literal>EPSV</literal> "
-"コマンドと <literal>EPRT</literal> コマンドの使用を制御します。デフォルトで"
-"は false で、コントロールコネクションが IPv6 の時にのみ、このコマンドを使用す"
-"るということです。これを true にセットすると、IPv4 コネクションでも、強制的に"
-"このコマンドを使用します。ほとんどの FTP サーバは RFC2428 をサポートしていな"
-"いことに注意してください。"
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -5822,11 +5727,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr "HTTP を用いたパッケージのダウンロードに関する情報を出力します。"
 
@@ -8431,43 +8331,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
-"は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧ください。"
-"FTP プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意してくだ"
-"さい。この環境変数、さらにこの<emphasis>環境変数のみ</emphasis>を使用して、"
-"HTTP プロキシを使用できます (HTTP プロキシサーバは大抵 FTP URL も理解できま"
-"す)。設定ファイルで HTTP を利用するプロキシが指定してあっても、無視されます。"
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8477,20 +8340,6 @@ msgstr ""
 "キャッシュディレクトリにコピーするところが違います。リムーバブルメディアを使"
 "用していて、APT でコピーを行う場合に便利です。"
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにアク"
-"セスするのに rsh/ssh を使用します。あらかじめ rhosts や RSA キーの設定をして"
-"おくことをお勧めします。リモートホストからのファイル転送に、標準の "
-"<command>find</command> コマンドと <command>dd</command> コマンドを使用しま"
-"す。"
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -8680,62 +8529,62 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"ftp.example.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
+"deb.debian.org のアーカイブに HTTPS アクセスし、debian ディレクトリ以下の "
 "&debian-stable-codename;/contrib のみを使用します。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"ftp.example.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
+"deb.debian.org のアーカイブに HTTPS アクセスし、debian ディレクトリ以下の "
 "unstable/contrib のみを使用します。<filename>sources.list</filename> に上記サ"
-"ンプルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひと"
-"つだけになります。"
+"ンプルと一緒に指定された場合、両方のリソース行に対応する HTTPS セッションはひ"
+"とつだけになります。"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12000,7 +11849,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12013,7 +11861,6 @@ msgstr ""
 "\n"
 " 例:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13143,6 +12990,134 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "これで、ディスクにある取得済みのアーカイブを使用するようになります。"
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> は、FTP URI を使用する際のデフォルトプロキシ"
+#~ "を設定します。<literal>ftp://[[user][:pass]@]host[:port]/</literal> という"
+#~ "標準形で表します。ホストごとのプロキシを、<literal>ftp::Proxy::&lt;"
+#~ "host&gt;</literal> という形で指定できます。この時、プロキシを使用しないと"
+#~ "いう意味の特殊キーワード <literal>DIRECT</literal> も使用できます。上記の"
+#~ "設定をなにも指定しないと、環境変数 <envar>ftp_proxy</envar> を使用します。"
+#~ "FTP プロキシを使用するには、設定ファイルに <literal>ftp::ProxyLogin</"
+#~ "literal> スクリプトを設定する必要があります。このエントリには、接続する際"
+#~ "にプロキシサーバに送信するコマンドを設定します。どのようにするのかは "
+#~ "&configureindex; の例を参照してください。URI を構成するコンポーネントに対"
+#~ "応する置換変数は、<literal>$(PROXY_USER)</literal>, "
+#~ "<literal>$(PROXY_PASS)</literal>, <literal>$(SITE_USER)</literal>, "
+#~ "<literal>$(SITE_PASS)</literal>, <literal>$(SITE)</literal>, "
+#~ "<literal>$(SITE_PORT)</literal> です。"
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "<literal>timeout</literal> オプションは、この方法でのタイムアウトまでの時"
+#~ "間を設定します。これには、接続のタイムアウトとデータのタイムアウトが含まれ"
+#~ "ています。"
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "設定のいくつかは、パッシブモードを制御するものです。一般的に、パッシブモー"
+#~ "ドのままにしておく方が安全で、ほぼどんな環境でも動作します。しかしある状況"
+#~ "下では、パッシブモードが無効のため、代わりにポートモード FTP を使用する必"
+#~ "要があります。この設定は、プロキシを通る接続や特定のホストへの接続全般に有"
+#~ "効です (設定例はサンプル設定ファイルを参照してください)。"
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "環境変数 <envar>ftp_proxy</envar> に HTTP URL を指定すると FTP over HTTP "
+#~ "のプロキシが利用可能になります。構文は前述の http についての説明を参照して"
+#~ "ください。設定ファイルの中でこれをセットすることはできません。また、効率が"
+#~ "悪いため FTP over HTTP を使用するのは推奨しません。"
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "<literal>ForceExtended</literal> の設定は RFC2428 の <literal>EPSV</"
+#~ "literal> コマンドと <literal>EPRT</literal> コマンドの使用を制御します。デ"
+#~ "フォルトでは false で、コントロールコネクションが IPv6 の時にのみ、このコ"
+#~ "マンドを使用するということです。これを true にセットすると、IPv4 コネク"
+#~ "ションでも、強制的にこのコマンドを使用します。ほとんどの FTP サーバは "
+#~ "RFC2428 をサポートしていないことに注意してください。"
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr "FTP を用いたパッケージのダウンロードに関する情報を出力します。"
+
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
+#~ "は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧くださ"
+#~ "い。FTP プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意"
+#~ "してください。この環境変数、さらにこの<emphasis>環境変数のみ</emphasis>を"
+#~ "使用して、HTTP プロキシを使用できます (HTTP プロキシサーバは大抵 FTP URL "
+#~ "も理解できます)。設定ファイルで HTTP を利用するプロキシが指定してあって"
+#~ "も、無視されます。"
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "rsh/ssh メソッドは、与えられたユーザでリモートホストに接続し、ファイルにア"
+#~ "クセスするのに rsh/ssh を使用します。あらかじめ rhosts や RSA キーの設定を"
+#~ "しておくことをお勧めします。リモートホストからのファイル転送に、標準の "
+#~ "<command>find</command> コマンドと <command>dd</command> コマンドを使用し"
+#~ "ます。"
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"キーID\">"
+
 #, fuzzy
 #~| msgid "APT key management utility"
 #~ msgid "Deprecated APT key management utility"
diff --git a/doc/po/nl.po b/doc/po/nl.po
index 56b8207f2..379968799 100644
--- a/doc/po/nl.po
+++ b/doc/po/nl.po
@@ -705,15 +705,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sectie\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -5075,100 +5066,6 @@ msgstr ""
 "de protocollen HTTP en HTTPS en worden gedocumenteerd in de respectieve man-"
 "pagina's &apt-transport-http; en &apt-transport-https;."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> stelt de te gebruiken standaard-proxy in voor "
-"URI's van het type FTP. De standaardvorm ervan is <literal>ftp://[[user][:"
-"pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer ingesteld "
-"worden volgens het schema <literal>ftp::Proxy::&lt;host&gt;</literal>, "
-"waarbij het bijzondere trefwoord <literal>DIRECT</literal> betekent dat geen "
-"proxy's gebruikt worden. Indien geen van de bovenstaande instellingen "
-"opgegeven werd, zal de omgevingsvariabele <envar>ftp_proxy</envar> gebruikt "
-"worden. Om een FTP-proxy te gebruiken zult u het script <literal>ftp::"
-"ProxyLogin</literal> in het configuratiebestand moeten instellen. Dit item "
-"omschrijft de te verzenden commando's die de proxy-server moeten laten weten "
-"waarmee hij een verbinding moet maken. Raadpleeg &configureindex; voor een "
-"voorbeeld van hoe dit moet gedaan worden. De substitutievariabelen die de "
-"overeenkomstige URI-component vertegenwoordigen, zijn "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> en <literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"De optie <literal>timeout</literal> stelt de tijdslimiet in die gehanteerd "
-"moet worden door de timer die door deze methode gebruikt wordt. Deze waarde "
-"is zowel van toepassing op de tijdslimiet van de verbinding als op die van "
-"de data-overdracht."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"Meerdere instellingen zijn beschikbaar om de passieve modus te controleren. "
-"Over het algemeen is het veilig om de passieve modus aan te laten staan. Hij "
-"werkt in praktisch elke omgeving. Toch vereisen sommige situaties het "
-"uitschakelen van de passieve modus en het gebruik in de plaats daarvan van "
-"FTP in poortmodus. Dit kan globaal gebeuren of voor verbindingen die langs "
-"een proxy passeren of voor een specifieke computer. (raadpleeg voor "
-"voorbeelden het voorbeeldconfiguratiebestand)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"Het is mogelijk om proxy voor FTP over HTTP te laten verlopen door de "
-"omgevingsvariabele <envar>ftp_proxy</envar> in te stellen op een URL van het "
-"type HTTP - zie de eerdere bespreking van de http-methode voor de syntaxis. "
-"U kunt dit niet in het configuratiebestand instellen en het gebruik van FTP "
-"over HTTP wordt niet aangeraden omwille van zijn geringe efficiëntie."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"De instelling <literal>ForceExtended</literal> regelt het gebruik van de "
-"RFC2428 commando's <literal>EPSV</literal> en <literal>EPRT</literal>. "
-"Standaard staat ze uitgeschakeld (ingesteld op false), hetgeen betekent dat "
-"deze commando's enkel gebruikt worden indien de controleverbinding van het "
-"type IPv6 is. Deze instelling aanzetten (instellen op true) verplicht het "
-"gebruik van deze commando's zelfs bij verbindingen van het type IPv4. Merk "
-"op dat de meeste FTP-servers RFC2428 niet ondersteunen."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -6164,13 +6061,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Weergeven van informatie in verband met het downloaden van pakketten met "
-"behulp van FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Weergeven van informatie in verband met het downloaden van pakketten met "
@@ -9020,38 +8910,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"De methode ftp geeft een FTP-server op voor een archief. Het gebruik van FTP "
-"is op de terugweg ten voordele van <literal>http</literal> en "
-"<literal>https</literal> en veel archieven hebben ofwel nooit FTP-toegang "
-"aangeboden of trekken die terug in. Indien u deze methode nog steeds nodig "
-"heeft, zijn er veel configuratieopties voor beschikbaar binnen de ruimte "
-"<literal>Acquire::ftp</literal>. Ze worden in &apt-conf; gedetailleerd."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Noteer dat een FTP-proxy opgegeven kan worden met de omgevingsvariabele "
-"<envar>ftp_proxy</envar>. Met deze omgevingsvariabele en <emphasis>enkel</"
-"emphasis> daarmee kan ook een HTTP-proxy opgegeven worden (HTTP proxyservers "
-"kunnen vaak omgaan met FTP-URL's). Proxy's die HTTP gebruiken en in het "
-"configuratiebestand vermeld staan worden genegeerd."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -9062,21 +8920,6 @@ msgstr ""
 "locatie te gebruiken. Dit is nuttig voor gebruikers van verwijderbare media "
 "om met behulp van APT bestanden te kopiëren."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"De methode rsh/ssh maakt gebruik van RSH/SSH om een verbinding met een "
-"externe computer te maken en als een welbepaalde gebruiker toegang te "
-"krijgen tot de bestanden. Voorafgaandelijke configuratie van rhosts of RSA-"
-"sleutels wordt aanbevolen. De standaardcommando's <command>find</command> en "
-"<command>dd</command> worden gebruikt om de overdracht van bestanden van de "
-"externe computer uit te voeren."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -9259,64 +9102,64 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Gebruikt FTP om toegang te krijgen tot het archief op ftp.example.org onder "
+"Gebruikt HTTPS om toegang te krijgen tot het archief op deb.debian.org onder "
 "de map debian en gebruikt er enkel het gebied &debian-stable-codename;/"
 "contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Gebruikt FTP om toegang te krijgen tot het archief op ftp.example.org onder "
+"Gebruikt HTTPS om toegang te krijgen tot het archief op deb.debian.org onder "
 "de map debian en gebruikt er enkel het gebied unstable/contrib. Indien deze "
 "regel en die uit het voorgaande voorbeeld allebei voorkomen in "
-"<filename>sources.list</filename> zal een enkele FTP-verbinding gebruikt "
+"<filename>sources.list</filename> zal een enkele HTTPS-verbinding gebruikt "
 "worden voor beide regels met pakketbronnen."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -13030,7 +12873,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13043,7 +12885,6 @@ msgstr ""
 "\n"
 " Bijvoorbeeld:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -14249,6 +14090,150 @@ msgid "Which will use the already fetched archives on the disc."
 msgstr ""
 "En dit zal gebruik maken van de reeds opgehaalde archieven op de schijf."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> stelt de te gebruiken standaard-proxy in "
+#~ "voor URI's van het type FTP. De standaardvorm ervan is <literal>ftp://"
+#~ "[[user][:pass]@]host[:port]/</literal>. Proxy's kunnen ook per computer "
+#~ "ingesteld worden volgens het schema <literal>ftp::Proxy::&lt;host&gt;</"
+#~ "literal>, waarbij het bijzondere trefwoord <literal>DIRECT</literal> "
+#~ "betekent dat geen proxy's gebruikt worden. Indien geen van de "
+#~ "bovenstaande instellingen opgegeven werd, zal de omgevingsvariabele "
+#~ "<envar>ftp_proxy</envar> gebruikt worden. Om een FTP-proxy te gebruiken "
+#~ "zult u het script <literal>ftp::ProxyLogin</literal> in het "
+#~ "configuratiebestand moeten instellen. Dit item omschrijft de te verzenden "
+#~ "commando's die de proxy-server moeten laten weten waarmee hij een "
+#~ "verbinding moet maken. Raadpleeg &configureindex; voor een voorbeeld van "
+#~ "hoe dit moet gedaan worden. De substitutievariabelen die de "
+#~ "overeenkomstige URI-component vertegenwoordigen, zijn "
+#~ "<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> en <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "De optie <literal>timeout</literal> stelt de tijdslimiet in die "
+#~ "gehanteerd moet worden door de timer die door deze methode gebruikt "
+#~ "wordt. Deze waarde is zowel van toepassing op de tijdslimiet van de "
+#~ "verbinding als op die van de data-overdracht."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "Meerdere instellingen zijn beschikbaar om de passieve modus te "
+#~ "controleren. Over het algemeen is het veilig om de passieve modus aan te "
+#~ "laten staan. Hij werkt in praktisch elke omgeving. Toch vereisen sommige "
+#~ "situaties het uitschakelen van de passieve modus en het gebruik in de "
+#~ "plaats daarvan van FTP in poortmodus. Dit kan globaal gebeuren of voor "
+#~ "verbindingen die langs een proxy passeren of voor een specifieke "
+#~ "computer. (raadpleeg voor voorbeelden het voorbeeldconfiguratiebestand)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "Het is mogelijk om proxy voor FTP over HTTP te laten verlopen door de "
+#~ "omgevingsvariabele <envar>ftp_proxy</envar> in te stellen op een URL van "
+#~ "het type HTTP - zie de eerdere bespreking van de http-methode voor de "
+#~ "syntaxis. U kunt dit niet in het configuratiebestand instellen en het "
+#~ "gebruik van FTP over HTTP wordt niet aangeraden omwille van zijn geringe "
+#~ "efficiëntie."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "De instelling <literal>ForceExtended</literal> regelt het gebruik van de "
+#~ "RFC2428 commando's <literal>EPSV</literal> en <literal>EPRT</literal>. "
+#~ "Standaard staat ze uitgeschakeld (ingesteld op false), hetgeen betekent "
+#~ "dat deze commando's enkel gebruikt worden indien de controleverbinding "
+#~ "van het type IPv6 is. Deze instelling aanzetten (instellen op true) "
+#~ "verplicht het gebruik van deze commando's zelfs bij verbindingen van het "
+#~ "type IPv4. Merk op dat de meeste FTP-servers RFC2428 niet ondersteunen."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Weergeven van informatie in verband met het downloaden van pakketten met "
+#~ "behulp van FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "De methode ftp geeft een FTP-server op voor een archief. Het gebruik van "
+#~ "FTP is op de terugweg ten voordele van <literal>http</literal> en "
+#~ "<literal>https</literal> en veel archieven hebben ofwel nooit FTP-toegang "
+#~ "aangeboden of trekken die terug in. Indien u deze methode nog steeds "
+#~ "nodig heeft, zijn er veel configuratieopties voor beschikbaar binnen de "
+#~ "ruimte <literal>Acquire::ftp</literal>. Ze worden in &apt-conf; "
+#~ "gedetailleerd."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Noteer dat een FTP-proxy opgegeven kan worden met de omgevingsvariabele "
+#~ "<envar>ftp_proxy</envar>. Met deze omgevingsvariabele en <emphasis>enkel</"
+#~ "emphasis> daarmee kan ook een HTTP-proxy opgegeven worden (HTTP "
+#~ "proxyservers kunnen vaak omgaan met FTP-URL's). Proxy's die HTTP "
+#~ "gebruiken en in het configuratiebestand vermeld staan worden genegeerd."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "De methode rsh/ssh maakt gebruik van RSH/SSH om een verbinding met een "
+#~ "externe computer te maken en als een welbepaalde gebruiker toegang te "
+#~ "krijgen tot de bestanden. Voorafgaandelijke configuratie van rhosts of "
+#~ "RSA-sleutels wordt aanbevolen. De standaardcommando's <command>find</"
+#~ "command> en <command>dd</command> worden gebruikt om de overdracht van "
+#~ "bestanden van de externe computer uit te voeren."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"sleutel-ID\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Verouderd hulpprogramma voor het beheer van de sleutels van APT"
 
diff --git a/doc/po/pl.po b/doc/po/pl.po
index db3391fd6..8feba425f 100644
--- a/doc/po/pl.po
+++ b/doc/po/pl.po
@@ -735,15 +735,6 @@ msgstr ""
 "<!-- TRANSLATOR: used as parameter for apt-ftparchive e.g. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"sekcja\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4758,61 +4749,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -5467,11 +5403,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
@@ -7989,44 +7920,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-#, fuzzy
-#| msgid ""
-#| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
-#| "behavior is highly configurable; for more information see the &apt-conf; "
-#| "manual page. Please note that an FTP proxy can be specified by using the "
-#| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
-#| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-#| "environment variable and <emphasis>only</emphasis> this environment "
-#| "variable. Proxies using HTTP specified in the configuration file will be "
-#| "ignored."
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można "
-"dowolnie konfigurować, szczegóły można znaleźć na stronie podręcznika  &apt-"
-"conf;. Proszę zauważyć, że można podać serwer proxy FTP, używając zmiennej "
-"środowiskowej <envar>ftp_proxy</envar>. Możliwe jest podanie serwera proxy "
-"HTTP (które to serwery często rozumieją lokalizacje zasobów FTP), używając "
-"tej i <emphasis>tylko</emphasis> tej zmiennej środowiskowej. Podane w pliku "
-"konfiguracyjnym serwery proxy  używające HTTP zostaną zignorowane."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8037,20 +7930,6 @@ msgstr ""
 "katalogu bufora. Jest to użyteczne w przypadku używania nośnika przenośnego "
 "do skopiowania plików przy użyciu APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"Metoda rsh/ssh uruchamia RSH/SSH do połączenia się ze zdalnym komputerem i "
-"uzyskania dostępu do plików jako podany użytkownik. Dobrym pomysłem jest "
-"wcześniejsze przygotowanie kluczy RSA lub dostępu rhosts. APT używa "
-"standardowych poleceń <command>find</command> i <command>dd</command> do "
-"przetransferowania plików ze zdalnego komputera."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -8244,62 +8123,63 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.example.org w "
+"Użycie HTTPS do uzyskania dostępu do archiwum na komputerze deb.debian.org w "
 "katalogu debian i używa tylko dystrybucji &debian-stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Użycie FTP do uzyskania dostępu do archiwum na komputerze ftp.example.org, "
+"Użycie HTTPS do uzyskania dostępu do archiwum na komputerze deb.debian.org, "
 "dystrybucji unstable/contrib. Jeśli poniższa linia wystąpi razem z linią z "
 "poprzedniego przykładu w tym samym pliku <filename>sources.list</filename>, "
-"to pojedyncza sesja FTP będzie użyta w celu uzyskania dostępu do obu zasobów."
+"to pojedyncza sesja HTTPS będzie użyta w celu uzyskania dostępu do obu "
+"zasobów."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -11331,7 +11211,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -11344,7 +11223,6 @@ msgstr ""
 "\n"
 " Przykłady:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://ftp.pl.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12517,6 +12395,53 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "Które użyje pobranych uprzednio archiwów z dysku."
 
+#, fuzzy
+#~| msgid ""
+#~| "The ftp scheme specifies an FTP server for the archive. APT's FTP "
+#~| "behavior is highly configurable; for more information see the &apt-conf; "
+#~| "manual page. Please note that an FTP proxy can be specified by using the "
+#~| "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~| "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~| "environment variable and <emphasis>only</emphasis> this environment "
+#~| "variable. Proxies using HTTP specified in the configuration file will be "
+#~| "ignored."
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Schemat ftp opisuje serwer FTP archiwum. Zachowanie modułu FTP można "
+#~ "dowolnie konfigurować, szczegóły można znaleźć na stronie podręcznika  "
+#~ "&apt-conf;. Proszę zauważyć, że można podać serwer proxy FTP, używając "
+#~ "zmiennej środowiskowej <envar>ftp_proxy</envar>. Możliwe jest podanie "
+#~ "serwera proxy HTTP (które to serwery często rozumieją lokalizacje zasobów "
+#~ "FTP), używając tej i <emphasis>tylko</emphasis> tej zmiennej "
+#~ "środowiskowej. Podane w pliku konfiguracyjnym serwery proxy  używające "
+#~ "HTTP zostaną zignorowane."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "Metoda rsh/ssh uruchamia RSH/SSH do połączenia się ze zdalnym komputerem "
+#~ "i uzyskania dostępu do plików jako podany użytkownik. Dobrym pomysłem "
+#~ "jest wcześniejsze przygotowanie kluczy RSA lub dostępu rhosts. APT używa "
+#~ "standardowych poleceń <command>find</command> i <command>dd</command> do "
+#~ "przetransferowania plików ze zdalnego komputera."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"id_klucza\">"
+
 #
 #, fuzzy
 #~| msgid "APT key management utility"
diff --git a/doc/po/pt.po b/doc/po/pt.po
index 0a5832611..4090862f5 100644
--- a/doc/po/pt.po
+++ b/doc/po/pt.po
@@ -700,15 +700,6 @@ msgstr ""
 "<!-- TRANSLATOR: usado como parâmetro para apt-ftparchive ex. apt-ftparchive "
 "generate section --> <!ENTITY synopsis-section \"secção\">"
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-"<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-key "
-"export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -4948,95 +4939,6 @@ msgstr ""
 "protocolos HTTP e HTTPS e estão documentadas nos manuais &apt-transport-"
 "http; e &apt-transport-https; respetivamente."
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-"<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
-"FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:port]/"
-"</literal>. Os proxies por máquina podem também ser especificados ao usar o "
-"formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a palavra chave "
-"especial <literal>DIRECT</literal> que significa não usar nenhum proxy. Se "
-"nenhuma das definições acima for especificada, será usada a variável de "
-"ambiente <envar>ftp_proxy</envar>. Para usar um proxy FTP você tem que "
-"definir o script <literal>ftp::ProxyLogin</literal> no ficheiro de "
-"configuração. Esta entrada especifica os comandos a enviar para dizer ao "
-"servidor proxy ao que se ligar. Por favor veja &configureindex; para um "
-"exemplo de como fazer isto. As variáveis de substituição que representam o "
-"componente URI correspondente são <literal>$(PROXY_USER)</literal> "
-"<literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> "
-"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> e "
-"<literal>$(SITE_PORT)</literal>."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-"A opção <literal>timeout</literal> define o tempo limite usado por este "
-"método, este valor aplica-se à ligação assim como os tempos de limite de "
-"dados."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-"São disponibilizadas várias definições para controlar o modo passivo. "
-"Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
-"ambientes. No entanto algumas situações requerem que o modo passivo seja "
-"desactivado e em vez disso usar o  modo port FTP. Isto pode ser feito "
-"globalmente ou para ligações que passam por um proxy ou para uma máquina "
-"específica (veja a amostra de ficheiro de configuração para exemplos)."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-"É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente "
-"<envar>ftp_proxy</envar> para um URL HTTP - veja a discussão do método http "
-"em cima para a sintaxe. Você não pode definir isto no ficheiro de "
-"configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa "
-"eficiência."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-"A definição <literal>ForceExtended</literal> controla o uso de comandos "
-"RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição é "
-"falso, o que significa que estes comandos apenas são usados se a ligação de "
-"controle for IPv6. Definir isto para verdadeiro força o seu uso mesmo em "
-"ligações IPv4. Note que a maioria dos servidores FTP não suporta RFC2428."
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -5998,12 +5900,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-"Escreve informação relacionada com o descarregamento de pacotes usando FTP."
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 "Escreve informação relacionada com o descarregamento de pacotes usando HTTP."
@@ -8783,38 +8679,6 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-"O esquema ftp especifica um servidor FTP para um arquivo. O uso de FTP está "
-"em declínio em favor de <literal>http</literal> e <literal>https</literal> e "
-"muitos arquivos ou nunca ofereceram ou estão a retirar o acesso FTP. Se você "
-"ainda precisa deste método, estão disponíveis muitas opções de configuração "
-"no escopo <literal>Acquire::ftp</literal> e detalhadas em &apt-conf;."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-"Por favor note que pode ser especificado um proxy FTP ao usar a variável de "
-"ambiente <envar>ftp_proxy</envar>. É possível especifica um proxy HTTP (os "
-"servidores proxy HTTP geralmente compreendem URLs de FTP) usando esta "
-"variável de ambiente e <emphasis>apenas</emphasis> esta variável de "
-"ambiente. Os proxies que usam HTTP especificados no ficheiro de configuração "
-"serão ignorados."
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
@@ -8825,20 +8689,6 @@ msgstr ""
 "localização. Isto é útil para quem use um meio amovível para copiar "
 "ficheiros com o APT."
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-"O método rsh/ssh invoca RSH/SSH a ligar a uma máquina remota e aceder a "
-"ficheiros como um dado utilizador. É recomendada a configuração prévia de "
-"rhosts ou chaves RSA. Os comandos standard <command>find</command> e "
-"<command>dd</command> são usados para executar as transferências de "
-"ficheiros a partir da máquina remota."
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -9019,62 +8869,62 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
-"Usa FTP para aceder ao arquivo em ftp.example.org, sob o directório debian, "
+"Usa HTTPS para aceder ao arquivo em deb.debian.org, sob o directório debian, "
 "e usa apenas a área &debian-stable-codename;/contrib."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
-msgstr "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
+msgstr "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
-"Usa FTP para aceder ao arquivo em ftp.example.org, sob o directório debian, "
+"Usa HTTPS para aceder ao arquivo em deb.debian.org, sob o directório debian, "
 "e usa apenas a área unstable/contrib. Se esta linha aparecer também como "
 "aquela no exemplo anterior em <filename>sources.list</filename> será usada "
-"uma única sessão FTP para ambas linhas de recurso."
+"uma única sessão HTTPS para ambas linhas de recurso."
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
-msgstr "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
+msgstr "deb https://deb.debian.org/debian unstable contrib"
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 
@@ -12698,7 +12548,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -12711,7 +12560,6 @@ msgstr ""
 "\n"
 " Por exemplo:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
@@ -13868,6 +13716,143 @@ msgstr "  # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade\n"
 msgid "Which will use the already fetched archives on the disc."
 msgstr "O qual irá usar os arquivos já obtidos e que estão no disco."
 
+#~ msgid ""
+#~ "<literal>ftp::Proxy</literal> sets the default proxy to use for FTP "
+#~ "URIs.  It is in the standard form of <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>.  Per host proxies can also be specified by using the "
+#~ "form <literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
+#~ "<literal>DIRECT</literal> meaning to use no proxies. If no one of the "
+#~ "above settings is specified, <envar>ftp_proxy</envar> environment "
+#~ "variable will be used. To use an FTP proxy you will have to set the "
+#~ "<literal>ftp::ProxyLogin</literal> script in the configuration file. This "
+#~ "entry specifies the commands to send to tell the proxy server what to "
+#~ "connect to. Please see &configureindex; for an example of how to do this. "
+#~ "The substitution variables representing the corresponding URI component "
+#~ "are <literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
+#~ "<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
+#~ "<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
+#~ msgstr ""
+#~ "<literal>ftp::Proxy</literal> define o proxy predefinido a usar para URIs "
+#~ "FTP. Está no formato standard de <literal>ftp://[[user][:pass]@]host[:"
+#~ "port]/</literal>. Os proxies por máquina podem também ser especificados "
+#~ "ao usar o formato <literal>ftp::Proxy::&lt;host&gt;</literal> com a "
+#~ "palavra chave especial <literal>DIRECT</literal> que significa não usar "
+#~ "nenhum proxy. Se nenhuma das definições acima for especificada, será "
+#~ "usada a variável de ambiente <envar>ftp_proxy</envar>. Para usar um proxy "
+#~ "FTP você tem que definir o script <literal>ftp::ProxyLogin</literal> no "
+#~ "ficheiro de configuração. Esta entrada especifica os comandos a enviar "
+#~ "para dizer ao servidor proxy ao que se ligar. Por favor veja "
+#~ "&configureindex; para um exemplo de como fazer isto. As variáveis de "
+#~ "substituição que representam o componente URI correspondente são "
+#~ "<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</literal> "
+#~ "<literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
+#~ "<literal>$(SITE)</literal> e <literal>$(SITE_PORT)</literal>."
+
+#~ msgid ""
+#~ "The option <literal>timeout</literal> sets the timeout timer used by the "
+#~ "method; this value applies to the connection as well as the data timeout."
+#~ msgstr ""
+#~ "A opção <literal>timeout</literal> define o tempo limite usado por este "
+#~ "método, este valor aplica-se à ligação assim como os tempos de limite de "
+#~ "dados."
+
+#~ msgid ""
+#~ "Several settings are provided to control passive mode. Generally it is "
+#~ "safe to leave passive mode on; it works in nearly every environment.  "
+#~ "However, some situations require that passive mode be disabled and port "
+#~ "mode FTP used instead. This can be done globally or for connections that "
+#~ "go through a proxy or for a specific host (see the sample config file for "
+#~ "examples)."
+#~ msgstr ""
+#~ "São disponibilizadas várias definições para controlar o modo passivo. "
+#~ "Geralmente é seguro deixar o modo passivo ligado, funciona em quase todos "
+#~ "ambientes. No entanto algumas situações requerem que o modo passivo seja "
+#~ "desactivado e em vez disso usar o  modo port FTP. Isto pode ser feito "
+#~ "globalmente ou para ligações que passam por um proxy ou para uma máquina "
+#~ "específica (veja a amostra de ficheiro de configuração para exemplos)."
+
+#~ msgid ""
+#~ "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
+#~ "envar> environment variable to an HTTP URL - see the discussion of the "
+#~ "http method above for syntax. You cannot set this in the configuration "
+#~ "file and it is not recommended to use FTP over HTTP due to its low "
+#~ "efficiency."
+#~ msgstr ""
+#~ "É possível usar proxy FTP sobre HTTP ao definir a variável de ambiente "
+#~ "<envar>ftp_proxy</envar> para um URL HTTP - veja a discussão do método "
+#~ "http em cima para a sintaxe. Você não pode definir isto no ficheiro de "
+#~ "configuração e não é recomendado usar FTP sobre HTTP devido à sua baixa "
+#~ "eficiência."
+
+#~ msgid ""
+#~ "The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
+#~ "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default "
+#~ "is false, which means these commands are only used if the control "
+#~ "connection is IPv6. Setting this to true forces their use even on IPv4 "
+#~ "connections. Note that most FTP servers do not support RFC2428."
+#~ msgstr ""
+#~ "A definição <literal>ForceExtended</literal> controla o uso de comandos "
+#~ "RFC2428 <literal>EPSV</literal> e <literal>EPRT</literal>. A predefinição "
+#~ "é falso, o que significa que estes comandos apenas são usados se a "
+#~ "ligação de controle for IPv6. Definir isto para verdadeiro força o seu "
+#~ "uso mesmo em ligações IPv4. Note que a maioria dos servidores FTP não "
+#~ "suporta RFC2428."
+
+#~ msgid "Print information related to downloading packages using FTP."
+#~ msgstr ""
+#~ "Escreve informação relacionada com o descarregamento de pacotes usando "
+#~ "FTP."
+
+#~ msgid ""
+#~ "The ftp scheme specifies an FTP server for an archive. Use of FTP is on "
+#~ "the decline in favour of <literal>http</literal> and <literal>https</"
+#~ "literal> and many archives either never offered or are retiring FTP "
+#~ "access. If you still need this method many configuration options for it "
+#~ "are available in the <literal>Acquire::ftp</literal> scope and detailed "
+#~ "in &apt-conf;."
+#~ msgstr ""
+#~ "O esquema ftp especifica um servidor FTP para um arquivo. O uso de FTP "
+#~ "está em declínio em favor de <literal>http</literal> e <literal>https</"
+#~ "literal> e muitos arquivos ou nunca ofereceram ou estão a retirar o "
+#~ "acesso FTP. Se você ainda precisa deste método, estão disponíveis muitas "
+#~ "opções de configuração no escopo <literal>Acquire::ftp</literal> e "
+#~ "detalhadas em &apt-conf;."
+
+#~ msgid ""
+#~ "Please note that an FTP proxy can be specified by using the "
+#~ "<envar>ftp_proxy</envar> environment variable. It is possible to specify "
+#~ "an HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
+#~ "environment variable and <emphasis>only</emphasis> this environment "
+#~ "variable. Proxies using HTTP specified in the configuration file will be "
+#~ "ignored."
+#~ msgstr ""
+#~ "Por favor note que pode ser especificado um proxy FTP ao usar a variável "
+#~ "de ambiente <envar>ftp_proxy</envar>. É possível especifica um proxy HTTP "
+#~ "(os servidores proxy HTTP geralmente compreendem URLs de FTP) usando esta "
+#~ "variável de ambiente e <emphasis>apenas</emphasis> esta variável de "
+#~ "ambiente. Os proxies que usam HTTP especificados no ficheiro de "
+#~ "configuração serão ignorados."
+
+#~ msgid ""
+#~ "The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
+#~ "the files as a given user. Prior configuration of rhosts or RSA keys is "
+#~ "recommended. The standard <command>find</command> and <command>dd</"
+#~ "command> commands are used to perform the file transfers from the remote "
+#~ "host."
+#~ msgstr ""
+#~ "O método rsh/ssh invoca RSH/SSH a ligar a uma máquina remota e aceder a "
+#~ "ficheiros como um dado utilizador. É recomendada a configuração prévia de "
+#~ "rhosts ou chaves RSA. Os comandos standard <command>find</command> e "
+#~ "<command>dd</command> são usados para executar as transferências de "
+#~ "ficheiros a partir da máquina remota."
+
+#~ msgid ""
+#~ "<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
+#~ "473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
+#~ msgstr ""
+#~ "<!-- TRANSLATOR: usado como id de chave de exportação do apt-key ex. apt-"
+#~ "key export 473041FA --> <!ENTITY synopsis-keyid \"id_de_chave\">"
+
 #~ msgid "Deprecated APT key management utility"
 #~ msgstr "Utilitário de gestão de chaves do APT descontinuado"
 
diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po
index f36008f8c..020993be2 100644
--- a/doc/po/pt_BR.po
+++ b/doc/po/pt_BR.po
@@ -501,13 +501,6 @@ msgid ""
 "generate section --> <!ENTITY synopsis-section \"section\">"
 msgstr ""
 
-#. type: Plain text
-#: apt.ent
-msgid ""
-"<!-- TRANSLATOR: used as in apt-key export keyid e.g. apt-key export "
-"473041FA --> <!ENTITY synopsis-keyid \"keyid\">"
-msgstr ""
-
 #. type: Content of: <refentry><refmeta><manvolnum>
 #: apt.8.xml apt-get.8.xml apt-cache.8.xml apt-mark.8.xml apt-secure.8.xml
 #: apt-cdrom.8.xml apt-config.8.xml
@@ -3429,61 +3422,6 @@ msgid ""
 "&apt-transport-https; manpages respectively."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"<literal>ftp::Proxy</literal> sets the default proxy to use for FTP URIs.  "
-"It is in the standard form of <literal>ftp://[[user][:pass]@]host[:port]/</"
-"literal>.  Per host proxies can also be specified by using the form "
-"<literal>ftp::Proxy::&lt;host&gt;</literal> with the special keyword "
-"<literal>DIRECT</literal> meaning to use no proxies. If no one of the above "
-"settings is specified, <envar>ftp_proxy</envar> environment variable will be "
-"used. To use an FTP proxy you will have to set the <literal>ftp::ProxyLogin</"
-"literal> script in the configuration file. This entry specifies the commands "
-"to send to tell the proxy server what to connect to. Please see "
-"&configureindex; for an example of how to do this. The substitution "
-"variables representing the corresponding URI component are "
-"<literal>$(PROXY_USER)</literal>, <literal>$(PROXY_PASS)</literal>, "
-"<literal>$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal>."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The option <literal>timeout</literal> sets the timeout timer used by the "
-"method; this value applies to the connection as well as the data timeout."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"Several settings are provided to control passive mode. Generally it is safe "
-"to leave passive mode on; it works in nearly every environment.  However, "
-"some situations require that passive mode be disabled and port mode FTP used "
-"instead. This can be done globally or for connections that go through a "
-"proxy or for a specific host (see the sample config file for examples)."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</"
-"envar> environment variable to an HTTP URL - see the discussion of the http "
-"method above for syntax. You cannot set this in the configuration file and "
-"it is not recommended to use FTP over HTTP due to its low efficiency."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
-msgid ""
-"The setting <literal>ForceExtended</literal> controls the use of RFC2428 "
-"<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is "
-"false, which means these commands are only used if the control connection is "
-"IPv6. Setting this to true forces their use even on IPv4 connections. Note "
-"that most FTP servers do not support RFC2428."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><literallayout>
 #: apt.conf.5.xml
 #, no-wrap
@@ -4131,11 +4069,6 @@ msgstr ""
 
 #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
 #: apt.conf.5.xml
-msgid "Print information related to downloading packages using FTP."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#: apt.conf.5.xml
 msgid "Print information related to downloading packages using HTTP."
 msgstr ""
 
@@ -6466,42 +6399,12 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
 #: sources.list.5.xml
 msgid ""
-"The ftp scheme specifies an FTP server for an archive. Use of FTP is on the "
-"decline in favour of <literal>http</literal> and <literal>https</literal> "
-"and many archives either never offered or are retiring FTP access. If you "
-"still need this method many configuration options for it are available in "
-"the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"Please note that an FTP proxy can be specified by using the "
-"<envar>ftp_proxy</envar> environment variable. It is possible to specify an "
-"HTTP proxy (HTTP proxy servers often understand FTP URLs)  using this "
-"environment variable and <emphasis>only</emphasis> this environment "
-"variable. Proxies using HTTP specified in the configuration file will be "
-"ignored."
-msgstr ""
-
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
 "The copy scheme is identical to the file scheme except that packages are "
 "copied into the cache directory instead of used directly at their location.  "
 "This is useful for people using removable media to copy files around with "
 "APT."
 msgstr ""
 
-#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#: sources.list.5.xml
-msgid ""
-"The rsh/ssh method invokes RSH/SSH to connect to a remote host and access "
-"the files as a given user. Prior configuration of rhosts or RSA keys is "
-"recommended. The standard <command>find</command> and <command>dd</command> "
-"commands are used to perform the file transfers from the remote host."
-msgstr ""
-
 #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
 #: sources.list.5.xml
 msgid "adding more recognizable URI types"
@@ -6640,14 +6543,14 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the &debian-stable-codename;/contrib area."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian &debian-stable-codename; contrib"
+msgid "deb https://deb.debian.org/debian &debian-stable-codename; contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6655,7 +6558,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: &debian-stable-codename;\n"
 "Components: contrib"
 msgstr ""
@@ -6663,16 +6566,16 @@ msgstr ""
 #. type: Content of: <refentry><refsect1><para>
 #: sources.list.5.xml
 msgid ""
-"Uses FTP to access the archive at ftp.example.org, under the debian "
+"Uses HTTPS to access the archive at deb.debian.org, under the debian "
 "directory, and uses only the unstable/contrib area. If this line appears as "
 "well as the one in the previous example in <filename>sources.list</filename> "
-"a single FTP session will be used for both resource lines."
+"a single HTTPS session will be used for both resource lines."
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
 #: sources.list.5.xml
 #, no-wrap
-msgid "deb ftp://ftp.example.org/debian unstable contrib"
+msgid "deb https://deb.debian.org/debian unstable contrib"
 msgstr ""
 
 #. type: Content of: <refentry><refsect1><literallayout>
@@ -6680,7 +6583,7 @@ msgstr ""
 #, no-wrap
 msgid ""
 "Types: deb\n"
-"URIs: ftp://ftp.example.org/debian\n"
+"URIs: https://deb.debian.org/debian\n"
 "Suites: unstable\n"
 "Components: contrib"
 msgstr ""
@@ -9455,7 +9358,6 @@ msgid ""
 "\n"
 " For example:\n"
 "      file:/mnt/debian,\n"
-"      ftp://ftp.example.org/debian,\n"
 "      http://deb.debian.org/debian,\n"
 "\n"
 "\n"
diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 9d2185d7a..23adacefe 100644
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -487,36 +487,12 @@ Signed-By:
     source list.</para></listitem>
     </varlistentry>
 
-    <varlistentry><term><command>ftp</command></term>
-    <listitem><para>
-    The ftp scheme specifies an FTP server for an archive. Use of FTP is on the
-    decline in favour of <literal>http</literal> and <literal>https</literal>
-    and many archives either never offered or are retiring FTP access. If you
-    still need this method many configuration options for it are available in
-    the <literal>Acquire::ftp</literal> scope and detailed in &apt-conf;.</para>
-    <para>Please note that an FTP proxy can be specified
-    by using the <envar>ftp_proxy</envar> environment variable. It is possible
-    to specify an HTTP proxy (HTTP proxy servers often understand FTP URLs)
-    using this environment variable and <emphasis>only</emphasis> this
-    environment variable. Proxies using HTTP specified in
-    the configuration file will be ignored.</para></listitem>
-    </varlistentry>
-
     <varlistentry><term><command>copy</command></term>
     <listitem><para>
     The copy scheme is identical to the file scheme except that packages are
     copied into the cache directory instead of used directly at their location.
     This is useful for people using removable media to copy files around with APT.</para></listitem>
     </varlistentry>
-    
-    <varlistentry><term><command>rsh</command></term><term><command>ssh</command></term>
-    <listitem><para>
-    The rsh/ssh method invokes RSH/SSH to connect to a remote host and
-    access the files as a given user. Prior configuration of rhosts or RSA keys
-    is recommended. The standard <command>find</command> and <command>dd</command>
-    commands are used to perform the file transfers from the remote host.
-    </para></listitem>
-    </varlistentry>
 
     <varlistentry><term>adding more recognizable URI types</term>
     <listitem><para>
@@ -577,21 +553,21 @@ URIs: http://archive.debian.org/debian-archive
 Suites: hamm
 Components: main</literallayout>
 
-   <para>Uses FTP to access the archive at ftp.example.org, under the debian
+   <para>Uses HTTPS to access the archive at deb.debian.org, under the debian
    directory, and uses only the &debian-stable-codename;/contrib area.</para>
-   <literallayout>deb ftp://ftp.example.org/debian &debian-stable-codename; contrib</literallayout>
+   <literallayout>deb https://deb.debian.org/debian &debian-stable-codename; contrib</literallayout>
    <literallayout>Types: deb
-URIs: ftp://ftp.example.org/debian
+URIs: https://deb.debian.org/debian
 Suites: &debian-stable-codename;
 Components: contrib</literallayout>
 
-   <para>Uses FTP to access the archive at ftp.example.org, under the debian
+   <para>Uses HTTPS to access the archive at deb.debian.org, under the debian
    directory, and uses only the unstable/contrib area. If this line appears as
    well as the one in the previous example in <filename>sources.list</filename>
-   a single FTP session will be used for both resource lines.</para>
-   <literallayout>deb ftp://ftp.example.org/debian unstable contrib</literallayout>
+   a single HTTPS session will be used for both resource lines.</para>
+   <literallayout>deb https://deb.debian.org/debian unstable contrib</literallayout>
    <literallayout>Types: deb
-URIs: ftp://ftp.example.org/debian
+URIs: https://deb.debian.org/debian
 Suites: unstable
 Components: contrib</literallayout>
 
diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 6fa2de6d0..e23191cd3 100644
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -65,7 +65,7 @@ class ContentsExtract : public pkgDirStream
    
    bool Read(debDebFile &Deb);
    
-   virtual bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE;      
+   bool DoItem(Item &Itm,int &Fd) override;
    void Reset() {CurSize = 0;};
    bool TakeContents(const void *Data,unsigned long long Length);
    void Add(GenContents &Contents,std::string const &Package);
diff --git a/ftparchive/writer.h b/ftparchive/writer.h
index cadddc2b9..c9b07c1b2 100644
--- a/ftparchive/writer.h
+++ b/ftparchive/writer.h
@@ -123,7 +123,7 @@ class PackagesWriter : public FTWScanner
    inline bool ReadOverride(string const &File) {return Over.ReadOverride(File);};
    inline bool ReadExtraOverride(string const &File)
       {return Over.ReadExtraOverride(File);};
-   virtual bool DoPackage(string FileName) APT_OVERRIDE;
+   bool DoPackage(string FileName) override;
 
    PackagesWriter(FileFd * const Output, TranslationWriter * const TransWriter, string const &DB,
                   string const &Overrides,
@@ -146,7 +146,7 @@ class ContentsWriter : public FTWScanner
    string Prefix;
 
    bool DoPackage(string FileName,string Package);
-   virtual bool DoPackage(string FileName) APT_OVERRIDE
+   bool DoPackage(string FileName) override
              {return DoPackage(FileName,string());};
    bool ReadFromPkgs(string const &PkgFile,string const &PkgCompress);
 
@@ -176,7 +176,7 @@ class SourcesWriter : public FTWScanner
    string DirStrip;
    struct CacheDB::Stats &Stats;
 
-   virtual bool DoPackage(string FileName) APT_OVERRIDE;
+   bool DoPackage(string FileName) override;
 
    SourcesWriter(FileFd * const Output, string const &DB,string const &BOverrides,string const &SOverrides,
 		 string const &ExtOverrides=string());
@@ -187,7 +187,7 @@ class ReleaseWriter : public FTWScanner
 {
 public:
    ReleaseWriter(FileFd * const Output, string const &DB);
-   virtual bool DoPackage(string FileName) APT_OVERRIDE;
+   bool DoPackage(string FileName) override;
    void Finish();
 
    // General options
diff --git a/methods/aptmethod.h b/methods/aptmethod.h
index 1ea173075..f564499f0 100644
--- a/methods/aptmethod.h
+++ b/methods/aptmethod.h
@@ -120,7 +120,7 @@ protected:
    };
 
    public:
-   virtual bool Configuration(std::string Message) APT_OVERRIDE
+   bool Configuration(std::string Message) override
    {
       if (pkgAcqMethod::Configuration(Message) == false)
 	 return false;
@@ -540,7 +540,7 @@ class aptAuthConfMethod : public aptMethod
    std::vector<std::unique_ptr<FileFd>> authconfs;
 
    public:
-   virtual bool Configuration(std::string Message) APT_OVERRIDE
+   bool Configuration(std::string Message) override
    {
       if (pkgAcqMethod::Configuration(Message) == false)
 	 return false;
diff --git a/methods/basehttp.h b/methods/basehttp.h
index c077ea384..1d3ed1ace 100644
--- a/methods/basehttp.h
+++ b/methods/basehttp.h
@@ -126,7 +126,7 @@ struct ServerState
 class BaseHttpMethod : public aptAuthConfMethod
 {
    protected:
-   virtual bool Fetch(FetchItem *) APT_OVERRIDE;
+   bool Fetch(FetchItem *) override;
 
    std::unique_ptr<ServerState> Server;
    std::string NextURI;
@@ -163,14 +163,14 @@ class BaseHttpMethod : public aptAuthConfMethod
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
-   static APT_NORETURN void SigTerm(int);
+   [[noreturn]] static void SigTerm(int);
 
    int Loop();
 
    virtual void SendReq(FetchItem *Itm) = 0;
    virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) = 0;
    virtual void RotateDNS() = 0;
-   virtual bool Configuration(std::string Message) APT_OVERRIDE;
+   bool Configuration(std::string Message) override;
 
    bool AddProxyAuth(URI &Proxy, URI const &Server);
 
diff --git a/methods/cdrom.cc b/methods/cdrom.cc
index f534a06f5..88a10c0f0 100644
--- a/methods/cdrom.cc
+++ b/methods/cdrom.cc
@@ -42,10 +42,10 @@ class CDROMMethod : public aptMethod
  
    bool IsCorrectCD(URI want, string MountPath, string& NewID);
    bool AutoDetectAndMount(const URI, string &NewID);
-   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   bool Fetch(FetchItem *Itm) override;
    std::string GetID(std::string const &Name);
-   virtual void Exit() APT_OVERRIDE;
-   virtual bool Configuration(std::string Message) APT_OVERRIDE;
+   void Exit() override;
+   bool Configuration(std::string Message) override;
 
    public:
    
diff --git a/methods/connect.cc b/methods/connect.cc
index eeee7c509..ec0a5c1f9 100644
--- a/methods/connect.cc
+++ b/methods/connect.cc
@@ -89,10 +89,10 @@ static bool ConnectionAllowed(char const * const Service, std::string const &Hos
 struct FdFd final : public MethodFd
 {
    int fd = -1;
-   int Fd() APT_OVERRIDE { return fd; }
-   ssize_t Read(void *buf, size_t count) APT_OVERRIDE { return ::read(fd, buf, count); }
-   ssize_t Write(void *buf, size_t count) APT_OVERRIDE { return ::write(fd, buf, count); }
-   int Close() APT_OVERRIDE
+   int Fd() override { return fd; }
+   ssize_t Read(void *buf, size_t count) override { return ::read(fd, buf, count); }
+   ssize_t Write(void *buf, size_t count) override { return ::write(fd, buf, count); }
+   int Close() override
    {
       int result = 0;
       if (fd != -1)
diff --git a/methods/copy.cc b/methods/copy.cc
index 9c9c6572d..e3f2a29a2 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -26,7 +26,7 @@
 
 class CopyMethod final : public aptMethod
 {
-   bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
 
    public:
    CopyMethod() : aptMethod("copy", "1.0", SingleInstance | SendConfig | SendURIEncoded)
diff --git a/methods/file.cc b/methods/file.cc
index 111440ce1..2a17336fc 100644
--- a/methods/file.cc
+++ b/methods/file.cc
@@ -29,7 +29,7 @@
 
 class FileMethod final : public aptMethod
 {
-   bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
 
    public:
    FileMethod() : aptMethod("file", "1.0", SingleInstance | SendConfig | LocalOnly | SendURIEncoded)
diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index e5554b1e2..1a6356dee 100644
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -68,7 +68,7 @@ struct Digest {
    }
 };
 
-static constexpr Digest Digests[] = {
+static constexpr std::array<Digest,12> Digests = {{
    {Digest::State::Untrusted, "Invalid digest"},
    {Digest::State::Untrusted, "MD5"},
    {Digest::State::Untrusted, "SHA1"},
@@ -81,17 +81,14 @@ static constexpr Digest Digests[] = {
    {Digest::State::Trusted, "SHA384"},
    {Digest::State::Trusted, "SHA512"},
    {Digest::State::Trusted, "SHA224"},
-};
+}};
 
-static Digest FindDigest(std::string const & Digest)
+static Digest FindDigest(std::string const &Digest)
 {
    int id = atoi(Digest.c_str());
-   if (id >= 0 && static_cast<unsigned>(id) < APT_ARRAY_SIZE(Digests))
-   {
+   if (id >= 0 && static_cast<unsigned>(id) < Digests.size())
       return Digests[id];
-   } else {
-      return Digests[0];
-   }
+   return Digests[0];
 }
 
 struct Signer {
@@ -130,7 +127,7 @@ class GPGVMethod : public aptMethod
 				     SignersStorage &Signers);
 
    protected:
-   virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
    public:
    GPGVMethod() : aptMethod("gpgv", "1.1", SingleInstance | SendConfig | SendURIEncoded){};
 };
@@ -214,7 +211,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
 
    FILE *pipein = fdopen(fd[0], "r");
 
-   // Loop over the output of apt-key (which really is gnupg), and check the signatures.
+   // Loop over the output of gpgv, and check the signatures.
    std::vector<std::string> ErrSigners;
    std::map<std::string, std::vector<std::string>> SubKeyMapping;
    size_t buffersize = 0;
@@ -340,7 +337,7 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
    for (auto errSigner : ErrSigners)
       Signers.Worthless.push_back({errSigner, ""});
 
-   // apt-key has a --keyid parameter, but this requires gpg, so we call it without it
+   // gpgv has no --keyid parameter, so we call it without it
    // and instead check after the fact which keyids where used for verification
    if (keyFpts.empty() == false)
    {
@@ -565,7 +562,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
 	    keyFpts.emplace_back(std::move(key));
    }
 
-   // Run apt-key on file, extract contents and get the key ID of the signer
+   // Run gpgv on file, extract contents and get the key ID of the signer
    string const msg = VerifyGetSignersWithLegacy(Path.c_str(), Itm->DestFile.c_str(), keyFpts, keyFiles, Signers);
    if (_error->PendingError())
       return false;
@@ -660,7 +657,7 @@ bool GPGVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    Dequeue();
 
    if (DebugEnabled())
-      std::clog << "apt-key succeeded\n";
+      std::clog << "gpgv succeeded\n";
 
    return true;
 }
diff --git a/methods/http.cc b/methods/http.cc
index 3574bcad5..f2514eb9d 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -284,9 +284,9 @@ struct HttpConnectFd final : public MethodFd
    std::unique_ptr<MethodFd> UnderlyingFd;
    std::string Buffer;
 
-   int Fd() APT_OVERRIDE { return UnderlyingFd->Fd(); }
+   int Fd() override { return UnderlyingFd->Fd(); }
 
-   ssize_t Read(void *buf, size_t count) APT_OVERRIDE
+   ssize_t Read(void *buf, size_t count) override
    {
       if (!Buffer.empty())
       {
@@ -299,17 +299,17 @@ struct HttpConnectFd final : public MethodFd
 
       return UnderlyingFd->Read(buf, count);
    }
-   ssize_t Write(void *buf, size_t count) APT_OVERRIDE
+   ssize_t Write(void *buf, size_t count) override
    {
       return UnderlyingFd->Write(buf, count);
    }
 
-   int Close() APT_OVERRIDE
+   int Close() override
    {
       return UnderlyingFd->Close();
    }
 
-   bool HasPending() APT_OVERRIDE
+   bool HasPending() override
    {
       return !Buffer.empty();
    }
diff --git a/methods/http.h b/methods/http.h
index 5bfcbc8a2..5d6a8aad1 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -98,37 +98,37 @@ struct HttpServerState final : public ServerState
    std::unique_ptr<MethodFd> ServerFd;
 
    protected:
-   virtual bool ReadHeaderLines(std::string &Data) APT_OVERRIDE;
-   virtual ResultState LoadNextResponse(bool const ToFile, RequestState &Req) APT_OVERRIDE;
-   virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;
+   bool ReadHeaderLines(std::string &Data) override;
+   ResultState LoadNextResponse(bool ToFile, RequestState &Req) override;
+   bool WriteResponse(std::string const &Data) override;
 
    public:
-   virtual void Reset() APT_OVERRIDE;
+   void Reset() override;
 
-   virtual ResultState RunData(RequestState &Req) APT_OVERRIDE;
-   virtual ResultState RunDataToDevNull(RequestState &Req) APT_OVERRIDE;
+   ResultState RunData(RequestState &Req) override;
+   ResultState RunDataToDevNull(RequestState &Req) override;
 
-   virtual ResultState Open() APT_OVERRIDE;
-   virtual bool IsOpen() APT_OVERRIDE;
-   virtual bool Close() APT_OVERRIDE;
-   virtual bool InitHashes(HashStringList const &ExpectedHashes) APT_OVERRIDE;
-   virtual Hashes * GetHashes() APT_OVERRIDE;
-   virtual ResultState Die(RequestState &Req) APT_OVERRIDE;
-   virtual bool Flush(FileFd *const File, bool MustComplete = true) APT_OVERRIDE;
-   virtual ResultState Go(bool ToFile, RequestState &Req) APT_OVERRIDE;
+   ResultState Open() override;
+   bool IsOpen() override;
+   bool Close() override;
+   bool InitHashes(HashStringList const &ExpectedHashes) override;
+   Hashes * GetHashes() override;
+   ResultState Die(RequestState &Req) override;
+   bool Flush(FileFd *File, bool MustComplete = true) override;
+   ResultState Go(bool ToFile, RequestState &Req) override;
 
    HttpServerState(URI Srv, HttpMethod *Owner);
-   virtual ~HttpServerState() {Close();};
+   ~HttpServerState() override {Close();};
 };
 
 class HttpMethod final : public BaseHttpMethod
 {
    public:
-   virtual void SendReq(FetchItem *Itm) APT_OVERRIDE;
+   void SendReq(FetchItem *Itm) override;
 
-   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
-   virtual void RotateDNS() APT_OVERRIDE;
-   virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res, RequestState &Req) APT_OVERRIDE;
+   std::unique_ptr<ServerState> CreateServerState(URI const &uri) override;
+   void RotateDNS() override;
+   DealWithHeadersResult DealWithHeaders(FetchResult &Res, RequestState &Req) override;
 
    protected:
    std::string AutoDetectProxyCmd;
diff --git a/methods/mirror.cc b/methods/mirror.cc
index 5781ebcf0..dfdd550b7 100644
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -89,12 +89,12 @@ class MirrorMethod : public aptMethod /*{{{*/
    };
    std::unordered_map<std::string, MirrorListInfo> mirrorfilestate;
 
-   virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
 
-   void RedirectItem(MirrorListInfo const &info, FetchItem *const Itm, std::string const &Message);
-   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);
+   void RedirectItem(MirrorListInfo const &info, FetchItem *Itm, std::string const &Message);
+   bool MirrorListFileReceived(MirrorListInfo &info, FetchItem *Itm);
+   std::string GetMirrorFileURI(std::string const &Message, FetchItem *Itm);
+   void DealWithPendingItems(std::vector<std::string> const &baseuris, MirrorListInfo const &info, FetchItem *Itm, std::function<void()> handler);
 
    public:
    explicit MirrorMethod(std::string &&pProg) : aptMethod(std::move(pProg), "2.0", SingleInstance | Pipeline | SendConfig | AuxRequests | SendURIEncoded), genrng(clock())
diff --git a/methods/rred.cc b/methods/rred.cc
index bef2e969e..836697a11 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -624,7 +624,7 @@ class RredMethod final : public aptMethod {
       }
 
    protected:
-      virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE {
+      bool URIAcquire(std::string const &Message, FetchItem *Itm) override {
 	 Debug = DebugEnabled();
 	 URI Get(Itm->Uri);
 	 std::string Path = DecodeSendURI(Get.Host + Get.Path); // rred:/path - no host
diff --git a/methods/sqv.cc b/methods/sqv.cc
index 716081f8e..ce7e36657 100644
--- a/methods/sqv.cc
+++ b/methods/sqv.cc
@@ -21,7 +21,7 @@ class SQVMethod : public aptMethod
 			 vector<string> &signers);
 
    protected:
-   virtual bool URIAcquire(std::string const &Message, FetchItem *Itm) APT_OVERRIDE;
+   bool URIAcquire(std::string const &Message, FetchItem *Itm) override;
 
    public:
    SQVMethod();
@@ -296,7 +296,7 @@ bool SQVMethod::URIAcquire(std::string const &Message, FetchItem *Itm)
    if (_error->PendingError())
       return false;
 
-   // Run apt-key on file, extract contents and get the key ID of the signer
+   // Run sqv on file, extract contents and get the key ID of the signer
    VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), keyFiles, Signers);
    if (_error->PendingError())
    {
diff --git a/methods/store.cc b/methods/store.cc
index ed2eb3fe1..bfd748e23 100644
--- a/methods/store.cc
+++ b/methods/store.cc
@@ -33,7 +33,7 @@
 
 class StoreMethod final : public aptMethod
 {
-   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   bool Fetch(FetchItem *Itm) override;
 
    public:
 
diff --git a/po/apt-all.pot b/po/apt-all.pot
index 3d41650c4..b872181fd 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -174,8 +174,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -186,7 +185,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ar.po b/po/ar.po
index 15c1a3087..84499d78b 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -187,8 +187,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -199,7 +198,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ast.po b/po/ast.po
index a7eb81259..b69bb2f1c 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -181,8 +181,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -193,7 +192,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/bg.po b/po/bg.po
index fdaf601e3..5cada03c6 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -194,8 +194,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфликт в дистрибуцията: %s (очаквана: %s, намерена: %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -206,7 +205,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/bs.po b/po/bs.po
index 33ee5e3c6..07baef075 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -181,8 +181,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -193,7 +192,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ca.po b/po/ca.po
index a2931df45..74f0a6b0f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -209,8 +209,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribució conflictiva: %s (s'esperava %s però s'ha obtingut %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "El dipòsit «%s» ha canviat el seu valor «%s» de «%s» a «%s»"
@@ -223,7 +222,7 @@ msgstr ""
 "%hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/cs.po b/po/cs.po
index 83efd375b..9afd9c05e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -204,8 +204,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Repozitář „%s“ změnil svou hodnotu „%s“ z „%s“ na „%s“"
@@ -216,7 +215,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr "Repozitář „%s“ změnil svou výchozí prioritu pro %s z %hi na %hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/cy.po b/po/cy.po
index dd79bb9da..bb19d26fa 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -181,8 +181,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -193,7 +192,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/da.po b/po/da.po
index 51b2dba6d..11a16d244 100644
--- a/po/da.po
+++ b/po/da.po
@@ -219,8 +219,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -231,7 +230,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/de.po b/po/de.po
index 0bd44251a..d92218655 100644
--- a/po/de.po
+++ b/po/de.po
@@ -213,8 +213,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Für das Depot »%s« wurde der »%s«-Wert von »%s« in »%s« geändert."
@@ -227,7 +226,7 @@ msgstr ""
 "geändert."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/dz.po b/po/dz.po
index 2a87f5b82..acaf06712 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -183,8 +183,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -195,7 +194,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/el.po b/po/el.po
index ef67c6feb..23ba24890 100644
--- a/po/el.po
+++ b/po/el.po
@@ -195,8 +195,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -207,7 +206,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/es.po b/po/es.po
index 58de8ed28..d65d6abe0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -272,8 +272,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -284,7 +283,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/eu.po b/po/eu.po
index 463f83a75..56b2f7c1d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -182,8 +182,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -194,7 +193,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/fi.po b/po/fi.po
index 680bbef7d..b12666d29 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -183,8 +183,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -195,7 +194,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/fr.po b/po/fr.po
index c583ced3d..f223cea24 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -210,8 +210,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Le dépôt « %s » a modifié sa valeur « %s » de « %s » à « %s »"
@@ -224,7 +223,7 @@ msgstr ""
 "« %hi »."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/gl.po b/po/gl.po
index 8077c36e0..50f3c0e54 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -190,8 +190,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -202,7 +201,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/hu.po b/po/hu.po
index 7a2e45cbb..248e7ed7c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -216,8 +216,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -228,7 +227,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/it.po b/po/it.po
index 7b0c795f0..8423921ca 100644
--- a/po/it.po
+++ b/po/it.po
@@ -210,8 +210,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Il repository \"%s\" ha modificato il valore \"%s\" da \"%s\" a \"%s\""
@@ -224,7 +223,7 @@ msgstr ""
 "%hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ja.po b/po/ja.po
index ea7c06373..13392878f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -218,8 +218,7 @@ msgstr ""
 "ディストリビューションが競合しています: %s (%s を期待していたのに %s を取得し"
 "ました)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -230,7 +229,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/km.po b/po/km.po
index 7d0f83af9..a55141f88 100644
--- a/po/km.po
+++ b/po/km.po
@@ -186,8 +186,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -198,7 +197,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ko.po b/po/ko.po
index c2b083f85..a7033d2a1 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -180,8 +180,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -192,7 +191,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ku.po b/po/ku.po
index 76f62a49a..458c22c40 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -179,8 +179,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -191,7 +190,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/lt.po b/po/lt.po
index 8496fc771..81e5aeae0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -183,8 +183,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -195,7 +194,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/mr.po b/po/mr.po
index 004967140..ccee19bf4 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -182,8 +182,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -194,7 +193,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/nb.po b/po/nb.po
index 461e743de..71d513ec0 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -196,8 +196,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Depot «%s» endret sin «%s»-verdi fra «%s» til «%s»."
@@ -208,7 +207,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr "Depot «%s» endret sin standardprioritet for %s fra %hi til %hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ne.po b/po/ne.po
index 382aee023..23bf8f4c2 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -181,8 +181,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -193,7 +192,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/nl.po b/po/nl.po
index 023da6d0d..0d57ca407 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -215,8 +215,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Tegenstrijdige distributie: %s (verwachtte %s, maar kreeg %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Bij pakketbron '%s' is de '%s'-waarde gewijzigd van '%s' naar '%s'"
@@ -229,7 +228,7 @@ msgstr ""
 "%hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/nn.po b/po/nn.po
index cbb542552..75ca20a2e 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -185,8 +185,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -197,7 +196,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/pl.po b/po/pl.po
index 6560640fc..29988590b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -211,8 +211,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Repozytorium \"%s\" zmieniło swoją wartość \"%s\" z \"%s\" na \"%s\""
@@ -224,7 +223,7 @@ msgstr ""
 "Repozytorium \"%s\" zmieniło swój domyślny priorytet dla %s z %hi na %hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/pt.po b/po/pt.po
index 7ba42567f..4bfa5d18b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -191,8 +191,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -203,7 +202,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7ae3c957b..3592d2903 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -181,8 +181,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -193,7 +192,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ro.po b/po/ro.po
index a7267cad4..8112ec6c4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -228,8 +228,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribuție în conflict: %s (se aștepta %s, dar s-a obținut %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Depozitul „%s” și-a schimbat valoarea „%s” din „%s” în „%s”"
@@ -242,7 +241,7 @@ msgstr ""
 "%hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/ru.po b/po/ru.po
index 5e686a4fc..c093bf85b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -213,8 +213,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Противоречивый выпуск: %s (ожидался %s, но получен %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "Репозиторий «%s» изменил значение поля «%s» с «%s» на «%s»"
@@ -226,7 +225,7 @@ msgstr ""
 "Репозиторий «%s» изменил свой приоритет по умолчанию для %s с %hi на %hi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/sk.po b/po/sk.po
index e0a4db1f1..bdd494762 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -192,8 +192,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -204,7 +203,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/sl.po b/po/sl.po
index ac6d0bb41..f844eb7e7 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -192,8 +192,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -204,7 +203,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/sv.po b/po/sv.po
index fea43194c..6bec2fb4d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -196,8 +196,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -208,7 +207,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/th.po b/po/th.po
index ff219a429..b35b44a3d 100644
--- a/po/th.po
+++ b/po/th.po
@@ -191,8 +191,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้องการ %s แต่พบ %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -203,7 +202,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/tl.po b/po/tl.po
index 62928b291..2ac77a133 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -184,8 +184,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -196,7 +195,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/tr.po b/po/tr.po
index 6ec30b8b5..0b5732e5e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -210,8 +210,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "'%s' deposu '%s' değerini '%s' yerine '%s' olarak değiştirmiş"
@@ -224,7 +223,7 @@ msgstr ""
 "değiştirdi."
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/uk.po b/po/uk.po
index 5b0aeb0ed..2a0d674d8 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -198,8 +198,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Конфліктуючий дистрибутив: %s (очікувався %s, але є %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -210,7 +209,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/vi.po b/po/vi.po
index b93fa27ec..03daae0a8 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -198,8 +198,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Bản phát hành xung đột: %s (cần %s nhưng lại nhận được %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -210,7 +209,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6b66772c..0b9d577e8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -194,8 +194,7 @@ msgstr "%s 的 Release 文件已经过期(已经过期了 %s)。该仓库的更�
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "仓库'%s'将其'%s'值从'%s'修改到了'%s'"
@@ -206,7 +205,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr "仓库'%s'将其'%s'的默认优先级从'%hi'修改到了'%hi'。"
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0ff202dd3..ef81b89fc 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -183,8 +183,7 @@ msgstr ""
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）"
 
-#. Both messages are reused from the ReleaseInfoChange feature in acquire-item.cc
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr ""
@@ -195,7 +194,7 @@ msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr ""
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc apt-private/private-update.cc
+#: apt-pkg/acquire-item.cc
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
diff --git a/prepare-release b/prepare-release
index fe9628fd0..c5d6ac81b 100755
--- a/prepare-release
+++ b/prepare-release
@@ -233,7 +233,6 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then
 				-e '^.*apt-pkg/pkgcache\.h.*mmaped.*==>.*mapped.*$' \
 				-e '^.*apt-pkg/pkgcachegen\.cc.*mmaped.*==>.*mapped.*$' \
 				-e '^.*apt-pkg/contrib/mmap\.h.*mmaped.*==>.*mapped.*$' \
-				-e '^.*cmdline/apt-key\.in.*dashs.*==>.*dashes.*$' \
 				-e '^.*methods/aptmethod\.h.*creat.*==>.*create.*$' \
 				-e '^.*dselect/install.*ans.*==>.*and.*$' \
 				-e '^.*ftparchive/writer\.h.*Delink.*==>.*Unlink.*$' \
@@ -276,9 +275,6 @@ elif [ "$1" = 'spellcheckers' -o "$1" = 'lint' ]; then
 				-e '^./ftparchive/byhash.cc: ByHash ByHash (duplicate word) -> ByHash$' \
 				-e '^./ftparchive/writer.cc: this Packages -> these packages$' \
 				-e '^./ftparchive/byhash.h: ByHash ByHash (duplicate word) -> ByHash$' \
-				-e '^./cmdline/apt-key.in: done done (duplicate word) -> done$' \
-				-e '^./cmdline/apt-key.in: fi fi (duplicate word) -> fi$' \
-				-e '^./cmdline/apt-key.in: echo echo (duplicate word) -> echo$' \
 				-e '^./triehash/.travis.yml: perl perl (duplicate word) -> perl$' \
 				-e '^./triehash/README.md: Performance Performance (duplicate word) -> Performance$' \
 				-e '^./debian/apt.apt-compat.cron.daily: fi fi (duplicate word) -> fi$' \
diff --git a/test/integration/test-apt-get-update-sourceslist-warning b/test/integration/test-apt-get-update-sourceslist-warning
index 3a3cb2e9f..115dd3e16 100755
--- a/test/integration/test-apt-get-update-sourceslist-warning
+++ b/test/integration/test-apt-get-update-sourceslist-warning
@@ -27,19 +27,11 @@ touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binar
 touch rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free-firmware_binary-amd64_Packages
 find rootdir/var/lib/apt/lists/ -type f -exec chmod 644 {} \;
 
-NOTESURL='https://www.debian.org/releases/bookworm/amd64/release-notes/ch-information.html#non-free-split'
 BOILERPLATE='Reading package lists...
 Building dependency tree...
 All packages are up to date.'
 
-msgmsg 'Do not suggest new non-free-firmware component if no non-free'
-echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
-testsuccessequal "$BOILERPLATE" apt update --no-download
-echo 'deb-src http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list
-testsuccessequal "$BOILERPLATE" apt update --no-download
-
 msgmsg 'Suggest Signed-By for deb822 sources.list(5) entries'
-rm rootdir/etc/apt/sources.list.d/example.list
 echo 'Types: deb
 URIs: http://example.org/debian
 Suites: bookworm
@@ -49,26 +41,6 @@ testsuccessequal "$BOILERPLATE
 N: Missing Signed-By in the sources.list(5) entry for 'http://example.org/debian'" apt update --no-download
 rm rootdir/etc/apt/sources.list.d/example.sources
 
-msgmsg 'Is non-free-firmware missing?'
-echo 'deb http://example.org/debian bookworm main non-free' > rootdir/etc/apt/sources.list.d/example.list
-cat >> rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages <<EOF
-Package: firmware-linux-nonfree
-Architecture: all
-Version: 1
-EOF
-testsuccessequal "$BOILERPLATE" apt update --no-download
-echo -n > rootdir/var/lib/apt/lists/example.org_debian_dists_bookworm_non-free_binary-amd64_Packages
-testsuccessequal "$BOILERPLATE
-N: Repository 'Debian bookworm' changed its 'non-free component' value from 'non-free' to 'non-free non-free-firmware'
-N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download
-
-msgmsg 'Component already present'
-echo 'deb http://example.org/debian bookworm non-free non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list
-testsuccessequal "$BOILERPLATE" apt update --no-download
-echo 'deb http://example.org/debian bookworm non-free
-deb http://example.org/debian bookworm non-free-firmware' > rootdir/etc/apt/sources.list.d/example.list
-testsuccessequal "$BOILERPLATE" apt update --no-download
-
 msgmsg 'Detect login info embedded in sources.list'
 echo 'deb http://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
 testsuccessequal "$BOILERPLATE
@@ -76,11 +48,3 @@ N: Usage of apt_auth.conf(5) should be preferred over embedding login informatio
 echo 'deb tor+https://apt:debian@example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
 testsuccessequal "$BOILERPLATE
 N: Usage of apt_auth.conf(5) should be preferred over embedding login information directly in the sources.list(5) entry for 'tor+https://example.org/debian'" apt update --no-download
-
-msgmsg 'Firmware packages without upgrades'
-echo 'deb http://example.org/debian bookworm main' > rootdir/etc/apt/sources.list.d/example.list
-insertinstalledpackage 'firmware-linux-nonfree' 'all' '1'
-testsuccessequal "$BOILERPLATE
-N: Repository 'Debian bookworm' changed its 'firmware component' value from 'non-free' to 'non-free-firmware'
-N: More information about this can be found online in the Release notes at: $NOTESURL" apt update --no-download
-
diff --git a/test/interactive-helper/teestream.h b/test/interactive-helper/teestream.h
index 058717ac3..511c6da60 100644
--- a/test/interactive-helper/teestream.h
+++ b/test/interactive-helper/teestream.h
@@ -19,13 +19,13 @@ public:
 	 std::basic_streambuf<CharT, Traits> * const sb2)
       : s1(sb1), s2(sb2) {}
 protected:
-   virtual std::streamsize xsputn(const CharT* s, std::streamsize c) APT_OVERRIDE
+   virtual std::streamsize xsputn(const CharT* s, std::streamsize c) override
    {
       return s2->sputn(s, s1->sputn(s, c));
    }
    // overflow is the fallback of sputc which is non-virtual
    typedef typename Traits::int_type int_type;
-   virtual int_type overflow(int_type ch = Traits::eof()) APT_OVERRIDE
+   int_type overflow(int_type ch = Traits::eof()) override
    {
       auto const eof = Traits::eof();
       if (Traits::eq_int_type(ch, Traits::eof()) == true)
@@ -35,12 +35,12 @@ protected:
       auto const r2 = s2->sputc(Traits::to_char_type(ch));
       return Traits::eq_int_type(r1, eof) ? r1: r2;
    }
-   virtual void imbue(const std::locale& loc) APT_OVERRIDE
+   void imbue(const std::locale& loc) override
    {
       s1->pubimbue(loc);
       s2->pubimbue(loc);
    }
-   virtual int sync() APT_OVERRIDE
+   int sync() override
    {
       auto const r1 = s1->pubsync();
       auto const r2 = s2->pubsync();
diff --git a/test/interactive-helper/testdeb.cc b/test/interactive-helper/testdeb.cc
index 0bb24a52a..20376181b 100644
--- a/test/interactive-helper/testdeb.cc
+++ b/test/interactive-helper/testdeb.cc
@@ -13,7 +13,7 @@
 class NullStream : public pkgDirStream
 {
    public:
-   virtual bool DoItem(Item &/*Itm*/, int &/*Fd*/) APT_OVERRIDE {return true;};
+   bool DoItem(Item &/*Itm*/, int &/*Fd*/) override {return true;};
 };
 
 static bool Test(const char *File)
diff --git a/test/libapt/acqprogress_test.cc b/test/libapt/acqprogress_test.cc
index 17a04161e..16b17c3a4 100644
--- a/test/libapt/acqprogress_test.cc
+++ b/test/libapt/acqprogress_test.cc
@@ -13,8 +13,8 @@ class TestItem: public pkgAcquire::Item
 public:
    explicit TestItem(pkgAcquire * const Acq) : pkgAcquire::Item(Acq) {}
 
-   virtual std::string DescURI() const APT_OVERRIDE { return ""; }
-   virtual HashStringList GetExpectedHashes() const APT_OVERRIDE { return HashStringList(); }
+   [[nodiscard]] std::string DescURI() const override { return ""; }
+   [[nodiscard]] HashStringList GetExpectedHashes() const override { return {}; }
 
 };
 
diff --git a/test/libapt/extracttar_test.cc b/test/libapt/extracttar_test.cc
index b01846c10..bf3a3e3bd 100644
--- a/test/libapt/extracttar_test.cc
+++ b/test/libapt/extracttar_test.cc
@@ -14,9 +14,9 @@ class Stream : public pkgDirStream
    public:
     int count;
     Stream () { count = 0; }
-    bool DoItem(Item &Itm,int &Fd) APT_OVERRIDE { (void)Itm; (void)Fd; count++; return true; }
-    bool Fail(Item &Itm,int Fd) APT_OVERRIDE { (void)Itm; (void)Fd; return true; }
-    bool FinishedFile(Item &Itm,int Fd) APT_OVERRIDE { (void)Itm; (void)Fd; return true; }
+    bool DoItem(Item &Itm,int &Fd) override { (void)Itm; (void)Fd; count++; return true; }
+    bool Fail(Item &Itm,int Fd) override { (void)Itm; (void)Fd; return true; }
+    bool FinishedFile(Item &Itm,int Fd) override { (void)Itm; (void)Fd; return true; }
     ~Stream() {}
 };
 
diff --git a/test/libapt/indexcopytosourcelist_test.cc b/test/libapt/indexcopytosourcelist_test.cc
index a1fed06fa..f112ae937 100644
--- a/test/libapt/indexcopytosourcelist_test.cc
+++ b/test/libapt/indexcopytosourcelist_test.cc
@@ -15,10 +15,10 @@ class NoCopy : private IndexCopy {
 	 IndexCopy::ConvertToSourceList(CD, Path);
 	 return Path;
       }
-      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) APT_OVERRIDE { return false; }
-      bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) APT_OVERRIDE { return false; }
-      const char *GetFileName() APT_OVERRIDE { return NULL; }
-      const char *Type() APT_OVERRIDE { return NULL; }
+      bool GetFile(std::string &/*Filename*/, unsigned long long &/*Size*/) override { return false; }
+      bool RewriteEntry(FileFd & /*Target*/, std::string const &/*File*/) override { return false; }
+      const char *GetFileName() override { return nullptr; }
+      const char *Type() override { return nullptr; }
 
 };
 
diff --git a/vendor/README b/vendor/README
index 6846c8455..3b344d5ad 100644
--- a/vendor/README
+++ b/vendor/README
@@ -2,10 +2,10 @@ The vendor system in APT is an experiment to help distributions ship a stock
 apt release instead of applying documentation patches to it, increasing
 maintenance burden for everyone and hiding 'interesting' patches in the mix.
 
-The provided information is used in the apt-key script and in documentation
-like manpages and example configuration files. If you have patches modifying
-additional bits and pieces currently not covered by this system please
-contact us so we can change this!
+The provided information is used in documentation like man pages and
+example configuration files. If you have patches modifying additional
+bits and pieces currently not covered by this system please contact us
+so we can change this!
 
 
 == Adding a new vendor
@@ -39,8 +39,7 @@ by opening a bug in the Debian BTS against apt with a patch attached.
 The format used is the one DocBook XML uses. The file is included as an
 entity file in the manpages xml source, so the syntax has to be valid!
 
-The keyring-* settings are additionally used also in the creation of the
-apt-key script and the keyring-package in particular as a dependency for apt.
+The keyring-package setting is used as a dependency for apt.
 
 The field current-codename is optional and can be used in sources.list.in.
 
diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent
index ea7625f90..a2d0d640b 100644
--- a/vendor/blankon/apt-vendor.ent
+++ b/vendor/blankon/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "BlankOn">
 <!ENTITY keyring-package "<package>blankon-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/blankon-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/blankon-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/blankon-master-keyring.gpg">
-<!ENTITY keyring-uri "http://arsip.blankonlinux.or.id/blankon/project/blankon-archive-keyring.gpg">
 <!ENTITY current-codename "tambora">
 
 <!ENTITY sourceslist-list-format "deb http://arsip.blankonlinux.or.id/blankon &current-codename; main restricted
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index 4d02343b2..864f5a8df 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Debian">
 <!ENTITY keyring-package "<package>debian-archive-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free non-free-firmware
 deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free non-free-firmware
diff --git a/vendor/getinfo b/vendor/getinfo
index 2ef257c90..0a2dcf333 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -64,7 +64,7 @@ case "$1" in
 debian-stable-codename|debian-oldstable-codename|debian-testing-codename|ubuntu-codename)
 	getrawfield "$1" "$VERBATIM"
 	;;
-sourceslist-list-format|keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
+sourceslist-list-format|keyring-package|current-codename)
 	exec $0 --vendor $CURRENT_VENDOR 'vendor' "$@"
 	;;
 vendor)
diff --git a/vendor/procursus/apt-vendor.ent b/vendor/procursus/apt-vendor.ent
index 0dd1d7a95..32d9fefee 100644
--- a/vendor/procursus/apt-vendor.ent
+++ b/vendor/procursus/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Procursus">
 <!ENTITY keyring-package "<package>procursus-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "big_sur">
 
 <!ENTITY sourceslist-list-format "deb https://apt.procurs.us/ &current-codename; main">
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
index 96d9fb71b..e3b960381 100644
--- a/vendor/raspbian/apt-vendor.ent
+++ b/vendor/raspbian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Raspbian">
 <!ENTITY keyring-package "<package>raspbian-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free">
 <!ENTITY sourceslist-sources-format "Types: deb
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
index 7cf100fc4..2752999f9 100644
--- a/vendor/steamos/apt-vendor.ent
+++ b/vendor/steamos/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "SteamOS">
 <!ENTITY keyring-package "<package>valve-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "alchemist">
 
 <!ENTITY sourceslist-list-format "deb http://repo.steampowered.com/steamos &current-codename; main contrib non-free
diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent
index dcebc9209..9cf7b55fb 100644
--- a/vendor/ubuntu/apt-vendor.ent
+++ b/vendor/ubuntu/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Ubuntu">
 <!ENTITY keyring-package "<package>ubuntu-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/ubuntu-master-keyring.gpg">
-<!ENTITY keyring-uri "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg">
 
 <!ENTITY sourceslist-list-format "deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
 deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted