- Merge the following from the English version:

	r45596 -> r46055	head/ja_JP.eucJP/books/handbook/preface/preface.xml


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46071 c2e8774f-c49f-e111-b436-862b2bbc8956
Properly format this paragraph to replace spaces with tabs.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46072 c2e8774f-c49f-e111-b436-862b2bbc8956
- point to correct url, as this does not resolve

PR:		195714
Differential Revision:	https://reviews.freebsd.org/D1270
Submitted by:	pt307@cam.ac.uk
Approved by:	bcr (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46073 c2e8774f-c49f-e111-b436-862b2bbc8956
Reorder advisories so they show up in consistent order.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46074 c2e8774f-c49f-e111-b436-862b2bbc8956
Document __FreeBSD_version values 1100048 and 1100049.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46075 c2e8774f-c49f-e111-b436-862b2bbc8956
- Merge the following from the English version:

	r46000 -> r46041	head/ja_JP.eucJP/share/xml/navibar.l10n.ent


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46076 c2e8774f-c49f-e111-b436-862b2bbc8956
Use <programlisting> and <callout> instead of <procedure>.

Discussed with:	bcr


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46077 c2e8774f-c49f-e111-b436-862b2bbc8956
Rework desktop and linuxemu bits for c6.

Now that ports defaults to CentOS 6.6, redo the relevant handbook bits,
replacing Fedora 10 with CentOS 6.6. While there, improve the wording a little.

Differential Revision:	https://reviews.freebsd.org/D1117
Approved by:	wblock, bcr
Approved by:	swills (mentor)


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46078 c2e8774f-c49f-e111-b436-862b2bbc8956
Update freebsd-update major upgrade instructions to offer 'pkg upgrade' in addition to portmaster.

Differential Revision:	https://reviews.freebsd.org/D1288
Reviewed by:	bapt
Approved by:	bcr (mentor)
Sponsored by:	ScaleEngine Inc.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46079 c2e8774f-c49f-e111-b436-862b2bbc8956
Fix a typo

Obtained from:	bjk


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46080 c2e8774f-c49f-e111-b436-862b2bbc8956
Fix indent.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46081 c2e8774f-c49f-e111-b436-862b2bbc8956
- Merge the following from the English version:

	r45818 -> r46081	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46082 c2e8774f-c49f-e111-b436-862b2bbc8956
Add SA-14:2[789]


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46083 c2e8774f-c49f-e111-b436-862b2bbc8956
Add the freebsd-translators mailing list.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46084 c2e8774f-c49f-e111-b436-862b2bbc8956
Add new events for 2015
- FOSDEM (31/01-1/02), BELGIUM
- Solutions Linux (20/05-21/05), FRANCE

PR:		195408
Submitted by:	rodrigo


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46085 c2e8774f-c49f-e111-b436-862b2bbc8956
Document the three consecutive timeouts policy that we've had for years.

Sponsored by:	Absolight


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46086 c2e8774f-c49f-e111-b436-862b2bbc8956
- Merge the following from the English version:

	r45719 -> r46080	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46087 c2e8774f-c49f-e111-b436-862b2bbc8956
- Add Max V. Kostikov for net/megatools


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46088 c2e8774f-c49f-e111-b436-862b2bbc8956
For sysutils/renameutils

PR:		194045


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46089 c2e8774f-c49f-e111-b436-862b2bbc8956
Document __FreeBSD_version values 903507, 1001503, 1001504 and 110044.


git-svn-id: svn+ssh://svn.freebsd.org/doc/head@46090 c2e8774f-c49f-e111-b436-862b2bbc8956