MFC r258355,258360,258400-258401,258406-258407,258418,258430,258439,258589-

258590,258592,258727-258728,258785, with the following descriptions:

Revisions 258400-258401,258406-258407,258590,258727-258728,258785:
+ Add a new `includes' module (see: bsdconfig includes -h) for exploring
  the bsdconfig(8) API

Remaining revisions:
258592: Sort all the messages.subr files
258355: Fix typo in a comment in networking/device.subr
258360: Whitespace, style, and other changes in networking/device.subr
258418: Quote interface names for good measure in networking/device.subr
258430: Remove an unused line in networking/device.subr
258439: Minor bugfix to f_die() function in common.subr
258589: Minor bugfix to syscons_ttys module

1 files changed, 5 insertions, 5 deletions

diff --git a/usr.sbin/bsdconfig/usermgmt/include/messages.subr b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
index 71cc51d..e139f32 100644
--- a/usr.sbin/bsdconfig/usermgmt/include/messages.subr
+++ b/usr.sbin/bsdconfig/usermgmt/include/messages.subr
@@ -32,9 +32,9 @@ hline_arrows_space_tab_enter="Use arrows, SPACE, TAB or ENTER"
 hline_arrows_tab_enter="Press arrows, TAB or ENTER"
 hline_num_arrows_tab_enter="Use numbers, arrows, TAB or ENTER"
 hline_num_tab_enter="Use numbers, TAB or ENTER"
+msg_account_does_not_expire="Account does not expire"
 msg_account_expires_in_how_many_days="Account expires in how many days?"
 msg_account_expires_on="Account Expires on"
-msg_account_does_not_expire="Account does not expire"
 msg_add="Add"
 msg_add_group="Add Group"
 msg_add_login="Add Login"
@@ -65,9 +65,9 @@ msg_group="Group"
 msg_group_added="Group Added"
 msg_group_already_used="%s: Group is already used."
 msg_group_deleted="Group Deleted"
-msg_group_is_empty="Group is empty."
 msg_group_id="Group ID"
 msg_group_id_leave_empty_for_default="Group ID (Leave empty for default)"
+msg_group_is_empty="Group is empty."
 msg_group_members="Group Members"
 msg_group_must_start_with_letter="Group must start with a letter."
 msg_group_not_found="%s: Group not found."
@@ -89,21 +89,21 @@ msg_login_not_found="Login not found."
 msg_login_updated="Login Updated"
 msg_member_of_groups="Member of Groups"
 msg_n_a="N/A"
-msg_number_of_seconds_since_epoch="Number of seconds since the Epoch\n(1 = %s)\nNULL or zero to disable:"
 msg_no="No"
+msg_number_of_seconds_since_epoch="Number of seconds since the Epoch\n(1 = %s)\nNULL or zero to disable:"
 msg_ok="OK"
 msg_password="Password"
+msg_password_does_not_expire="Password does not expire"
 msg_password_expires_in_how_many_days="Password expires in how many days?"
 msg_password_expires_on="Password Expires on"
 msg_passwords_do_not_match="Passwords do not match."
-msg_password_does_not_expire="Password does not expire"
 msg_reenter_group_password="Re-enter Group Password"
 msg_reenter_password="Re-enter Password"
 msg_save="Save"
 msg_save_exit_or_cancel="Choose Save/Exit when finished or Cancel."
-msg_separated_by_commas="Separated by commas"
 msg_select_group_members_from_list="Select Group Members from a list"
 msg_select_login_shell="Select Login Shell"
+msg_separated_by_commas="Separated by commas"
 msg_shell="Shell"
 msg_unknown_user_management_menu_selection="Unknown user management menu selection"
 msg_use_default_values_for_all_account_details="Use default values for all account details?"