merge with trunk

2 files changed, 19 insertions, 21 deletions

diff --git a/templates/resolv.conf.tmpl b/templates/resolv.conf.tmpl
index 1300156c..bfae80db 100644
--- a/templates/resolv.conf.tmpl
+++ b/templates/resolv.conf.tmpl
@@ -24,7 +24,7 @@ sortlist {% for sort in sortlist %}{{sort}} {% endfor %}
 {% if options or flags %}
 
 options {% for flag in flags %}{{flag}} {% endfor %}
-{% for key, value in options.iteritems() -%}
+{% for key, value in options.items() -%}
  {{key}}:{{value}}
 {% endfor %}
 {% endif %}
diff --git a/templates/sources.list.ubuntu.tmpl b/templates/sources.list.ubuntu.tmpl
index 4b1b019a..d8799726 100644
--- a/templates/sources.list.ubuntu.tmpl
+++ b/templates/sources.list.ubuntu.tmpl
@@ -9,13 +9,13 @@
 
 # See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
 # newer versions of the distribution.
-deb {{mirror}} {{codename}} main
-deb-src {{mirror}} {{codename}} main
+deb {{mirror}} {{codename}} main restricted
+deb-src {{mirror}} {{codename}} main restricted
 
 ## Major bug fix updates produced after the final release of the
 ## distribution.
-deb {{mirror}} {{codename}}-updates main
-deb-src {{mirror}} {{codename}}-updates main
+deb {{mirror}} {{codename}}-updates main restricted
+deb-src {{mirror}} {{codename}}-updates main restricted
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
 ## team. Also, please note that software in universe WILL NOT receive any
@@ -26,24 +26,29 @@ deb {{mirror}} {{codename}}-updates universe
 deb-src {{mirror}} {{codename}}-updates universe
 
 ## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu 
-## team, and may not be under a free licence. Please satisfy yourself as to
+## team, and may not be under a free licence. Please satisfy yourself as to 
 ## your rights to use the software. Also, please note that software in 
 ## multiverse WILL NOT receive any review or updates from the Ubuntu
 ## security team.
-# deb {{mirror}} {{codename}} multiverse
-# deb-src {{mirror}} {{codename}} multiverse
-# deb {{mirror}} {{codename}}-updates multiverse
-# deb-src {{mirror}} {{codename}}-updates multiverse
+deb {{mirror}} {{codename}} multiverse
+deb-src {{mirror}} {{codename}} multiverse
+deb {{mirror}} {{codename}}-updates multiverse
+deb-src {{mirror}} {{codename}}-updates multiverse
 
-## Uncomment the following two lines to add software from the 'backports'
-## repository.
 ## N.B. software from this repository may not have been tested as
 ## extensively as that contained in the main release, although it includes
 ## newer versions of some applications which may provide useful features.
 ## Also, please note that software in backports WILL NOT receive any review
 ## or updates from the Ubuntu security team.
-# deb {{mirror}} {{codename}}-backports main restricted universe multiverse
-# deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
+deb {{mirror}} {{codename}}-backports main restricted universe multiverse
+deb-src {{mirror}} {{codename}}-backports main restricted universe multiverse
+
+deb {{security}} {{codename}}-security main restricted
+deb-src {{security}} {{codename}}-security main restricted
+deb {{security}} {{codename}}-security universe
+deb-src {{security}} {{codename}}-security universe
+deb {{security}} {{codename}}-security multiverse
+deb-src {{security}} {{codename}}-security multiverse
 
 ## Uncomment the following two lines to add software from Canonical's
 ## 'partner' repository.
@@ -51,10 +56,3 @@ deb-src {{mirror}} {{codename}}-updates universe
 ## respective vendors as a service to Ubuntu users.
 # deb http://archive.canonical.com/ubuntu {{codename}} partner
 # deb-src http://archive.canonical.com/ubuntu {{codename}} partner
-
-deb {{security}} {{codename}}-security main
-deb-src {{security}} {{codename}}-security main
-deb {{security}} {{codename}}-security universe
-deb-src {{security}} {{codename}}-security universe
-# deb {{security}} {{codename}}-security multiverse
-# deb-src {{security}} {{codename}}-security multiverse