- Merge the following from the English version:

	r45596 -> r46055	head/ja_JP.eucJP/books/handbook/preface/preface.xml
Properly format this paragraph to replace spaces with tabs.
- 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)
Reorder advisories so they show up in consistent order.
Document __FreeBSD_version values 1100048 and 1100049.
- Merge the following from the English version:

	r46000 -> r46041	head/ja_JP.eucJP/share/xml/navibar.l10n.ent
Use <programlisting> and <callout> instead of <procedure>.

Discussed with:	bcr
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)
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.
Fix a typo

Obtained from:	bjk
Fix indent.
- Merge the following from the English version:

	r45818 -> r46081	head/ja_JP.eucJP/books/handbook/desktop/chapter.xml
Add SA-14:2[789]
Add the freebsd-translators mailing list.
Add new events for 2015
- FOSDEM (31/01-1/02), BELGIUM
- Solutions Linux (20/05-21/05), FRANCE

PR:		195408
Submitted by:	rodrigo
Document the three consecutive timeouts policy that we've had for years.

Sponsored by:	Absolight
- Merge the following from the English version:

	r45719 -> r46080	head/ja_JP.eucJP/books/handbook/cutting-edge/chapter.xml
- Add Max V. Kostikov for net/megatools
For sysutils/renameutils

PR:		194045
Document __FreeBSD_version values 903507, 1001503, 1001504 and 110044.