diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-23 00:45:56 +0100 |
commit | eccff323a093d91fff379e7c8460d7e5c8db8ad1 (patch) | |
tree | d539d21c6716af3122edabae91feadccfb3c12ad /apt-pkg/pkgsystem.h | |
parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/pkgsystem.h')
-rw-r--r-- | apt-pkg/pkgsystem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apt-pkg/pkgsystem.h b/apt-pkg/pkgsystem.h index 75f7b9fcc..eb75df412 100644 --- a/apt-pkg/pkgsystem.h +++ b/apt-pkg/pkgsystem.h @@ -7,7 +7,7 @@ Instances of this class can be thought of as factories or meta-classes for a variety of more specialized classes. Together this class and - it's speciallized offspring completely define the environment and how + it's specialized offspring completely define the environment and how to access resources for a specific system. There are several sub areas that are all orthogonal - each system has a unique combination of these sub areas: @@ -23,7 +23,7 @@ - Selection of local 'status' indexes that make up the pkgCache. It is important to note that the handling of index files is not a - function of the system. Index files are handled through a seperate + function of the system. Index files are handled through a separate abstraction - the only requirement is that the index files have the same idea of versioning as the target system. |