- Copy stable/10@285827 to releng/10.2 in preparation for 10.2-RC1
builds.
- Update newvers.sh to reflect RC1.
- Update __FreeBSD_version to reflect 10.2.
- Update default pkg(8) configuration to use the quarterly branch.[1]

Discussed with: re, portmgr [1]
Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

MFC r277175:

Mention /net in hier(7).

Sponsored by: The FreeBSD Foundation

MFC r271057: Create a /boot/dtb directory to house DTB blobs.

MFC r270647: Add references to vt(4) and the configuration files in /usr/sha
MFC r270653: Update man-pages to correctly refer to changed pathes and namin
MFC r270657: More man pages that need to know about vt in addition to syscon
MFC r270659: (by pluknet@) Missed comma.
MFC r270660: Back-out the references to vt(4) from this man-page. It appears
MFC r270933: Add references to vt(4) to further man-pages.
MFC r270934: Final patches to the tools used to convert syscons keymaps for
MFC r270935: Add vt(4) support to the console initialisation script, specifi

Second batch of MFCs to add support for Unicode keymaps for use with vt(4).

It contains the following changes:

- Add references to vt(4) to relevant man-pages.
- Update comment in defaults/rc.conf to mention vt
- Update rc.d/syscons to warn about syscons keymaps used under vt.
An attempt is made to identify the vt keymap to load instead.
- Minor changes to the conversion tool based on mail comments on keymaps.

Relnotes: yes

Merge r267482,r267483,r267486,r267577,r267671,r267672 from head:

Remove send-pr and fix up all references to it. Replace it with a
stub send-pr directing people towards the web site.

MFC r262451:

hier(7): Add /usr/lib/private

MFC: r262243

Fix a cross-reference.

MFC r259879: Clean up manual pages after BIND removal.

Set up the /usr/tests hierarchy.

This is a MFC of the following into stable/10:
- r257097 Set up the /usr/tests hierarchy.
- r257098 Add missing WITHOUTTESTS file.
- r257100 Add a tests(7) manual page.
- r257105 Disable WITHTESTS= for now.
- r257848 Fix buildworld when WITHTESTS is enabled.
- r257850 Subsume the functionality of MKATF into MKTESTS.
- r257851 Handle the removal of the test suite when WITHOUTTESTS=yes.
- r257852 Install category Kyuafiles from their category directories.
- r258232 Install BSD.tests.mtree when MKTESTS is yes.

Note that building with WITH_TESTS is still broken at this point (and
hence why WITHOUT_TESTS is the set as the default). Subsequent pullups
will fix the remaining issues.

MFC r257344,r257403:

Move /etc/keys to /usr/share/keys where users are less likely to modify them.

Approved by: bapt
Approved by: re (gjb)

MFC r257151:

Document /var/cache/pkg into hier(7) which pkg(8) uses.

Approved by: bapt
Approved by: re (glebius)

MFC: r256770,r257142,r257145,r257146,r257147,r257148,
r257149,r257150,r257158,r257159,r257164,r257168,
r257193

- Support checking signature for pkg bootstrap from remote
and for 'pkg add ./pkg.txz'

- Be verbose on where pkg is being bootstrapped from.

- Add support for reading configuration files from /etc/pkg.
For now only /etc/pkg/FreeBSD.conf is supported.

- Add test package signing key fingerprint into /etc/keys/pkg/trusted.

- Disable fingerprint checking by default for now as the official
packages are not yet signed.

Approved by: bapt
Approved by: re (glebius)

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

mdoc sweep

Remove obsolete references to sysinstall.

This change is not intended for MFC.

PR: docs/177570
Submitted by: Garrett Cooper <yaneurabeya@gmail.com> (partial)
Approved by: bcr (mentor)

Apply local patches to mandoc and connect it to the build.

- adds a couple more library strings used in the tree
- changes some more to the current groff spelling
- changes page footer to match groff style

Disconnect non-MPSAFE NTFS from the build in preparation for dropping
GIANT from VFS. This code is particulary broken and fragile and other
in-kernel implementations around, found in other operating systems,
don't really seem clean and solid enough to be imported at all.
If someone wants to reconsider in-kernel NTFS implementation for
inclusion again, a fair effort for completely fixing and cleaning it
up is expected.

In the while NTFS regular users can use FUSE interface and ntfs-3g
port to work with their NTFS partitions.

This is not targeted for MFC.

Disconnect non-MPSAFE NWFS from the build in preparation for dropping
GIANT from VFS. In addition, disconnect also netncp, which is a base
requirement for NWFS.

In the possibility of a future maintenance of the code and later
readd to the FreeBSD base, maybe we should think about a better location
for netncp. I'm not entirely sure the / top location is actually right,
however I will let network people to comment on that more specifically.

This is not targeted for MFC.

Disconnect non-MPSAFE PORTALFS from the build in preparation for dropping
GIANT from VFS.

This is not targeted for MFC.

Bump date missed in r202756

PR: docs/171624
Submitted by: bdrewery
Approved by: gabor
MFC after: 3 days

Add /usr/src/cddl/ to the hierarchy.

o Sync the man page with the reality: nfs/ includes
are under include/ and include/fs/.

PR: docs/139153
Submitted by: gjb
MFC after: 1 week

Correct a minor mistake in my previous commit.

getutxent is in category 3, not 5.

Remove stale references to utmp(5) and its corresponding filenames.

I removed utmp and its manpage, but not other manpages referring to it.

Build fixups for the new USB stack.

src/sys/dev/usb2/controller/uss820dci_pccard.c
src/sys/dev/usb2/core/usbdevs
src/sys/dev/usb2/include/urio2_ioctl.h
src/sys/dev/usb2/storage/ustorage2_fs.h

These files are not used any more.

src/usr.sbin/Makefile
src/etc/mtree/BSD.include.dist
src/include/Makefile
src/lib/Makefile
src/share/man/man7/hier.7
src/share/mk/bsd.libnames.mk
src/etc/mtree/BSD.include.dist

Make "usbconfig" and "libusb20" a part of the default build.

src/sys/dev/usb/rio500_usb.h
src/sys/dev/usb2/storage/urio2.c

Use common include file.

src/sys/dev/usb2/bluetooth/ng_ubt2.c

Make USB bluetooth depend on "ng_hci" module.

src/sys/dev/usb2/controller/ehci2.c
src/sys/dev/usb2/controller/ehci2.h

Patches for Marvell EHCI.

src/sys/dev/usb2/core/usb2_busdma.c

Bugfix for 64-bit platforms. Need to unload the previously loaded DMA
map and some cleanup regarding some corner cases.

src/sys/dev/usb2/core/usb2_core.h
src/sys/dev/usb2/core/usb2_dev.c
src/sys/dev/usb2/core/usb2_dev.h

Bugfix for libusb filesystem interface.

New feature: Add support for filtering device data at the expense of the
userland process.

Add some more comments.

Some minor code styling.

Remove unused function, usb2_fifo_get_data_next().

Fix an issue about "fifo_index" being used instead of "ep_index".

src/sys/dev/usb2/core/usb2_device.c
src/sys/dev/usb2/core/usb2_generic.c

Bugfix for Linux USB compat layer. Do not free non-generic FIFOs when
doing an alternate setting.

Cleanup USB IOCTL and USB reference handling.
Fix a corner case where USB-FS was left initialised after
setting a new configuration or alternate setting.

src/sys/dev/usb2/core/usb2_hub.c

Improvement: Check all USB HUB ports by default at least one time.

src/sys/dev/usb2/core/usb2_request.c

Bugfix: Make sure destination ASCII string is properly zero terminated
in all cases.

Improvement: Skip invalid characters instead of replacing with a dot.

src/sys/dev/usb2/core/usb2_util.c
src/sys/dev/usb2/image/uscanner2.c

Spelling.

src/sys/dev/usb2/include/Makefile

Share "usbdevs" with the old USB stack.

src/sys/dev/usb2/include/usb2_devid.h
src/sys/dev/usb2/include/usb2_devtable.h

Regenerate files.

Alfred: Please fix the RCS tag at the top.

src/sys/dev/usb2/include/usb2_ioctl.h

Fix compilation of "kdump".

src/sys/dev/usb2/serial/ubsa2.c
src/sys/dev/usb2/serial/ugensa2.c

Remove device ID's which will end up in a new 3G driver.

src/sys/dev/usb2/sound/uaudio2.c

Correct a debug printout.

src/sys/dev/usb2/storage/umass2.c

Sync with old USB stack.

src/lib/libusb20/libusb20.3

Add more documentation.

src/lib/libusb20/libusb20.c

Various bugfixes and improvements.

src/usr.sbin/usbconfig/dump.c
src/usr.sbin/usbconfig/usbconfig.c

New commands for dumping strings and doing custom USB requests from
the command line.

Remove keyword requirements from generated files:
"head/sys/dev/usb2/include/usb2_devid.h"
"head/sys/dev/usb2/include/usb2_devtable.h"

Remove ISDN4BSD (I4B) from HEAD as it is not MPSAFE and
parts relied on the now removed NET_NEEDS_GIANT.
Most of I4B has been disconnected from the build
since July 2007 in HEAD/RELENG_7.

This is what was removed:
- configuration in /etc/isdn
- examples
- man pages
- kernel configuration
- sys/i4b (drivers, layers, include files)
- user space tools
- i4b support from ppp
- further documentation

Discussed with: rwatson, re

Remove netatm from HEAD as it is not MPSAFE and relies on the now removed
NET_NEEDS_GIANT. netatm has been disconnected from the build for ten
months in HEAD/RELENG_7. Specifics:

- netatm include files
- netatm command line management tools
- libatm
- ATM parts in rescue and sysinstall
- sample configuration files and documents
- kernel support as a module or in NOTES
- netgraph wrapper nodes for netatm
- ctags data for netatm.
- netatm-specific device drivers.

MFC after: 3 weeks
Reviewed by: bz
Discussed with: bms, bz, harti

Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.

Submitted by: bz
Approved by: re

- Remove UMAP filesystem. It was disconnected from build three years ago,
and it is seriously broken.

Discussed on: freebsd-arch@
Approved by: re (mux)

Remove /usr/X11R6 and subdirs.

MFC after: 3 days

Quick kill posix4 directory.

Submitted by: rodrigc (BSD.include.dist).

- Remove the leading zero from the day of month.

Noticed by: ru@
Approved by: delphij@ (mentor)
MFC after: 1 week

- Remove the deprecated ``/stand'' hierarchy.

PR: docs/111137
Submitted by: Niclas Zeising
Approved by: delphij@ (mentor)

- Add missing subdirectories in BSD.usr.dist mtree file.
- Update hier(7) to reflect latest changes in mtree file.
- Add UPDATING entry following Intel firmwares inclusion.

Submitted by: mlaier
MFC after: 1 month

Remove reference to mount_procfs.

Reminded by: ru

Remove references to the pam(8) manual page. It does not exist.

Requested by: novel
Discussed with: brueffer, simon

Add the DTrace library script directory.

Add /usr/lib/engines for OpenSSL engines.

Send the pcvt(4) driver off to retirement.

Add a /media to FreeBSD. /media is a directory designed to contain
subdirectories that will be used for removable media mount points (i.e.
mount points for CDs, floppy disks, USB drives, etc.). While the primary
purpose of /media is to provide a location for HAL
(http://www.freedesktop.org/wiki/Software_2fhal) to mount volumes, it could
be used by any application that needs to manage removable media volumes.

Discussed on: arch@
Approved by: mux
MFC after: 1 week

Document the bluetooth/, rc.d/, security/ and ssh/ etc subdirectories.

Prodded by: markus
MFC after: 3 days

Fixed xrefs.

Fix the pbio include file installation process and the
corresponding documentation.

Noticed by: ru
Reviewed by: ru

mdoc style nit: "\-" should only be used to represent a minus sign.

Suggested by: ru

/usr/lib doesn't contain only archive (ar(1) style) libraries. Shared
libraries live there too. Also point to ar(1) which contains a nice
description of what an 'archive library' is.

PR: docs/76056
Submitted by: Enrique Matías Sanchez <cronopios@gmail.com>
MFC after: 3 days

Remove mention of block devices. Mention that entries under /dev
are managed by devfs(5). Add cross-references.

Reviewed by: ru

Instead of "OpenFirmware", "openfirmware", etc. use the official spelling
"Open Firmware" from IEEE 1275 and OpenFirmware.org (no pun intended).

Ok'ed by: tmm

Update the date.

Reminded by: ru

Inform hier(7) about /usr/include/geom/raid3/ directory.

Inform hier(7) about /usr/include/geom/mirror/ directory.

Remove the g++ include directory - it has been gone a long time
ago and add it's new incarnation c++ instead.

Add a description what is in the sub-directories of /usr/include/netnatm.

Mechanically kill hard sentence breaks and double whitespaces.

Spelling fixes.

Assorted markup, spelling, and grammar fixes.

Update for include/altq

Reminded-by: ru

Update the date.

Requested by: ru

- Add missing 'the'.
- Document /usr/include/geom/ directory and its subdirectories.

Requested by: ru

Inform hier(7) manual page about /lib/geom/ directory.

Reminded by: ru

Move the SNMP MIBs and tree definitions from /usr/share/bsnmp to
/usr/share/snmp. This mirrors the use of /usr/local/share/snmp and
makes also more sense when non-bsnmp-specific MIBs go in.

Removed more vestiges of the stl(4) driver.

More kosher mdoc(7).

Submitted by: ru

Restore part of rev 1.92; share/libdata/gcc should not have been deleted.

Remove mention of share/libdata/doscmd/{,fonts/} and share/libdata/gcc.

Install UDF header files to unbreak /sbin building when /sys is not present.

Submitted by: imura@ryu16.org

Update hier(7) to reflect the world with respect to /lib and /libexec.

Add /usr/share/security to reflect recent hookup of Makefile and
mtree entry for share/security/lomac-policy.contexts.

Pointed out by: ru

Remove /usr/libdata/msdosfs description.

Noticed by: ru

Document /var/empty as generic empty directory, not sshd specific

Add /rescue/ and a reference to its manual page rescue(8).

Approved by: ceri (mentor)

This is a driver for the physical layer chips used in ATM interfaces.
It currently supports the PMC Sierra Lite, Ultra and 622 chips and
the IDT 77105. The driver handles media options and state in a consistent
manner for ATM drivers. The next commit to the midway driver will make
it use utopia.

Update for kerberos 5

Remove a remnant of netns.

NODEVFS cleanup.

Sort. Move /usr/heimdal to /var/heimdal where it really is.

PR: docs/46637
Submitted by: Igor Sobrado <sobrado@acm.org>
Approved by: ru

mdoc(7) police: Deal with self-xrefs.

Uniformly refer to a file system as "file system".

Approved by: re

mdoc(7) police: scheduled sweep.

Approved by: re

Update for BSD.include.dist r1.60 (addition of include/dev/ofw).

Forgotten by: tmm
Prodded by: ru

Add a note explaining /var/empty.

PR: docs/43364
Submitted by: Kim Scarborough <sluggo@unknown.nu>
MFC after: 14 days

mdoc(7) police: markup nit.

mdoc(7) police: fix references to sendmail(8).

Keep up with BSD.usr.dist,v 1.260.

Catch up with BSD.usr.dist,v 1.259.

More file system > filesystem

Update /usr/libdata/perl subdirectory to the Perl 5.6.1.

Add some additional sendmail related directories

MFC after: 3 days

* Correct a typo.
* Add an entry for /etc/pam.d.
* Update /usr/libdata/stallion description.

Remove reference to share/dict/special/. That directory does not
exist, nor does the referenced program.

MFC after: 3 days

Add a note about the FreeBSD technical word list.

Typo: s/compatability/compatibility/

MFC after: 3 days

Revert revision 1.57 -- ache@ axed /var/spool/uucp in BSD.var.dist,v 1.55.

mdoc(7) police: markup nits.

Document the /var/run/named directory.

Suggesteded by: brian

Add a directory in /var/run to store ppp(8) command sockets.

PR: bin/29966
Approved by: brian
MFC after: 4

add /var/heimdal

absence noted by Archie Cobbs <archie@packetdesign.com>

Improve the wording of my last commit.

Submitted by: sheldonh

Note that the contents of /tmp may or may not be kept between system
reboots.

Also add a `NOTES' section that reminds the reader that this man page
just documents the system default, and that the hierarchy of a given
site is at the system administrators discretion.

PR: docs/29525

Oops, /var/spool/uucp needs to stay for serial port locking

Note removal of UUCP directories

Mentions about /var/spool/secretmail were deleted in BSD.var.dist,v 1.2.

Even more libss removal.

mdoc(7) police: s/BSD/.Bx/ where appropriate.

mdoc(7) police: don't use enclosure macros with plain text.

Note which entries are created by sysinstall(8).

Requested by: ru

Removed whitespace at end-of-line; no content changes. I simply did
cd src/share; find man[1-9] -type f|xargs perl -pi -e 's/[ \t]+$//'

BTW, what editors are the culprits? I'm using vim and it shows
me whitespace at EOL in troff files with a thick blue block...

Reviewed by: Silence from cvs diff -b
MFC after: 7 days

/dist is a mount point used by sysinstall(8), not an extraction directory.

Document dist/, cdrom/, compat/, and /usr/compat/, fix a couple of
{typ,think}os.

Submitted by: Rich Morin <rdm@cfcl.com>

Document /usr/include/dev/{ic,wi}.

Reminded by: ru

Remove vestiges of MFS.

Document /usr/include/fs/ntfs and /usr/include/fs/nwfs.

- sys/msdosfs moved to sys/fs/msdosfs
- msdos.ko renamed to msdosfs.ko
- /usr/include/msdosfs moved to /usr/include/fs/msdosfs

Document new /usr/include/fs include subdirs.

Document /usr/include/fs/smbfs and /usr/include/netsmb.

Submitted by: bp

mdoc(7) police: split punctuation characters + misc fixes.

o Clear up explanations of various entries (includes spelling, grammar,
punctuation, and explanations that are just plain wrong)
o Add missing entries
o Remove entries for directories that do not exist

Submitted by: Rich Morin <rdm@cfcl.com> (for the most part)

fix typo; file -> files

Submitted by: Alexey Dokuchaev <danfe@inet.ssc.nsu.ru>

Document /usr/include/isc.

Noticed by: ru

Document /usr/include/netnatm and /usr/share/sendmail.

mdoc(7) police: use the new features of the Nm macro.

Use Fx macro wherever possible.

Avoid use of direct troff requests in mdoc(7) manual pages.

Fix typo : s/maintaince/maintenance/

The kernel is now known as `kernel.ko' and it and its matching modules
live in ``/boot/kernel/''.

Document /usr/lib/aout.

PR: conf/18167

/usr/mdec has gone 1.5 years ago.

Document OpenSSL directories.

Update the /usr/include/ hierarchy for the cam/ and cam/scsi/ directories.

PR: 16345
Submitted by: Nick Hibma (henny) <n_hibma@webweaving.org>

Install the USB include files in /usr/include/dev/usb.

We should still sort out some way of avoiding the clutter. Not all files
should be there.

Prompted by: Louis A. Mamakos <louie@TransSys.COM>

bring in description for KAME IPv6 changes.
XXX it looks that sysctl.3 lacks most of PF_INET items.
Reviewed by: shin
Obtained from: KAME (netbsd-current)

Add /boot.

A bullet in the head to pkg_manage references.

Correct spelling : ascii -> ASCII

PR: docs/13702
Submitted by: Stephen J. Roznowski <sjr@home.com>
Reviewed by: mpp

Fix typo: vi(8) -> vi(1)

Noticed by: ru

Update to current state of filesystems layout (almost complete)
Stylize

PR: docs/13229
Reviewed by: mpp

$Id$ -> $FreeBSD$

Remove superfluous `preserve' entry.

PR: docs/13279

Fix the typos, and add new entries (like the /etc/periodic/ and /etc/mail/
directories).

PR: docs/11695
Submitted by: Chris Costello <chris@calldei.com>

away go lkms, in come klds.

Clarify that "/usr/share" is used for architecture independent files
and need not be restricted to ASCII text files.

PR: docs/9124
Submitted by: Mattias Pantzare <pantzer@ludd.luth.se>

PR: docs/3979
better wording

Submitted by: Tim Vanderhoek <hoek@hwcn.org>, Gary Howland <gary@hotlava.net>

Use the .Fx macro for FreeBSD references for releases prior to 2.0.
Use the .Tn macro for generic FreeBSD references. Cleanup other
formatting problems noticed while making the above changes.

Sync with /etc/mtree/BSD.*.dist

Sync with /etc/mtree/BSD.root.dist.

Revert $FreeBSD$ back to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Sort cross references.

Fix syntax error loc->doc

First cut at adding a little bit about the ports framework's dir structure.

Try to get some of the most egregiously old cruft out of here.

Do not install the now unsupported netns and netiso
related man pages. Comment out cross references to those man
pages from other man pages.

Correct some man page xrefs, and some other minor changes to bring some
man pages up to mdoc guidelines and fix some minor formatting glitches.
Also fixed a number of man pages to not abuse the .Xr macro to
display functions and path names and a lot of other junk.

Correct some man page cross references and file location references.

Converted 'vmunix' to 'kernel'.

This commit was generated by cvs2svn to compensate for changes in r1638,
which included commits to RCS files with non-trunk default branches.

BSD 4.4 Lite Share Sources