Hi James, thanks for getting started on submitting this. Unfortunately this is a massive merge with a large number of distinct changes. These need to be submitted individually and separately. What's more, I suspect that you don't mean to submit some of these changes as they are Ubuntu-specific. I did a quick pass through the merge output and noted at least: - changes to bash completion - indentation fixes (dbus/upstart.h) - massive manpage updates - supports d-bus session bus connection rather than system - disabling/changing of startup of event - alternative config dir - init-checkconf - initctl2dot - addition of socket bridge - addition of events-with-fds to upstart - addition of udev bridge - chroot session support - user session support - override file support - addition of "emits" tags to config files There are also basic problems with this merge: Text conflict in ChangeLog Text conflict in NEWS Text conflict in configure.ac Text conflict in init/conf.c Text conflict in init/main.c Text conflict in po/upstart.pot The individual submission branches should be cleaned up against trunk first Scott On Thu, Apr 14, 2011 at 7:47 AM, James Hunt