Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE
cycle.

Prune svn:mergeinfo from the new branch, and rename it to RC1.

Update __FreeBSD_version.

Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and
the dvd1.iso packages population.

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

Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, as nothing has been merged
here.

Additional commits post-branch will follow.

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

Final step of eliminating the "games" distribution: Merge src/games
(or what's left of it, at least) into src/usr.bin.

This change will not be MFCed.

Discussed at: EuroBSDCon 2014
Committed from: EuroBSDCon 2015

Correctly case FreeBSD in my entry in the tips file

Submitted by: feld
Approved by: wblock (mentor)
Differential Revision: https://reviews.freebsd.org/D3601

fetch has supported https for a while..

I would convert the url to https, but we still don't install a CA set
by default... we even don't install the CA that authenticates
www.FreeBSD.org..

Update the freebsd-tips example to use drill instead of dig since bind is no longer in base

CR: D460
Approved by: bcr (mentor)

Refresh the tips for the new pkg system.

Reviewed by: bapt
Approved by: re (hrs)

Remove a reference to instant-server which has been removed from the
ports tree in r313427.

PR: 177012
Submitted by: Kevin Zheng <kevinz5000@gmail.com>
Approved by: bcr (mentor)

Remove extra word:

Submitted by: many
Approved by: cperciva (implicit)
MFC after: 3 days

Sysinstall has been removed from base.

Approved by: cperciva

Correct the tip about finding all the directories on the system
Add a tip about clearing the screen.
Make things more consistent by removing quotes around 'make search'

Approved by: cperciva
MFC after: 3 days

Partial revert of previous commit as some of the changes were not
newbie-friendly.

Requested by: jhb, gcooper
Approved by: cperciva (implicit)
MFC after: 3 days
X-MFC-With: r235209

Add a few new tips and update some old ones to more modern commands

MFC after: 1 week

"whereis netscape" gives empty output for quite a long time already.
Suggest to use "whereis firefox" instead.

Our standard "xterm" termcap entry supports colour, so this tip is redundant.
As it happens, "xterm-color" has just been an alias for "xterm" since
src/share/termcap/termcap.src 1.131 in September 2002.

PR: docs/132959
Approved by: ed (mentor)

netcat is "now" in base, so point people at nc(1) instead of the port.

MFC after: 1 week

Remove a quote about the instant-workstation, this port
has been removed ages ago.

PR: docs/124166
Submitted by: keramida
Prodded by: novel,keramida

The ../tools/do_sort script could not differentiate between
a few very slightly diffrent versions of tcsh prompts, so
restore the 2 that were lost, and consolidate them all in
a way that will prevent them from being lost again.

Sort these files using: sh ../tools/do_sort < $file > $file.sorted

This greatly aids in detecting duplicates, among other things.

This is a massive cleanup of the fortune files, including removal
of many duplicates, formatting/whitespace fixes, spelling fixes,
and a host of others. Note: No fortunes were intentionally removed
(other than duplicates) as part of this cleanup. In removing dupes
I tried to be generous in not removing similarly worded fortunes
that had even slightly different punch lines.

Duplicates were resolved as follows (in this order):
* + limerick -> limerick
* + fortunes-o.real -> fortunes-o.real
* + fortunes2-o -> fortunes2-o
* + zippy -> zippy
murphy + fortunes -> fortunes

In correcting spelling I've tried to leave colloquial variations
(especially British'isms) intact, as well as to not "correct"
errors that are part of the joke.

In fortunes and fortunes2-o I combined a couple of fortunes that
were adjacent to each other that seemed like they should have
originally been combined, and split a couple that seemed like they
should have originally been split.

Miscellaneous:
1. Fixed underlining
2. Capitalized proper names
3. Removed quotation marks from "freestanding" quotes for consistency
4. Added quotation marks to QOTD fortunes that needed them
5. Corrected or added many attributions
6. Removed apostrophes from trailing 's' that are plural, not possessive
7. Updated the path to fortune stuff included in some of the jokes
8. Updated several fortunes to their original version, and added attribution
9. Split up compound words that ispell tripped over

o /stand/sysinstall -> /usr/sbin/sysinstall.

PR: conf/106254
Submitted by: Simon Olofsson
MFC after: 1 week

Add a tip on "how to strip UTF-8 BOM"

Approved by: delphij (mentor)

Fix locations of some links.
Word smithing.

PR: conf/81923
Submitted by: Gavin Atkinson <gavin dot atkinson at ury.york.ac.uk>

Typo.

PR: conf/77178
Submitted by: Andras Jako <jako.andras@eik.bme.hu>
MFC after: 1 week

Give a better advice on how to convert DOS text to UNIX text.
The former tip used `col -bx', which would not only discard
CR's, but also expand TAB's and remove BS'en. This effect is
not always wanted.

MFC after: 1 week

Remove committer-specific entry.

Minor bit of advice.

There is a better way to find out whether a port is installed or not.

Fix make search entries.

PR: docs/70899
Submitted by: Marc Silver <marcs@draenor.org>

Fix misspellings in the freebsd-tips fortunes. The same PR has
a patch to mention portupgrade in freebsd-tips as well; I'm not
sure if that belongs here, so I'll leave it for someone else.

PR: misc/37073
Submitted by: Sean Chittenden <sean@chittenden.org>
Approved by: rwatson (mentor)

Add a tip on how to print a manual page.

PR: docs/61033
Submitted by: mi@

Fix a tip about how to create an empty file[1].
Remove tip about retired kget(8).
Fix a typo.

PR: conf/54334
Submitted by: Mark Huizer <xaa+sendpr@timewasters.nl>
MFC after: 3 days

Remove the suggestion to try `hangman', because it does not exist
in the base system anymore.

set watch in tcsh requires an equal sign after the variable name.

MFC after: 1 day

Minor grammatical correction

Fix the path to the make.conf example file.

PR: docs/44278
Submitted by: Chris Pepper <pepper@rockefeller.edu>

Add a tip about using sed(1)'s FreeBSD-specific -i option.

MFC after: 42 days

Fix a typo.

PR: 40539
Submitted by: Munish Chopra <mchopra@engmail.uwaterloo.ca>

Paraphrase a quote to remove year specific references.

PR: 40291
Submitted by: Pierre-Paul Lavoie <ppl@nbnet.nb.ca>

* Add $FreeBSD$ to limerick and zippy
* Delete trailing white space in all its forms. In addition to being
bad style in general, it also causes formatting, and other problems
for various third party items (like xscreensaver) which use fortunes
for their own purposes.

Add a few more tips, and tweak a couple.

PR: misc/34039

Augment the BLOCKSIZE tip. (Based on the PR with slight changes by myself).

PR: misc/34039

Add a tip about pkg_info and checking for multiple installed versions
of a package/port.

Modify tip that no longer applies for ftp(1).

Other committers do not mention their personal names and/or email
addresses when adding stuff, so it seems fair to stop ``getting all
the fame'' by having my name displayed on login sessions.

Approved by: nik

Tip Correction : s/seconds/minutes/

PR: docs/30844
Submitted by: Andrew <andrew@ugh.net.au>

Move /etc/defaults/make.conf to /usr/share/examples/etc/make.conf as
discussed on the arch@ mailinglist (after repo-copy).

sys.mk will .error if it finds /etc/defaults/make.conf but include
it anyways (this is the same behaviour as with the make.conf.local
removal).

/usr/share/examples/etc/make.conf has BDEFLAGS commented out now,
since it's only an example file.

Adjust all textes that talk about make.conf or defaults/make.conf to
match the new situation.

Remove whitespace after %. The whitespace was causing strfile to not see
the % string section break and thus fortune was producing a rather large
multi-fortune fortune message.

Fix a couple of typos.

Remove two duplicate tips and correct formatting of an attribution.

What to do when :w tells you you haven't got permission.

Mention that sh supports command line editing

Mention that vi supports split-screen mode.

Suggest using .login/.profile to set environment variables, not
.cshrc/.bashrc/.zshrc/.shrc

"Unmount" is spelled "umount", not "unmount".

Fix a couple of tips, and add a new one.

Submitted by: Alexey V. Neyman <avn@any.ru>

Correct some typos.

PR: 28251
Submitted by: Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>

More tips. I'd never heard of look(1) before.

Submitted by: Dru <genisis@istar.ca>

More tips, this time from the Russian Fidonet FreeBSD Echo.

And I never knew about ports(7) before.

Submitted by: Alexey V. Neyman <avn@any.ru>

De-credit myself in order to be consistent.
Also add a few more tips while I am here.

More tips.

Submitted by: David Scheidt <dscheidt@tumbolia.com>

Add a new category of fortunes, 'freebsd-tips'. Useful hints, advice, and
pointers to areas of the system that might not be apparent on first
inspection.