From fe27982ac6e0bec91c9a9762b689018e50e47238 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Mon, 25 May 2015 16:05:46 -0400
Subject: Merge branch 'feature/block-device-mounting' into feature/installer-integration

Conflicts:
	locale/en_US.sh
---
(limited to 'locale')

diff --git a/locale/en_US.sh b/locale/en_US.sh
index 441e32a..8731c3d 100644
--- a/locale/en_US.sh
+++ b/locale/en_US.sh
@@ -80,21 +80,21 @@ There is NO WARRANTY, to the extent permitted by law.'
 # lib/cmd/install.sh
 msg_prokit_cmd_install_summary='install a system into a directory'
 msg_prokit_cmd_install_usage='[-a <arch>] [-p <plat>] [-m <mirror>] [-F] '\
-'<suite> <root-dir>'
+'<suite> <root>'
 
 # lib/cmd/shell.sh
 msg_prokit_cmd_shell_summary='run a shell in an isolated environment'
-msg_prokit_cmd_shell_usage='<root-dir> [<command> [<argument> ...]]'
+msg_prokit_cmd_shell_usage='<root> [<command> [<argument> ...]]'
 msg_prokit_cmd_shell_exiting='Exiting...'
 
 # lib/cmd/opkg.sh
 msg_prokit_cmd_opkg_summary='manage packages with opkg'
-msg_prokit_cmd_opkg_usage='<root-dir> [<option> ...] <sub-command> '\
+msg_prokit_cmd_opkg_usage='<root> [<option> ...] <sub-command> '\
 '[<argument> ...]'
 
 # lib/cmd/build.sh
 msg_prokit_cmd_build_summary='build a package'
-msg_prokit_cmd_build_usage='<root-dir> [<option> ...] <pkg-dir>'
+msg_prokit_cmd_build_usage='<root> [<option> ...] <pkg-dir>'
 msg_prokit_cmd_build_not_a_dir='Not a directory: %s'
 
 # lib/cmd/installer-pc.sh
--
cgit v0.9.1