summaryrefslogtreecommitdiff
path: root/apt-pkg
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2008-10-07 20:41:41 +0200
committerMichael Vogt <mvo@debian.org>2008-10-07 20:41:41 +0200
commit5b42c812e5f689206f5e3ad4196f17c97ca34415 (patch)
tree8749ca58cad17257ec4a02c3050edbb3738f98f7 /apt-pkg
parent2ee50e0af732ddd94222ca7cbb120341651b02f0 (diff)
parent84f711aae1b79d149677791617db633b764e7f66 (diff)
* doc/apt-cache.8.xml:
- search command uses POSIX regex, and searches for virtual packages too (closes: #277536) * doc/offline.sgml: clarify remote and target hosts (thanks to Nikolaus Schulz, closes: #175940) * Fix several typos in docs, translations and debian/changelog (thanks to timeless, Nicolas Bonifas and Josh Triplett, closes: #368665, #298821, #411532, #431636, #461458) * Document apt-key finger and adv commands (thanks to Stefan Schmidt, closes: #350575) * Better documentation for apt-get --option (thanks to Tomas Pospisek, closes: #386579) * Retitle the apt-mark.8 manpage (thanks to Justin Pryzby, closes: #471276) * Better documentation on using both APT::Default-Release and /etc/apt/preferences (thanks to Ingo Saitz, closes: #145575) * fix FTBFS by changing build-depends to * ABI library name change because it's built against * Package that contains all the new features * Branch that contains all the new features:
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/algorithms.cc2
-rw-r--r--apt-pkg/contrib/cmndline.cc2
-rw-r--r--apt-pkg/contrib/cmndline.h2
-rw-r--r--apt-pkg/contrib/strutl.cc6
-rw-r--r--apt-pkg/orderlist.cc2
5 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc
index 59f994cd7..2e2a976bb 100644
--- a/apt-pkg/algorithms.cc
+++ b/apt-pkg/algorithms.cc
@@ -497,7 +497,7 @@ void pkgProblemResolver::MakeScores()
signed short &Score = Scores[I->ID];
- /* This is arbitary, it should be high enough to elevate an
+ /* This is arbitrary, it should be high enough to elevate an
essantial package above most other packages but low enough
to allow an obsolete essential packages to be removed by
a conflicts on a powerfull normal package (ie libc6) */
diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 54c91d67d..bfd53695e 100644
--- 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);
- // Arbitary item specification
+ // Arbitrary item specification
if ((A->Flags & ArbItem) == ArbItem)
{
const char *J;
diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index fad6d1da9..e28071e81 100644
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -34,7 +34,7 @@
ConfigFile - Means this flag should be interprited as the name of
a config file to read in at this point in option processing.
Implies HasArg.
- ArbItem - Means the item is an arbitary configuration string of
+ ArbItem - Means the item is an arbitrary configuration string of
the form item=value, where item is passed directly
to the configuration class.
The default, if the flags are 0 is to use Boolean
diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc
index eacc7077a..bd374fd1e 100644
--- a/apt-pkg/contrib/strutl.cc
+++ b/apt-pkg/contrib/strutl.cc
@@ -459,9 +459,9 @@ string Base64Encode(const string &S)
return Final;
}
/*}}}*/
-// stringcmp - Arbitary string compare /*{{{*/
+// stringcmp - Arbitrary string compare /*{{{*/
// ---------------------------------------------------------------------
-/* This safely compares two non-null terminated strings of arbitary
+/* This safely compares two non-null terminated strings of arbitrary
length */
int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd)
{
@@ -517,7 +517,7 @@ int stringcmp(string::const_iterator A,string::const_iterator AEnd,
}
#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)
diff --git a/apt-pkg/orderlist.cc b/apt-pkg/orderlist.cc
index 616714e29..ca18f1d75 100644
--- a/apt-pkg/orderlist.cc
+++ b/apt-pkg/orderlist.cc
@@ -39,7 +39,7 @@
ordering.
Each of the features can be enabled in the sorting routine at an
- arbitary priority to give quite abit of control over the final unpacking
+ arbitrary priority to give quite abit of control over the final unpacking
order.
The rules listed above may never be violated and are called Critical.