diff options
| author | Renato Botelho <renato@netgate.com> | 2016-07-08 07:50:28 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-07-08 07:50:28 -0300 |
| commit | 000fe9b921f8e1b82e649477bf28c2cfbaa0ff7c (patch) | |
| tree | 28124ae41696d55b3df7dad466a3e886975de6bf /etc | |
| parent | a0d0b7f06642edf2fb72f7cafc54723c47875400 (diff) | |
| parent | bfdc44e0e15d9b59cb5ff7d22d6779356921ca05 (diff) | |
| download | FreeBSD-src-000fe9b921f8e1b82e649477bf28c2cfbaa0ff7c.zip FreeBSD-src-000fe9b921f8e1b82e649477bf28c2cfbaa0ff7c.tar.gz | |
Merge remote-tracking branch 'origin/stable/11' into devel-11
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/defaults/rc.conf | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 28 |
2 files changed, 7 insertions, 23 deletions
diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf index 32e75f6..33a1ce4 100644 --- a/etc/defaults/rc.conf +++ b/etc/defaults/rc.conf @@ -609,7 +609,7 @@ lpd_flags="" # Flags to lpd (if enabled). nscd_enable="NO" # Run the nsswitch caching daemon. chkprintcap_enable="NO" # Run chkprintcap(8) before running lpd. chkprintcap_flags="-d" # Create missing directories by default. -dumpdev="AUTO" # Device to crashdump to (device name, AUTO, or NO). +dumpdev="NO" # Device to crashdump to (device name, AUTO, or NO). dumpdir="/var/crash" # Directory where crash dumps are to be stored savecore_enable="YES" # Extract core from dump devices if any savecore_flags="-m 10" # Used if dumpdev is enabled above, and present. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 973c7c3..9fef5de 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -769,7 +769,7 @@ .. ja_JP.eucJP .. - kk_Cyrl_KZ.UTF-8 + kk_KZ.UTF-8 .. ko_KR.CP949 .. @@ -785,7 +785,7 @@ .. lv_LV.UTF-8 .. - mn_Cyrl_MN.UTF-8 + mn_MN.UTF-8 .. nb_NO.ISO8859-1 .. @@ -851,13 +851,13 @@ .. sl_SI.UTF-8 .. - sr_Cyrl_RS.ISO8859-5 + sr_RS.ISO8859-5 .. - sr_Cyrl_RS.UTF-8 + sr_RS.UTF-8 .. - sr_Latn_RS.ISO8859-2 + sr_RS.ISO8859-2 .. - sr_Latn_RS.UTF-8 + sr_RS.UTF-8@latin .. sv_FI.ISO8859-1 .. @@ -893,22 +893,6 @@ .. zh_CN.UTF-8 .. - zh_Hans_CN.GB18030 - .. - zh_Hans_CN.GB2312 - .. - zh_Hans_CN.GBK - .. - zh_Hans_CN.UTF-8 - .. - zh_Hans_CN.eucCN - .. - zh_Hant_HK.UTF-8 - .. - zh_Hant_TW.Big5 - .. - zh_Hant_TW.UTF-8 - .. zh_HK.UTF-8 .. zh_TW.Big5 |
