Merge remote-tracking branch 'shared/master' into feature/8-make_dist-upgrade_timeout_configurable

README.md

@@ -23,12 +23,13 @@
   * [apt::preseeded_package](#apt-preseeded_package)
   * [apt::sources_list](#apt-sources_list)
   * [apt::key](#apt-key)
-  * [apt::key::plain](#apt-key-plain)
+  * [`apt::key::plain`](#apt-key-plain)
   * [apt::upgrade_package](#apt-upgrade_package)
 * [Resources](#ressources)
   * [File\['apt_config'\]](#fileapt_config)
   * [Exec\['apt_updated'\]](#execapt_updated)
 * [Tests](#tests)
+  * [Acceptance Tests](#acceptance-tests)
 * [Licensing](#licensing)
 
 
@@ -83,8 +84,7 @@ Ubuntu support is lagging behind but not absent either.
    you will need to remove the variables, and the include and instead do
    the following:
 
-    class {
-      'apt':
+    class { 'apt':
       debian_url       => 'http://localhost:9999/debian/',
       use_next_release => true;
     }
@@ -98,8 +98,7 @@ Ubuntu support is lagging behind but not absent either.
    you to trigger upgrades:
 
     include apt::dist_upgrade
-    class {
-      'apt':
+    class { 'apt':
       codename => 'wheezy',
       notify   => Exec['apt_dist-upgrade'];
     }
@@ -116,8 +115,7 @@ Ubuntu support is lagging behind but not absent either.
    you will need to remove the variables, and the include and instead do the
    following:
 
-    class {
-    'apt::apticron':
+    class { 'apt::apticron':
       email     => 'foo@example.com',
       notifynew => '1';
     }
@@ -134,8 +132,7 @@ Ubuntu support is lagging behind but not absent either.
    you will need to remove the variables, and the include and instead do the
    following:
  
-    class {
-      'apt::listchanges':
+    class { 'apt::listchanges':
       email => 'foo@example.com';
     }
    
@@ -151,8 +148,7 @@ Ubuntu support is lagging behind but not absent either.
    you will need to remove the variables, and the include and instead do the
    following:
 
-    class {
-      'apt::proxy_client':
+       class { 'apt::proxy_client':
          proxy => 'http://proxy.domain',
          port  => '666';
        }
@@ -567,7 +563,7 @@ use `apt::key::plain`.
 The `.gpg` extension is compulsory for `apt` to pickup the key properly.
 
 
-## apt::key::plain<a name="apt-key-plain"></a>
+## `apt::key::plain`<a name="apt-key-plain"></a>
 
 Deploys a secure apt OpenPGP key. This usually accompanies the
 sources.list snippets above for third party repositories. For example,