- Update to doc/ tree version 20090525;

- Add Options menu;
- Add MAKE_JOBS_SAFE knob.

Approved by:	doceng (implicit)

7 files changed, 19 insertions, 10 deletions

diff --git a/misc/freebsd-doc-el/pkg-plist.common b/misc/freebsd-doc-el/pkg-plist.common
index f074a4c75a17..faf04eb0d9ac 100644
--- a/misc/freebsd-doc-el/pkg-plist.common
+++ b/misc/freebsd-doc-el/pkg-plist.common
@@ -28,6 +28,7 @@
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd
+@dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/contributing
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl
 @dirrm %%DOCSDIR%%/%%DOCLANG%%/articles
diff --git a/misc/freebsd-doc-el/pkg-plist.html b/misc/freebsd-doc-el/pkg-plist.html
index 13e70d42bea7..e8a6a5c09096 100644
--- a/misc/freebsd-doc-el/pkg-plist.html
+++ b/misc/freebsd-doc-el/pkg-plist.html
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.html
diff --git a/misc/freebsd-doc-el/pkg-plist.html-common b/misc/freebsd-doc-el/pkg-plist.html-common
index 935dddadff7c..941d9b37cd71 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-common
+++ b/misc/freebsd-doc-el/pkg-plist.html-common
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/docbook.css
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/docbook.css
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/docbook.css
diff --git a/misc/freebsd-doc-el/pkg-plist.html-split b/misc/freebsd-doc-el/pkg-plist.html-split
index 47a1b09f4772..1b7df4b9c756 100644
--- a/misc/freebsd-doc-el/pkg-plist.html-split
+++ b/misc/freebsd-doc-el/pkg-plist.html-split
@@ -19,6 +19,9 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/nvidia-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/xorg-configuration.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/contrib-how.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/first-setup.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/freebsdspecific.html
@@ -91,17 +94,17 @@
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/howto.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/nanobsd/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/TRADEMARKS.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/adding-a-user.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/comments-welcome.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/editing-text.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/getting-help.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/new-users/index.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x131.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x226.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x344.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x484.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x550.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x619.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x699.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x71.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x773.html
-%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/x786.html
+%%DOCSDIR%%/%%DOCLANG%%/articles/new-users/looking-around.html
+%%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/your-working-environment.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/TRADEMARKS.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/index.html
 %%DOCSDIR%%/%%DOCLANG%%/articles/problem-reports/pr-followup.html
diff --git a/misc/freebsd-doc-el/pkg-plist.pdf b/misc/freebsd-doc-el/pkg-plist.pdf
index f1c3b023202c..f8a84c82c8c8 100644
--- a/misc/freebsd-doc-el/pkg-plist.pdf
+++ b/misc/freebsd-doc-el/pkg-plist.pdf
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.pdf
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.pdf
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.pdf
diff --git a/misc/freebsd-doc-el/pkg-plist.ps b/misc/freebsd-doc-el/pkg-plist.ps
index 93d4d89e16fb..8e76fb3eac84 100644
--- a/misc/freebsd-doc-el/pkg-plist.ps
+++ b/misc/freebsd-doc-el/pkg-plist.ps
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.ps
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.ps
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.ps
diff --git a/misc/freebsd-doc-el/pkg-plist.txt b/misc/freebsd-doc-el/pkg-plist.txt
index 72a243299c57..6a47853dbfa7 100644
--- a/misc/freebsd-doc-el/pkg-plist.txt
+++ b/misc/freebsd-doc-el/pkg-plist.txt
@@ -1,6 +1,7 @@
 @comment $FreeBSD$
 %%DOCSDIR%%/%%DOCLANG%%/articles/bsdl-gpl/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/compiz-fusion/article.txt
+%%DOCSDIR%%/%%DOCLANG%%/articles/contributing/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/cvs-freebsd/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/dialup-firewall/article.txt
 %%DOCSDIR%%/%%DOCLANG%%/articles/explaining-bsd/article.txt