* Translations:

  - French corrected (remove awful use of first person) 
  - Finnish updated. Closes: #508449 
* doc/examples/sources.list:
  - Removed obsolete commented non-us deb-src entry, replaced it with
    'deb-src security.debian.org' one. (Closes: #411298)
* apt-pkg/contrib/mmap.cc:
  - Added instruction how to work around MMap error in MMap error message.
    (Closes: #385674, 436028)
* buildlib/config.{sub,guess}:
  - Renewed. This fixes lintian errors.
* doc/apt.conf.5.xml, debian/apt-transport-https:
  - Documented briefly 'APT::https' group of options. (Closes: #507398)
  - Applied patch from Daniel Burrows to document 'Debug' group of options.
    (Closes: #457265)
  - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
    (Closes: #438559)
  - Mentioned '/* ... */' comments. (Closes: #507601)
* merged "install-recommends" branch (ABI break): 
  - new "--install-recommends"
  - install new recommends on "upgrade" if --install-recommends is 
    given
  - new "--fix-policy" option to install all packages with unmet
    important dependencies (usefull with --install-recommends to
    see what not-installed recommends are on the system)
  - fix of recommended packages display (only show CandidateVersion
    fix or-group handling)
* merged "install-task" branch (use with "apt-get install taskname^")

1 files changed, 4 insertions, 2 deletions

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index eed438250..04a45811b 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -210,7 +210,8 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    // Just in case error check
    if (Result + Size > WorkSpace)
    {
-      _error->Error(_("Dynamic MMap ran out of room"));
+	  _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+				  "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
       return 0;
    }
 
@@ -272,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
    // Just in case error check
    if (Result + Len > WorkSpace)
    {
-      _error->Error("Dynamic MMap ran out of room");
+	  _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+				  "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);
       return 0;
    }