From e787b1fe1487300d51ec7be69d3f98957c137453 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Fri, 27 May 2016 19:55:47 +0000
Subject: Update to dbus-1.10.8. Update to e2fsprogs-1.43. Update to gdbm-1.12.
 Update to iproute2-4.6.0. Update to make-4.2. Update to systemd-230.

Add additional explanatory text for sytemctl and journalctl commands.
[chapter07/systemd-custom.xml]



git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/merge@11078 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 general.ent | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'general.ent')

diff --git a/general.ent b/general.ent
index 2a0eb55f7..d4fca24f9 100644
--- a/general.ent
+++ b/general.ent
@@ -1,9 +1,9 @@
-<!ENTITY version         "SVN-20160516-merge">
+<!ENTITY version         "SVN-20160527-merge">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20160407-systemd-merge">
+<!ENTITY versiond        "20160527-systemd-merge">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
@@ -22,6 +22,7 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
+<!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
 <!ENTITY min-kernel      "2.6.32">
 
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
-- 
cgit v1.2.3-54-g00ecf