13 files changed, 30 insertions, 23 deletions
diff --git a/misc/freebsd-doc-all/Makefile b/misc/freebsd-doc-all/Makefile
index 9a4ab736c49b..187ae9438fcb 100644
--- a/misc/freebsd-doc-all/Makefile
+++ b/misc/freebsd-doc-all/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc-all
-PORTVERSION=	46616
+PORTVERSION=	46935
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	#empty
diff --git a/misc/freebsd-doc-de/pkg-plist.html-split b/misc/freebsd-doc-de/pkg-plist.html-split
index 592420f29ff1..33a6a390f4b3 100644
--- a/misc/freebsd-doc-de/pkg-plist.html-split
+++ b/misc/freebsd-doc-de/pkg-plist.html-split
@@ -135,6 +135,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/x.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build-makefiles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/doc-build.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/docbook-markup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/editor-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-docbook-article.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples-formatted.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/examples.html
@@ -142,14 +144,12 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/ix01.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/legalnotice.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/make-includes.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-before.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview-quick-start.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/overview.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-acknowledgements.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-conventions.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface-notes.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/preface.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/psgml-mode.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-docbook.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-html.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/see-also-linuxdoc.html
@@ -160,17 +160,23 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/structure.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets-css.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/stylesheets.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-build.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-env.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/the-website.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools-optional.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/tools.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/translations.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-checking-out.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-directory.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-choosing-mirror.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-making-diff.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-revert.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-subversion-references.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy-updating.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/working-copy.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style-word-list.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/writing-style.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup-docbook.html
-%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-markup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xhtml-markup.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-comments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/books/fdp-primer/xml-primer-doctype-declaration.html
@@ -248,6 +254,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-rcd.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-starting-services.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-sysctl.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-syslog.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/configtuning-virtual-hosts.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/consoles.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/creating-cds.html
@@ -276,7 +283,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-enable.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-implementation.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-language.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/dtrace.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/editors.html
@@ -284,7 +290,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-news.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources-web.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/eresources.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-zfs.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems-linux.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/filesystems.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-apps.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/firewalls-concepts.html
@@ -370,7 +376,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mail.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/make-delete-old.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/makeworld.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-afs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-bittorrent.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-ftp.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/mirrors-rsync.html
@@ -446,6 +451,8 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/snapshots.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-mp3.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/sound-setup.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn-mirrors.html
+%%DOCSDIR%%/%%DOCLANG%%/books/handbook/svn.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/swap-encrypting.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/synching.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/system-administration.html
diff --git a/misc/freebsd-doc-en/Makefile b/misc/freebsd-doc-en/Makefile
index 7b45f4579ec2..bb23be6f71d5 100644
--- a/misc/freebsd-doc-en/Makefile
+++ b/misc/freebsd-doc-en/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freebsd-doc
-PORTVERSION=	46616
-PORTREVISION=	1
+PORTVERSION=	46935
 PORTEPOCH=	1
 CATEGORIES=	misc docs
 MASTER_SITES=	LOCAL/blackend
diff --git a/misc/freebsd-doc-en/distinfo b/misc/freebsd-doc-en/distinfo
index 9fe31473fd85..d862ae8f3a26 100644
--- a/misc/freebsd-doc-en/distinfo
+++ b/misc/freebsd-doc-en/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freebsd-doc-46616.tar.gz) = 27cd14dd93fa22f2d4e4a2c016e7eed834be7c2fa0c41c9bfd59858b64904059
-SIZE (freebsd-doc-46616.tar.gz) = 34832475
+SHA256 (freebsd-doc-46935.tar.gz) = 0350d62fce4897cf647e9ead12f65d530b89b37daaa3b941579fa6257a6f49e1
+SIZE (freebsd-doc-46935.tar.gz) = 37115231
diff --git a/misc/freebsd-doc-en/pkg-plist.html b/misc/freebsd-doc-en/pkg-plist.html
index 64aa0cdc1a26..cfec882269cf 100644
--- a/misc/freebsd-doc-en/pkg-plist.html
+++ b/misc/freebsd-doc-en/pkg-plist.html
@@ -14,6 +14,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.html
diff --git a/misc/freebsd-doc-en/pkg-plist.html-common b/misc/freebsd-doc-en/pkg-plist.html-common
index 26dd05bf52ac..a02ae7b2f6f7 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-common
+++ b/misc/freebsd-doc-en/pkg-plist.html-common
@@ -26,6 +26,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/docbook.css
diff --git a/misc/freebsd-doc-en/pkg-plist.html-split b/misc/freebsd-doc-en/pkg-plist.html-split
index 6ac72e9a38d4..c6ede54ef1d4 100644
--- a/misc/freebsd-doc-en/pkg-plist.html-split
+++ b/misc/freebsd-doc-en/pkg-plist.html-split
@@ -141,6 +141,11 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/ssl-ca.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/useful.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/index.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-cautions.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-conclusion.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-posix.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/leapseconds-testing.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/conclusion.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/freebsd-emulation.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/index.html
diff --git a/misc/freebsd-doc-en/pkg-plist.pdf b/misc/freebsd-doc-en/pkg-plist.pdf
index 0616b7794700..51d3a7a07163 100644
--- a/misc/freebsd-doc-en/pkg-plist.pdf
+++ b/misc/freebsd-doc-en/pkg-plist.pdf
@@ -14,6 +14,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.pdf
diff --git a/misc/freebsd-doc-en/pkg-plist.ps b/misc/freebsd-doc-en/pkg-plist.ps
index 374d047357ee..168fd91c35c4 100644
--- a/misc/freebsd-doc-en/pkg-plist.ps
+++ b/misc/freebsd-doc-en/pkg-plist.ps
@@ -14,6 +14,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.ps
diff --git a/misc/freebsd-doc-en/pkg-plist.txt b/misc/freebsd-doc-en/pkg-plist.txt
index 84a275a28d1a..d7155b1d6c8e 100644
--- a/misc/freebsd-doc-en/pkg-plist.txt
+++ b/misc/freebsd-doc-en/pkg-plist.txt
@@ -16,6 +16,7 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/hubs/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ipsec-must/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/ldap-auth/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/leap-seconds/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-emulation/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/linux-users/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/mailing-list-faq/article.txt
diff --git a/misc/freebsd-doc-fr/pkg-plist.html-split b/misc/freebsd-doc-fr/pkg-plist.html-split
index 8ef29a759ba5..1f13de22e8cc 100644
--- a/misc/freebsd-doc-fr/pkg-plist.html-split
+++ b/misc/freebsd-doc-fr/pkg-plist.html-split
@@ -437,7 +437,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-administration.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-config.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-inline-glossary.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit-install.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/audit.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-basics.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/backup-strategies.html
@@ -639,8 +638,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/outgoing-only.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/packages-using.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/permissions.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-core.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys-developers.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/pgpkeys.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-broken.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/ports-finding-applications.html
diff --git a/misc/freebsd-doc-ja/pkg-plist.html-split b/misc/freebsd-doc-ja/pkg-plist.html-split
index 169faee68247..d6da7304cb34 100644
--- a/misc/freebsd-doc-ja/pkg-plist.html-split
+++ b/misc/freebsd-doc-ja/pkg-plist.html-split
@@ -111,7 +111,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-final-warning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-hardware.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-install-trouble.html
-%%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-netinstall.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-partitioning.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-post.html
 %%DOCSDIR%%/%%DOCLANG%%/books/handbook/bsdinstall-pre.html
diff --git a/misc/freebsd-doc-ru/pkg-plist.html-split b/misc/freebsd-doc-ru/pkg-plist.html-split
index 35c2e46a0f55..5bf9f198a606 100644
--- a/misc/freebsd-doc-ru/pkg-plist.html-split
+++ b/misc/freebsd-doc-ru/pkg-plist.html-split
@@ -23,7 +23,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-printers.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-configuring-server.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-install.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-ports-knobs.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/printing-cups-troubleshooting.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cups/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/compairing-bsd-and-linux.html
@@ -94,7 +93,6 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/next-steps.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other-useful-commands.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/other.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/printing-files-from-dos.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/trademarks.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/your-working-environment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/pam/index.html
@@ -157,16 +155,13 @@
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/acknowledgments.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/admin.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/advanced.html
+%%DOCSDIR%%/%%DOCLANG%%/books/faq/all-about-zfs.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/applications.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/bibliography.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/commercial.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-drives.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-kbd-mice.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-memory.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-networking.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-other.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-processors.html
-%%DOCSDIR%%/%%DOCLANG%%/books/faq/compatibility-sound.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/disks.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/funnies.html
 %%DOCSDIR%%/%%DOCLANG%%/books/faq/hardware.html