Eitan Adler b169a33235 Make etc/Makefile more conflict resistant ... PR: conf/163789 Submitted by: gcooper (iXsystems) Approved by: cperciva MFC after: 3 days		2012-02-09 20:44:20 +00:00
..
bluetooth
defaults	As it stands right now, the default devfs rulesets are only loaded as a	2012-02-08 08:52:40 +00:00
devd	Remove the notify match from a couple devd apple events, the events don't	2012-01-28 02:52:22 +00:00
etc.amd64	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.arm	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.i386	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.ia64	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.mips	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.pc98	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.powerpc	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
etc.sparc64	Remove the reference to pseudo-terminals from the description.	2011-03-30 08:22:29 +00:00
gss	Implement support for RPCSEC_GSS authentication to both the NFS client	2008-11-03 10:38:00 +00:00
mail	o Add user 'hast'.	2011-01-31 07:47:28 +00:00
mtree	Import libc++ / libcxxrt into base. Not build by default yet (use	2011-11-25 20:59:04 +00:00
namedb	Spelling fixes for etc/	2012-01-07 16:10:32 +00:00
pam.d	Forgot to commit this change along with r219563: pam_group(8) now issues	2011-03-15 10:13:35 +00:00
periodic	Add an option to 404.status-zfs (enabled by default) to list all	2012-02-08 00:08:21 +00:00
ppp	Remove COMPILATIONDATE from the default section. This string is no longer	2010-02-16 01:07:06 +00:00
rc.d	As it stands right now, the default devfs rulesets are only loaded as a	2012-02-08 08:52:40 +00:00
root	Switch the default terminal emulation style to xterm for most platforms.	2009-11-13 05:54:55 +00:00
sendmail	Minor change to force commit this file so new freebsd*.cf files are	2011-06-14 04:34:20 +00:00
amd.map
apmd.conf
auth.conf
crontab	Remove HOME= - this has surprised me several times in the past.	2009-06-14 06:37:19 +00:00
csh.cshrc
csh.login	Change the commented msgs examples in profile/csh.login from -f to -q.	2010-05-15 17:49:56 +00:00
csh.logout
ddb.conf	Use the new command file feature of ddb(8) to support setting ddb(4)	2008-03-05 18:32:58 +00:00
devd.conf	- Add support for a "!" character in regex matching in devd(8). It inverts	2011-10-26 02:11:28 +00:00
devfs.conf	Remove example for linking /dev/vga to /dev/ttyv0, this hasn't been	2011-10-27 20:39:20 +00:00
dhclient.conf
disktab
fbtab
freebsd-update.conf	Add support for backing up the old kernel when installing a new kernel	2009-08-19 20:47:31 +00:00
ftpusers	o Add user 'hast'.	2011-01-31 07:47:28 +00:00
gettytab	Fix spelling of "weirdo" in /etc/gettytab comment.	2010-07-12 19:09:18 +00:00
group	Add 'hast' user and 'hast' group that will be used by hastd (and maybe hastctl)	2011-01-28 22:28:12 +00:00
hosts
hosts.allow
hosts.equiv
hosts.lpd
inetd.conf	Add -k to the recommended fingerd(8) command line.	2010-04-01 13:13:09 +00:00
libalias.conf
login.access
login.conf	Remove vestiges of 'slip'.	2010-06-19 09:21:34 +00:00
mac.conf	Spelling fixes for etc/	2012-01-07 16:10:32 +00:00
Makefile	Make etc/Makefile more conflict resistant	2012-02-09 20:44:20 +00:00
man.alias
master.passwd	Change hast user home directory to /var/empty.	2011-01-28 22:29:38 +00:00
minfree
motd	Fix path to the handbook and provide a hint about how to install it if it	2011-08-26 14:05:48 +00:00
netconfig
netstart	/etc/netstart: remove invocation of dhclient	2012-01-20 17:25:15 +00:00
network.subr	Fix several glitches in IPv6-related knobs:	2012-01-22 10:57:32 +00:00
networks
newsyslog.conf	Updated `flags' field description.	2011-05-03 12:22:46 +00:00
nls.alias
nscd.conf
nsmb.conf
nsswitch.conf	Revert r224760, and enhance the sed patterns from r224659 to comment out	2011-08-10 20:52:02 +00:00
ntp.conf	1) Use our vendor domain at the pool.	2009-07-13 05:51:33 +00:00
opieaccess
pccard_ether	Implement a "quiet" mode for rc.d/netif, which only outputs	2008-06-23 20:50:11 +00:00
pf.os	Sync pf.os with OpenBSD:	2011-09-08 23:46:07 +00:00
phones
portsnap.conf	Now that the portsnap buildbox is generating the raw bits for INDEX-9,	2011-10-12 03:29:12 +00:00
printcap
profile	Change the commented msgs examples in profile/csh.login from -f to -q.	2010-05-15 17:49:56 +00:00
protocols
rc	Rather than trusting that nothing is going to sneak in before the	2011-04-29 21:10:41 +00:00
rc.bsdextended
rc.firewall	Spelling fixes for etc/	2012-01-07 16:10:32 +00:00
rc.initdiskless	Spelling fixes for etc/	2012-01-07 16:10:32 +00:00
rc.resume	Revert r211288 and move the logic to the acpi_timer itself.	2012-02-08 20:31:42 +00:00
rc.sendmail
rc.shutdown	Instead of killing the 'watchdog' subshell and leaving a sleep for	2009-01-25 10:31:45 +00:00
rc.subr	If we're booting there is no need to waste time determining if the service	2012-01-20 10:31:27 +00:00
rc.suspend	Revert r211288 and move the logic to the acpi_timer itself.	2012-02-08 20:31:42 +00:00
regdomain.xml	More Japan regulatory domain fixes:	2011-07-14 05:49:35 +00:00
remote	Add ucomX shortcuts just like its uart sibling.	2008-10-27 17:19:14 +00:00
rpc
services	Spelling fixes for etc/	2012-01-07 16:10:32 +00:00
shells
snmpd.config	Add (disabled) sample configuration lines needed to enable snmp_target(3) module	2010-12-20 17:28:15 +00:00
sysctl.conf
syslog.conf	syslog.conf: pop up from logging only ppp messages at the end of file	2009-06-11 15:07:02 +00:00
termcap.small	Fix termcap entry typo.	2011-02-09 10:06:31 +00:00