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/edsp.h | |
| parent | 2c678b0a026ac9d44c8ade07aa8bf318faf5a9e2 (diff) | |
| parent | b7ed961b8099c05f65e18d4c73ead50cc5c8bff1 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'apt-pkg/edsp.h')
| -rw-r--r-- | apt-pkg/edsp.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/edsp.h b/apt-pkg/edsp.h index 12b06d143..fd4436f60 100644 --- a/apt-pkg/edsp.h +++ b/apt-pkg/edsp.h @@ -2,7 +2,7 @@ /** Description \file edsp.h {{{ ###################################################################### Set of methods to help writing and reading everything needed for EDSP - with the noteable exception of reading a scenario for conversion into + with the notable exception of reading a scenario for conversion into a Cache as this is handled by edsp interface for listparser and friends ##################################################################### */ /*}}}*/ @@ -182,13 +182,13 @@ public: * they were unable to calculate a solution for a given task. * Obviously they can't send a solution through, so this * methods deals with formatting an error message correctly - * so that the front-ends can recieve and display it. + * so that the front-ends can receive and display it. * * The first line of the message should be a short description * of the error so it can be used for dialog titles or alike * * \param uuid of this error message - * \param message is free form text to discribe the error + * \param message is free form text to describe the error * \param output the front-end listens for error messages */ bool static WriteError(char const * const uuid, std::string const &message, FILE* output); |