[SCM] live-manual branch, debian-next, updated. debian/3.0_a17-1-12-gb033cab

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit b033cab1261e96f8ce95110adeab9b3d1d9e64c8
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Sep 29 15:13:43 2012 +0200

    Using the more common 'EOF' consistently as terminater when using cat in examples, rather than custom 'END'.

diff --git a/manual/en/user_customization-packages.ssi b/manual/en/user_customization-packages.ssi
index 85f949f..8e360c9 100644
--- a/manual/en/user_customization-packages.ssi
+++ b/manual/en/user_customization-packages.ssi
@@ -353,7 +353,7 @@ Let's say you are building a wheezy live system but need all the live packages t
 code{
 
  $ echo "deb http://mirror/debian/ sid main" > config/archives/sid.list.chroot
- $ cat >> config/chroot_apt/preferences << END
+ $ cat >> config/chroot_apt/preferences << EOF
  Package: live-*
  Pin: release n=sid
  Pin-Priority: 600
@@ -361,7 +361,7 @@ code{
  Package: *
  Pin: release n=sid
  Pin-Priority: 1
- END
+ EOF
 
 }code
 
diff --git a/manual/en/user_examples.ssi b/manual/en/user_examples.ssi
index 8348480..963fbc2 100644
--- a/manual/en/user_examples.ssi
+++ b/manual/en/user_examples.ssi
@@ -216,14 +216,14 @@ After that, create the directory #{/etc/skel}# in #{config/includes.chroot}# and
 code{
 
  $ mkdir -p config/includes.chroot/etc/skel
- $ cat > config/includes.chroot/etc/skel/.xsession << END
+ $ cat > config/includes.chroot/etc/skel/.xsession << EOF
  #!/bin/sh
 
  /usr/bin/metacity &
  /usr/bin/xvncviewer 192.168.1.2:1
 
  exit
- END
+ EOF
 
 }code
 

-- 
live-manual