Commit Graph

1387 Commits

Author SHA1 Message Date
Alexander V. Chernikov
603eaf792b Renove faith(4) and faithd(8) from base. It looks like industry
have chosen different (and more traditional) stateless/statuful
NAT64 as translation mechanism. Last non-trivial commits to both
faith(4) and faithd(8) happened more than 12 years ago, so I assume
it is time to drop RFC3142 in FreeBSD.

No objections from:	net@
2014-11-09 21:33:01 +00:00
Ed Maste
a0f6423b3d Regenerate after r273418 2014-10-21 20:41:19 +00:00
Brooks Davis
148bdd15d5 Regenerate src.conf.5 after:
r273170:
  MK_ARB_EABI was removed in r272350 so remove the documentation.
r273171:
  Per r273155, HYPERV is built by default on platforms where it makes
  sense and ignored on others.
r273172:
  Document that WITHOUT_TOOLCHAIN causes headers to not be installed, not
  just programs.
2014-10-16 15:59:00 +00:00
Bryan Drewery
1769d465c8 Bump .Dd missed in r271424 2014-10-06 00:25:10 +00:00
Xin LI
2c4b4abc02 Regen. 2014-09-13 02:18:54 +00:00
Hiroki Sato
15c7266a7f - Add $netif_ipexpand_max to specify the upper limit for the number of
addresses generated by an address range specification.  The default
  value is 2048.  This can be increased by setting $netif_ipexpand_max
  in rc.conf.

- Fix warning messages when an address range spec exceeds the upper limit.

PR:	186841
2014-09-11 12:30:29 +00:00
Alan Somers
2b1d82002d Regen after 271401.
Sponsored by:	Spectra Logic
2014-09-10 19:22:14 +00:00
Glen Barber
b8b210c185 Update the autofs(5) manual to reflect it first appeared in
FreeBSD 10.1-RELEASE.

Submitted by:	dhw
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2014-09-03 17:15:12 +00:00
Hiroki Sato
8eac80769b - Use $local_startup to load rc.conf.d/* scripts.
- Document support of rc.conf.d/<dir>/* introduced in r270392.

Discussed with:	bapt
2014-08-27 09:19:22 +00:00
Baptiste Daroussin
33b6cf558b Document the new ${LOCALBASE}/etc/rc.conf.d in rc.conf(5)
MFC after:	1 week
2014-08-26 22:54:54 +00:00
Stefan Eßer
651045d6de Add references to vt(4) and the configuration files in /usr7share/vt where
appropriate (i.e. where syscons was already mentioned and vt supports the
feature). Comments in defaults/rc.conf are updated to match the contents
of the modified man-page rc.conf(5).

Reviewed by:	pluknet, emaste
MFC after:	3 days
2014-08-26 08:13:30 +00:00
Bryan Drewery
54d8c5d5af Regen after r270171 2014-08-19 15:46:40 +00:00
Bryan Drewery
f1d82c3e68 Regen after r270168 2014-08-19 15:09:24 +00:00
Simon J. Gerraty
ee7b0571c2 Merge head from 7/28 2014-08-19 06:50:54 +00:00
Edward Tomasz Napierala
3914ddf8a7 Bring in the new automounter, similar to what's provided in most other
UNIX systems, eg. MacOS X and Solaris.  It uses Sun-compatible map format,
has proper kernel support, and LDAP integration.

There are still a few outstanding problems; they will be fixed shortly.

Reviewed by:	allanjude@, emaste@, kib@, wblock@ (earlier versions)
Phabric:	D523
MFC after:	2 weeks
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
2014-08-17 09:44:42 +00:00
Glen Barber
a5e1109a6e Remove trailing comma from ending Xref
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
2014-07-30 04:48:20 +00:00
Julio Merino
18c6fc4c4e Regen after r268778 to replace WITH_TESTS with WITHOUT_TESTS. 2014-07-16 21:43:24 +00:00
Baptiste Daroussin
55ba623622 Regenerate src.conf(5) after texinfo option change 2014-07-10 15:14:37 +00:00
Dimitry Andric
90be798e31 Regenerate src.conf.5, which was completely busted by r268351. 2014-07-07 16:43:42 +00:00
Marcel Moolenaar
e7d939bda2 Remove ia64.
This includes:
o   All directories named *ia64*
o   All files named *ia64*
o   All ia64-specific code guarded by __ia64__
o   All ia64-specific makefile logic
o   Mention of ia64 in comments and documentation

This excludes:
o   Everything under contrib/
o   Everything under crypto/
o   sys/xen/interface
o   sys/sys/elf_common.h

Discussed at: BSDcan
2014-07-07 00:27:09 +00:00
Ed Maste
d02efe3ffe Regenerate after r268022
MFC after:	1 week
2014-06-30 00:22:41 +00:00
Baptiste Daroussin
a63d6c943d use .Mt to mark up email addresses consistently (part6)
PR:		191174
Submitted by:	Franco Fichtner <franco at lastsummer.de>
2014-06-23 08:27:27 +00:00
Ed Maste
37bde59832 Update src.conf.5 after r267582 2014-06-17 16:25:50 +00:00
Joel Dahl
3d9eb6641e mdoc: remove superfluous paragraph macros. 2014-06-15 10:34:35 +00:00
Glen Barber
402da360e1 Revert r267424 and r267425:
More exploration will be needed in order to silence the
  tinderbox mails caused by setting WITH_TESTS=1 by default.

Ref:	http://tinderbox.freebsd.org/tinderbox-head-build-HEAD-amd64-amd64.full
With hat:	re
2014-06-13 00:05:06 +00:00
Julio Merino
070fd6a13f Regen after r267424 to replace WITH_TESTS with WITHOUT_TESTS. 2014-06-12 18:59:25 +00:00
Bryan Drewery
cb01313fba Regen after r267233 2014-06-08 17:33:37 +00:00
Ed Maste
4f78e0cb09 Regen after r267124 for WITHOUT_VT_SUPPORT 2014-06-05 18:59:21 +00:00
Warren Block
6279bf46bd Correct the document date for last change.
MFC after:	1 week
2014-06-05 01:58:21 +00:00
Julio Merino
fe0a62f58d Merge (unused) documentation of WITHOUT_TESTS into WITH_TESTS.
The description of WITH/WITHOUT tweaks should only document the non-default
option.  TESTS still defaults to no, so the option to be documented is
WITH_TESTS.
2014-06-03 22:34:27 +00:00
Warren Block
18744cd9ea Correct the description of characters allowed. Based on pw_checkname in
usr.sbin/pw/pw_user.c.  Modified version of patch submitted by
venture37.

PR:		docs/47594
Submitted by:	Fernando Schapachnik <fernando@mecon.gov.ar>, venture37 <venture37@geeklan.co.uk>
Reviewed by:	allanjude, bcr, brueffer (on phabricator)
MFC after:	1 week
2014-05-29 02:26:12 +00:00
Glen Barber
102f070cdb Regen after r266752.
Sponsored by:	The FreeBSD Foundation
2014-05-27 15:55:26 +00:00
Benjamin Kaduk
59be36b0f7 Document some user-settable make variables in ports.7
This is not a comprehensive list, as the variables themselves are spread
out over multiple files, but it is a start.

Add a section to make.conf noting that variables may be set there that
affect ports builds, but refer to ports.7 and elsewhere for the actual
listing; any listing in make.conf.5 would likely become out of date
fairly quickly.

PR:		docs/189199
Reviewed by:	bdrewery (previous version)
Approved by:	hrs (mentor)
2014-05-18 21:05:54 +00:00
Brooks Davis
20e9dd10e8 Remove documention of WITHOUT_NCURSES removed in r266157.
Remove a bit of whitespace from WITHOUT_BINUTILS.

Catch up with a bunch of other commits to tools/build/options that
weren't merged to src.conf.5.
2014-05-15 16:51:45 +00:00
Simon J. Gerraty
cc3f4b9965 Merge from head 2014-05-08 23:54:15 +00:00
Warner Losh
c6063d0da8 Use src.opts.mk in preference to bsd.own.mk except where we need stuff
from the latter.
2014-05-06 04:22:01 +00:00
Glen Barber
c16bac236c Clarify that MAKEOBJDIRPREFIX and MAKEOBJDIR are not
honored as make(1) arguments.

Requested by:	smh
MFC After:	3 days
Sponsored by:	The FreeBSD Foundation
2014-05-02 15:52:50 +00:00
Simon J. Gerraty
3b8f084595 Merge head 2014-04-28 07:50:45 +00:00
Warner Losh
0abe2561f6 Convert NO_MANCOMPRESSED to MK_MANCOMPRESSED. 2014-04-18 17:03:49 +00:00
Christian Brueffer
cd2fccbb47 Correct geli parameter.
PR:		188582
Submitted by:	Michael Hall
MFC after:	3 days
2014-04-14 06:59:49 +00:00
Warner Losh
a0f4cb1e7b r264402 builds fine, but turns out there are problems with
install. Back it out until they can be tracked down.
2014-04-13 21:52:27 +00:00
Julio Merino
0b41d3b0bc Regen after rewording of WITH_TESTS. 2014-04-13 11:31:41 +00:00
Warner Losh
5bce97114a Convert NO_MANCOMPRESS to normal convention. 2014-04-13 05:22:26 +00:00
Eitan Adler
dda5b39711 multiple: Remove 3rd clause from BSD license where approved by the
regents and renumber.

This patch skips files in contrib/ and crypto/

Acked by:	imp
Discussed with:	emaste
2014-03-14 03:07:51 +00:00
Gleb Smirnoff
2c284d9395 Remove IPX support.
IPX was a network transport protocol in Novell's NetWare network operating
system from late 80s and then 90s. The NetWare itself switched to TCP/IP
as default transport in 1998. Later, in this century the Novell Open
Enterprise Server became successor of Novell NetWare. The last release
that claimed to still support IPX was OES 2 in 2007. Routing equipment
vendors (e.g. Cisco) discontinued support for IPX in 2011.

Thus, IPX won't be supported in FreeBSD 11.0-RELEASE.
2014-03-14 02:58:48 +00:00
Baptiste Daroussin
cd37e8b7e8 Regen after WITHOUT_DMA -> WITHOUT_DMAGENT renaming 2014-02-22 13:07:38 +00:00
Baptiste Daroussin
533c3616ce Regen after addition of WITHOUT_DMA 2014-02-21 07:31:24 +00:00
Bryan Drewery
4360b89b6d Add forgotten rc.conf(5) update with r261931
Reviewed by:	trasz
Approved by:	bapt (mentor)
MFC after:	1 week
2014-02-15 14:52:12 +00:00
Niclas Zeising
d4f5f0007e Bump .Dd forgotten in r261832.
MFC after:	2 weeks
2014-02-13 13:11:34 +00:00
Niclas Zeising
a074a227fa Add cross references between rc.conf(5) and jail.conf(5).
MFC after:	2 weeks
2014-02-13 12:52:26 +00:00
Brooks Davis
d1f674c7ab Regenerate for WITHOUT_FMTREE and WITHOUT_NCURSESW.
MFC after:	4 weeks
Sponsored by:	DARPA, AFRL
2014-01-30 21:43:38 +00:00
Brooks Davis
6adfbbbf16 Merge from CheriBSD:
commit 6b569451b9
Author: Brooks Davis <brooks@one-eyed-alien.net>
Date:   Mon Jan 27 22:50:46 2014 +0000

    Always install nmtree as mtree.
    For compability, link mtree to nmtree.

X-MFC after:	never
Sponsored by:	DARPA, AFRL
2014-01-30 21:25:01 +00:00
Brooks Davis
7ecf8b1c67 Revert outdated info related to WITH_LIBCPLUSPLUS that was included in
r261072.  src.conf.5 now matches makeman's output.
2014-01-30 20:54:56 +00:00
Steven Kreuzer
c904339f2f Remove WITHOUT_ATF as it has been replaced by WITH_TESTS
PR:		conf/185326
Reported by:	Igor Mozolevsky <igor@hybrid-lab.co.uk>
Approved by:	hrs (mentor)
2014-01-23 03:14:48 +00:00
Sergey Kandaurov
54c22eeae8 Clean up manual pages after BIND removal.
MFC after:	1 week
2013-12-25 17:28:08 +00:00
Bryan Drewery
ef8e297edb Regenerate after r258838 2013-12-04 16:06:11 +00:00
Bryan Drewery
44893f0881 Regenerate after r258924
MFC after:	3 days
Approved by:	bapt (implicit)
2013-12-04 16:03:32 +00:00
Joel Dahl
13f9e7fda2 mdoc: remove EOL whitespace. 2013-11-21 19:44:48 +00:00
Josh Paetzel
e2838b315a Add support for multiple instances of ftp-proxy
and pflog devices.

PR:	conf/158171
Submitted by:	Thomas Johnson <tom@claimlynx.com>
2013-11-13 03:50:31 +00:00
Glen Barber
a603e851fa Regen after r258014.
Sponsored by:	The FreeBSD Foundation
2013-11-11 21:14:03 +00:00
Glen Barber
bba60773c3 Regen after r258012.
Sponsored by:	The FreeBSD Foundation
2013-11-11 21:02:57 +00:00
Baptiste Daroussin
c92d635ad3 After around 20 years of duty it is time for pkg_install to retire 2013-10-31 13:00:35 +00:00
Gleb Smirnoff
a7a36fea40 Remove more remnants of ng_fec(4).
The ng_create_one() and ng_mkpeer() functions in network.subr are
now not used anywhere, but I left them, since they can be useful
in future in netgraph scripting.

Submitted by:	pluknet
2013-10-28 16:21:31 +00:00
Brooks Davis
ce068e5a43 Regerate after r257138 swapped the default to WITH_NMTREE.
MFC after:	3 days
Sponsored by:	DARPA/AFRL
2013-10-25 22:47:54 +00:00
Brooks Davis
6495f64998 Regenerate documentation post r256915:
Stop conflating WITHOUT_CLANG with WITHOUT_CLANG_IS_CC.  This allows
bootstrapping a copy of clang without building clang for the base system
which is useful for nanobsd and similar setups.  It's still probably
wrong to conflate what is installed as /usr/bin/cc with the selection
of a bootstrap compiler under WITH*_CLANG_IS_CC, but that's for another
day.
2013-10-24 15:11:30 +00:00
Colin Percival
cabad26453 Add support for "first boot" rc.d scripts. [1]
These scripts, containing
# KEYWORD: firstboot
will only be run if a sentinel file (default: /firstboot, configurable
via the rc.conf ${firstboot_sentinel} variable) exists; this sentinel
file will be deleted at the end of the boot process.

Scripts can request that the system reboot after the first boot by
creating the file ${firstboot_sentinel}-reboot.

This functionality is expected to be useful for embedded systems and
virtual machine images, where it may be desirable to
(a) download and install updates which became available between when
the image was created and when it was "turned on";
(b) download and install packages which may be newer than those
which were available when the image was created;
(c) install packages which run binaries during their install process,
bypassing the problem of cross-architecture installs;
(d) resize filesystems to match the disk onto which a VM image was
installed;
(e) perform initialization tasks relevant to cloud systems (e.g.,
Amazon's Elastic Compute Cloud);
and likely to perform many other one-time initialization functions.

Document this new functionality in rc.conf(5) and rc(8). [2]

Reviewed by:	freebsd-current, freebsd-rc [1]
Reviewed by:	Warren Block [2]
MFC after:	3 days
2013-10-19 21:37:06 +00:00
Simon J. Gerraty
3caf0790a8 Merge head@256284 2013-10-13 02:35:19 +00:00
Hiroki Sato
fbd868c9d8 - Add mount.fdescfs parameter to jail(8). This is similar to
mount.devfs but mounts fdescfs.  The mount happens just after
  mount.devfs.

- rc.d/jail now displays whole error message from jail(8) when a jail
  fails to start.

Approved by:	re (gjb)
2013-10-12 17:27:59 +00:00
Rui Paulo
ec0e2ac611 Remove most of the ATF tools and the _atf user.
This is necessary because ATF is deprecated and it will be replaced by Kyua.

Submitted by:	jmmv@netbsd.org
Reviewed by:	Garrett Cooper
Approved by:	re
2013-10-12 06:06:53 +00:00
Hiroki Sato
84b354cb9a - Update rc.d/jail to use a jail(8) configuration file instead of
command line options.  The "jail_<jname>_*" rc.conf(5) variables for
  per-jail configuration are automatically converted to
  /var/run/jail.<jname>.conf before the jail(8) utility is invoked.
  This is transparently backward compatible.

- Fix a minor bug in jail(8) which prevented it from returning false
  when jail -r failed.

Approved by:	re (glebius)
2013-10-10 09:32:27 +00:00
Glen Barber
c9fc60beee Revert r256095, r256120 (partial), r256121:
r256095:
 - Add gnu/usr.bin/rcs back to the base system.

r256120:
 - Add WITHOUT_RCS back to src.conf.5.

r256121:
 - Remove UPDATING entry regarding gnu/usr.bin/rcs removal.

Requested by:	many
Approved by:	re (marius)
Discussed with:	core
2013-10-09 17:07:20 +00:00
Eitan Adler
18bb1b08e5 This regenerates src.conf.5 for both the RCS removal as well as r255784.
Approved by:	re (glebius)
2013-10-07 19:22:53 +00:00
Joel Dahl
89898f63c2 mdoc: remove EOL whitespace.
Approved by:	re (blanket)
2013-10-04 16:44:24 +00:00
Sergey Kandaurov
05d98029e9 Sweep man pages replacing ad -> ada.
Approved by:	re (blackend)
MFC after:	1 week
X-MFC note:	stable/9 only
2013-10-01 18:41:53 +00:00
Ed Maste
2e845e0d0a Regen.
Approved by:	re (implicit)
2013-10-01 17:46:04 +00:00
Dag-Erling Smørgrav
744f86ec15 Regenerate.
Approved by:	re (gjb)
2013-09-30 17:40:39 +00:00
Dag-Erling Smørgrav
e7145502e1 Regenerate.
Approved by:	re (blanket)
2013-09-24 14:46:10 +00:00
Dag-Erling Smørgrav
49cede74ee Add a setup script for unbound(8) called local-unbound-setup. It
generates a configuration suitable for running unbound as a caching
forwarding resolver, and configures resolvconf(8) to update unbound's
list of forwarders in addition to /etc/resolv.conf.  The initial list
is taken from the existing resolv.conf, which is rewritten to point to
localhost.  Alternatively, a list of forwarders can be provided on the
command line.

To assist this script, add an rc.subr command called "enabled" which
does nothing except return 0 if the service is enabled and 1 if it is
not, without going through the usual checks.  We should consider doing
the same for "status", which is currently pointless.

Add an rc script for unbound, called local_unbound.  If there is no
configuration file, the rc script runs local-unbound-setup to generate
one.

Note that these scripts place the unbound configuration files in
/var/unbound rather than /etc/unbound.  This is necessary so that
unbound can reload its configuration while chrooted.  We should
probably provide symlinks in /etc.

Approved by:	re (blanket)
2013-09-23 04:36:51 +00:00
Dag-Erling Smørgrav
8182b3bee1 Make the directory mapping functionality, which was previously only
available in 32-bit compatibility mode, unconditional.

Overhaul the man page, which had evolved more by accretion than by design.

Approved by:	re (gjb)
MFC after:	3 weeks
2013-09-21 21:03:52 +00:00
Ed Maste
2789c11117 Regenerate after addition of WITH_LLDB
Approved by: re (blanket)
2013-09-20 01:55:37 +00:00
Joel Dahl
79ce8a649b mdoc: sort SEE ALSO.
Approved by:	re (blanket)
2013-09-18 04:44:54 +00:00
Hiroki Sato
9d52c5eaec Add EXAMPLES section to explain the format of fstab(5).
Approved by:	re (marius)
Reviewed by:	wblock
2013-09-17 20:25:29 +00:00
Hiroki Sato
4e62a1443a Remove description "ifconfig_IF_aliasN is deprecated". While this
sentence was added in 2005, many users still need it.

Approved by:	re (gjb)
PR:		docs/162354
2013-09-17 20:20:04 +00:00
Dag-Erling Smørgrav
75e60c005a Regnerate.
Approved by:	re (blanket)
2013-09-15 15:23:50 +00:00
Glen Barber
b11797ad2f Do not install freebsd-update.conf.5 manual if WITHOUT_FREEBSD_UPDATE is
set.

MFC after:	3 days
Approved by:	re (delphij)
Sponsored by:	The FreeBSD Foundation
2013-09-13 03:39:19 +00:00
Simon J. Gerraty
d466a5b069 Merge head 2013-09-11 18:16:18 +00:00
Niclas Zeising
26c4cc026d Regenerate after unhooking gcc/g++ from the default build for some arches. 2013-09-06 20:51:15 +00:00
Simon J. Gerraty
d1d0158641 Merge from head 2013-09-05 20:18:59 +00:00
Jeremie Le Hen
f1ed02fabd Since r254974, periodic scripts' period can be configured
independently.  There is no reason to leave their options
with the daily ones, so move them to their own section.
2013-09-03 07:51:06 +00:00
Antoine Brodin
b9aa88b0c1 Fix after r255014 2013-08-29 15:58:20 +00:00
Joel Dahl
99e27a7806 mdoc fix 2013-08-28 05:12:29 +00:00
Niclas Zeising
969fe8f052 Really regen after r254962.
This removes the WITH_BSDCONFIG description alltogether, since this option
is removed.
At the same time, fix the WITHOUT_LIBCPLUSPLUS option that had gotten
inverted.
2013-08-27 23:30:02 +00:00
Jeremie Le Hen
69b55c23cb Make the period of each periodic security script configurable.
There are now six additional variables
  weekly_status_security_enable
  weekly_status_security_inline
  weekly_status_security_output
  monthly_status_security_enable
  monthly_status_security_inline
  monthly_status_security_output
alongside their existing daily counterparts.  They all have the same
default values.

All other "daily_status_security_${scriptname}_${whatever}"
variables have been renamed to "security_status_${name}_${whatever}".
A compatibility shim has been introduced for the old variable names,
which we will be able to remove in 11.0-RELEASE.

"security_status_${name}_enable" is still a boolean but a new
"security_status_${name}_period" allows to define the period of
each script.  The value is one of "daily" (the default for backward
compatibility), "weekly", "monthly" and "NO".

Note that when the security periodic scripts are run directly from
crontab(5) (as opposed to being called by daily or weekly periodic
scripts), they will run unless the test is explicitely disabled with a
"NO", either for in the "_enable" or the "_period" variable.

When the security output is not inlined, the mail subject has been
changed from "$host $arg run output" to "$host $arg $period run output".
For instance:
  myfbsd security run output ->  myfbsd security daily run output
I don't think this is considered as a stable API, but feel free to
correct me if I'm wrong.

Finally, I will rearrange periodic.conf(5) and default/periodic.conf
to put the security options in their own section.  I left them in
place for this commit to make reviewing easier.

Reviewed by:	hackers@
2013-08-27 21:20:28 +00:00
Devin Teske
a5aa00fbae Formally remove WITH_BSDCONFIG build option and re-generate src.conf.5
NOTE: Should have been inline with revisions 252862 and 254958.
2013-08-27 16:30:50 +00:00
Antoine Brodin
8aad3f600b Regenerate src.conf.5 2013-08-26 17:18:21 +00:00
Hiroki Sato
7dce7544fc - Reimplement $gif_interfaces as a variant of $cloned_interfaces.
Newly-configured systems should use $cloned_interfaces.

- Call clone_{up,down}() and ifnet_rename() in rc.d/netif {start,stop}.
  ifnet_rename() now accepts an interface name list as its argument.

- Add rc.d/netif clear.  The "clear" subcommand is basically equivalent to
  "stop" but it does not call clone_down().

- Add "ifname:sticky" keyword into $cloned_interfaces.  If :sticky is
  specified, the interface will not be destroyed in rc.d/netif stop.

- Add cloned_interfaces_sticky={YES,NO}.  This variable globally sets
  :sticky keyword above for all interfaces.  The default value is NO.
  When cloned_interfaces_sticky=YES, :nosticky keyword can be used to
  override it on per interface basis.
2013-08-04 06:36:17 +00:00
Andrew Turner
e1f38054f5 Regen. 2013-07-16 19:20:50 +00:00
Hiroki Sato
a78deafaaa Document options for .eli devices.
Submitted by:	ADAM David Alan Martin
2013-07-15 03:50:14 +00:00
Baptiste Daroussin
13f6fdf210 Regenerate src.conf(5) after changing WITHOUT_PKGTOOLS to WITH_PKGTOOLS 2013-07-12 23:12:37 +00:00
Glen Barber
d87953e418 Document that a literal jail name of 0 (zero) is not allowed.
PR:		174436
Submitted by:	Robert Schulze
Reviewed by:	mjg
MFC after:	3 days
2013-07-12 22:02:11 +00:00