* apt-ftparchive might write corrupt Release files (LP: #46439)

* Apply --important option to apt-cache depends (LP: #16947) 
* apt-pkg/acquire-item.cc:
  - Added fallback to uncompressed 'Packages' if neither 'bz2' nor 'gz'
    available. (Closes: #409284)
* apt-pkg/algorithm.cc:
  - Strip username and password from source URL in error message.
    (Closes: #425150)
* Fix typos:
  - apt-pkg/depcache.cc
* Fix compilation warnings:
  - apt-pkg/acquire.cc
  - apt-pkg/versionmatch.cc
* Compilation fixes and portability improvement for compiling APT against non-GNU libc
  (thanks to Martin Koeppe, closes: #392063):
  - buildlib/apti18n.h.in:
    + textdomain() and bindtextdomain() must not be visible when --disable-nls
  - buildlib/inttypes.h.in: undefine standard int*_t types
  - Append INTLLIBS to SLIBS:
    + cmdline/makefile
    + ftparchive/makefile
    + methods/makefile
* doc/apt.conf.5.xml:
  - clarify whether configuration items of apt.conf are case-sensitive
    (thanks to Vincent McIntyre, closes: #345901)
* 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)

* doc/apt-cache.8.xml:
  - add missing citerefentry
* Upload to unstable
* apt-pkg/deb/dpkgpm.cc:
  - Store the trigger state descriptions in a way that does not break
    the ABI.  The approach taken makes the search for a string O(n) rather
    than O(lg(n)), but since n == 4, I do not consider this a major
    concern.  If it becomes a concern, we can sort the static array and
    use std::equal_range().  (Closes: #499322)
* apt-pkg/pkgcachegen.cc:
  - do not add multiple identical descriptions for the same 
    language (closes: #400768)
* Catalan updated. Closes: #499462
* Fix typo in cron.daily script. Closes: #486179
* Traditional Chinese updated. Closes: #488526
* German corrected and completed. Closes: #490532, #480002, #498018
* French completed
* Bulgarian updated. Closes: #492473
* Slovak updated. Closes: #492475
* Galician updated. Closes: #492794
* Japanese updated. Closes: #492975
* Fix missing space in Greek translation. Closes: #493922
* Greek updated.
* Brazilian Portuguese updated.
* Basque updated. Closes: #496754
* Romanian updated. Closes: #492773, #488361
* Portuguese updated. Closes: #491790
* Simplified Chinese updated. Closes: #489344
* Norwegian Bokmål updated. Closes: #480022
* Czech updated. Closes: #479628, #497277
* Korean updated. Closes: #464515
* Spanish updated. Closes: #457706
* Lithuanian added. Closes: #493328
* Swedish updated. Closes: #497496
* Vietnamese updated. Closes: #497893
* Portuguese updated. Closes: #498411
* Greek updated. Closes: #498687
* Polish updated.
* merge patch that enforces stricter https server certificate
  checking (thanks to Arnaud Ebalard, closes: #485960)
* allow per-mirror specific https settings
  (thanks to Arnaud Ebalard, closes: #485965)
* add doc/examples/apt-https-method-example.cof
  (thanks to Arnaud Ebalard, closes: #485964)
* apt-pkg/depcache.cc:
  - when checking for new important deps, skip critical ones
    (closes: #485943)
* improve apt progress reporting, display trigger actions
* add DPkg::NoTriggers option so that applications that call
  apt/aptitude (like the installer) defer trigger processing
  (thanks to Joey Hess)
* doc/makefile:
  - add examples/apt-https-method-example.conf

* Russian updated. Closes: #479777, #499029
* 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:

1 files changed, 6 insertions, 6 deletions

diff --git a/COMPILING b/COMPILING
index fadbe171b..5ea5e52d1 100644
--- a/COMPILING
+++ b/COMPILING
@@ -9,14 +9,14 @@ To compile this you need a couple things
     g++ 2.8 works OK and newer egcs work well also. Nobody has tried it
     on other compilers :< You will need a properly working STL as well.
   - A C library with the usual POSIX functions and a BSD socket layer. 
-    If you OS conforms to the Single Unix Spec then you are fine:
+    If your OS conforms to the Single Unix Spec then you are fine:
       http://www.opengroup.org/onlinepubs/7908799/index.html      
   - Refer to the Build-Depends information in debian/control for
     additional requirements (some of which are Debian-specific)
 
 ** NOTICE **
 The C++ global constructors do not link correctly when using non-shared
-libaries. This is probably the correct behavior of the linker, but I have
+libraries. This is probably the correct behavior of the linker, but I have
 not yet had time to devise a work around for it. The correct thing to 
 do is add a reference to debSystem in apt-pkg/init.cc, 
 assert(&debSystem == 0) would be fine for instance.
@@ -29,7 +29,7 @@ I don't really care if your not-SUS OS doesn't work. It is simply too
 much work to maintain patches for dysfunctional OSs. I highly suggest you
 contact your vendor and express intrest in a conforming C library.
 
-That said, there are lots of finniky problems that must be delt with even
+That said, there are lots of finicky problems that must be dealt with even
 between the supported OS's. Primarily the path I choose to take is to put
 a shim header file in build/include that transparently adds the required 
 functionality. Patches to make autoconf detect these cases and generate the 
@@ -39,12 +39,12 @@ Current shims:
   * C99 integer types 'inttypes.h' 
   * sys/statvfs.h to convert from BSD/old-glibc statfs to SUS statvfs
   * rfc2553 hostname resolution (methods/rfc*), shims to normal gethostbyname.
-    The more adventerous could steal the KAME IPv6 enabled resolvers for those
+    The more adventurous could steal the KAME IPv6 enabled resolvers for those
     OS's with IPv6 support but no rfc2553 (why?)
   * define _XOPEN_EXTENDED_SOURCE to bring in h_errno on HP-UX
   * socklen_t shim in netdb.h if the OS does not have socklen_t
   
-The only completely non-shimed OS is Linux with glibc2.1, glibc2.0 requires
+The only completely non-shimmed OS is Linux with glibc2.1, glibc2.0 requires
 the first three shims.
 
 Platform Notes
@@ -77,7 +77,7 @@ OpenBSD
 HP-UX
   HP-UX nyquist B.10.20 C 9000/780 2016574337 32-user license
   - Evil OS, does not conform very well to SUS
-     1) snprintf exists but is not prototyped, ignore spurios warnings
+     1) snprintf exists but is not prototyped, ignore spurious warnings
      2) No socklen_t
      3) Requires -D_XOPEN_SOURCE_EXTENDED for h_errno
     configure should fix the last two (see above)