From 78747eda6253c630a0e1b6911d2f0f05bb163e11 Mon Sep 17 00:00:00 2001
From: Damon Kohler <damonkohler@google.com>
Date: Fri, 9 Dec 2016 13:08:43 +0100
Subject: [PATCH] Fix documentation and Docker cache. (#157)

---
 .travis.yml                  | 7 ++-----
 cartographer-config.cmake.in | 2 +-
 docs/source/index.rst        | 4 ++--
 scripts/save_docker_cache.sh | 2 +-
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d49a897..3c42c88 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,11 +22,8 @@ cache:
     - /home/travis/docker/
 
 env:
-  global:
-    - DOCKER_CACHE_FILE=/home/travis/docker/cache.tar.gz
-  matrix:
-    - UBUNTU_RELEASE=trusty
-    - UBUNTU_RELEASE=xenial
+  - UBUNTU_RELEASE=trusty DOCKER_CACHE_FILE=/home/travis/docker/trusty-cache.tar.gz
+  - UBUNTU_RELEASE=xenial DOCKER_CACHE_FILE=/home/travis/docker/xenial-cache.tar.gz
 
 before_install: scripts/load_docker_cache.sh
 
diff --git a/cartographer-config.cmake.in b/cartographer-config.cmake.in
index 59f7dea..492a6bc 100644
--- a/cartographer-config.cmake.in
+++ b/cartographer-config.cmake.in
@@ -15,7 +15,7 @@
 #  Usage from an external project:
 #    In your CMakeLists.txt, add these lines:
 #
-#    find_package(Cartographer REQUIRED )
+#    find_package(cartographer REQUIRED )
 #    include_directories(${CARTOGRAPHER_INCLUDE_DIRS})
 #    target_link_libraries(MY_TARGET_NAME ${CARTOGRAPHER_LIBRARIES})
 #
diff --git a/docs/source/index.rst b/docs/source/index.rst
index cfc4539..a25917b 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -76,8 +76,8 @@ on systems that meet the following requirements:
 
 * 64-bit, modern CPU (e.g. 3rd generation i7)
 * 16 GB RAM
-* Ubuntu 14.04 (Trusty)
-* gcc version 4.8.4
+* Ubuntu 14.04 (Trusty) and 16.04 (Xenial)
+* gcc version 4.8.4 and 5.4.0
 
 Known Issues
 ------------
diff --git a/scripts/save_docker_cache.sh b/scripts/save_docker_cache.sh
index 2b1cb72..dfc5343 100755
--- a/scripts/save_docker_cache.sh
+++ b/scripts/save_docker_cache.sh
@@ -24,6 +24,6 @@ set -o pipefail
 if [[ ${TRAVIS_BRANCH} == "master" ]] &&
     [[ ${TRAVIS_PULL_REQUEST} == "false" ]]; then
   mkdir -p $(dirname ${DOCKER_CACHE_FILE});
-  docker save $(docker history -q cartographer |
+  docker save $(docker history -q cartographer:${UBUNTU_RELEASE} |
       grep -v '<missing>') | gzip > ${DOCKER_CACHE_FILE};
 fi