Applying #298821 patch for further arbitary typos

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 54c91d67d919986cb0ca4514f0f9b58626fa1b93..bfd53695e38ab3b438807e6a9a65380441ab0389 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -189,7 +189,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 

-      // Arbitary item specification
+      // Arbitrary item specification

       if ((A->Flags & ArbItem) == ArbItem)
       {
         const char *J;
       if ((A->Flags & ArbItem) == ArbItem)
       {
         const char *J;

diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index 3a0abc5a819df32dd8cea85e3313d875ce11e1d4..bd374fd1e74ad47974c6949161d2af3a95827fcb 100644 (file)
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -459,7 +459,7 @@ string Base64Encode(const string &S)
    return Final;
 }
                                                                        /*}}}*/
    return Final;
 }
                                                                        /*}}}*/

-// stringcmp - Arbitary string compare                                 /*{{{*/
+// stringcmp - Arbitrary string compare                                        /*{{{*/

 // ---------------------------------------------------------------------
 /* This safely compares two non-null terminated strings of arbitrary 
    length */
 // ---------------------------------------------------------------------
 /* This safely compares two non-null terminated strings of arbitrary 
    length */


@@ -517,7 +517,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd,
 }
 #endif
                                                                        /*}}}*/
 }
 #endif
                                                                        /*}}}*/

-// stringcasecmp - Arbitary case insensitive string compare            /*{{{*/
+// stringcasecmp - Arbitrary case insensitive string compare           /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
 // ---------------------------------------------------------------------
 /* */
 int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd)

diff --git a/debian/changelog b/debian/changelog
index d8c2b571a8e81b5c1d30c48586a38d4ad1fe2bf5..d3c34a133a2ddd122bd8a1a74084c8e013452370 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ apt (0.7.15~exp4) UNRELEASED; urgency=low
 
   [Luca Bruno]
   * Fix some typos in docs and translations
 
   [Luca Bruno]
   * Fix some typos in docs and translations

-    (thanks to timeless, closes: #368665)
+    (thanks to timeless and Nicolas Bonifas, closes: #368665, #298821)

   * Document apt-key finger and adv commands
     (thanks to Stefan Schmidt, closes: #350575)
   * Better documentation on using both APT::Default-Release and
   * Document apt-key finger and adv commands
     (thanks to Stefan Schmidt, closes: #350575)
   * Better documentation on using both APT::Default-Release and