D37143.id112309.diff
No OneTemporary
Actions

Size

14 KB

Referenced Files

None

Subscribers

None

D37143.id112309.diff
View Options

	Index: documentation/Makefile
	===================================================================
	--- documentation/Makefile
	+++ documentation/Makefile
	@@ -32,17 +32,18 @@
	ALL_LANGUAGES= bn-bd da de el en es fr hu id it ja ko mn nl pl pt-br ru tr zh-cn zh-tw

	LOCALBASE?= /usr/local
	+GEM_PATH?= ${LOCALBASE}

	-RUBY_CMD = ${LOCALBASE}/bin/ruby
	+RUBY_CMD = ${GEM_PATH}/bin/ruby
	HUGO_CMD = ${LOCALBASE}/bin/hugo
	HUGO_ARGS?= --verbose --minify
	HUGO_OFFLINE_ARGS?= --environment offline --verbose --minify
	-ASCIIDOCTOR_CMD= ${LOCALBASE}/bin/asciidoctor
	-ASCIIDOCTORPDF_CMD= ${LOCALBASE}/bin/asciidoctor-pdf
	+ASCIIDOCTOR_CMD= ${GEM_PATH}/bin/asciidoctor
	+ASCIIDOCTORPDF_CMD= ${GEM_PATH}/bin/asciidoctor-pdf

	.if defined(DOC_LANG) && !empty(DOC_LANG)
	LANGUAGES= ${DOC_LANG:S/,/ /g}
	-.if ${LANGUAGES:Men} == "" && ${.TARGETS:Mpdf} == "" && ${.TARGETS:Mhtml} == ""
	+.if ${LANGUAGES:Men} == "" && ${TARGETS:Mpdf} == "" && ${.TARGETS:Mhtml} == ""
	.warning "Warning: cannot skip 'en'; adding it back"
	LANGUAGES+= en
	.endif
	@@ -54,8 +55,8 @@
	.export RUBYLIB

	RUN_DEPENDS= ${HUGO_CMD} \
	- ${LOCALBASE}/bin/asciidoctor \
	- ${LOCALBASE}/bin/rougify
	+ ${GEM_PATH}/bin/asciidoctor \
	+ ${GEM_PATH}/bin/rougify

	.ifndef HOSTNAME
	. ifdef BIND
	@@ -111,13 +112,13 @@
	.endfor

	requirements-pdf:
	-.if !exists(${LOCALBASE}/bin/asciidoctor-pdf)
	- @(echo ${LOCALBASE}/bin/asciidoctor-pdf not found, please run 'pkg install rubygem-asciidoctor-pdf'; exit 1)
	+.if !exists(${GEM_PATH}/bin/asciidoctor-pdf)
	+ @(echo ${GEM_PATH}/bin/asciidoctor-pdf not found, please run 'pkg install rubygem-asciidoctor-pdf'; exit 1)
	.endif

	requirements-epub:
	-.if !exists(${LOCALBASE}/bin/asciidoctor-epub3)
	- @(echo ${LOCALBASE}/bin/asciidoctor-epub3 not found, please run 'pkg install rubygem-asciidoctor-epub3'; exit 1)
	+.if !exists(${GEM_PATH}/bin/asciidoctor-epub3)
	+ @(echo ${GEM_PATH}/bin/asciidoctor-epub3 not found, please run 'pkg install rubygem-asciidoctor-epub3'; exit 1)
	.endif

	starting-message: .PHONY
	Index: documentation/content/en/books/fdp-primer/overview/_index.adoc
	===================================================================
	--- documentation/content/en/books/fdp-primer/overview/_index.adoc
	+++ documentation/content/en/books/fdp-primer/overview/_index.adoc
	@@ -251,21 +251,21 @@
	+
	[source,shell]
	....
	-$ brew install hugo ruby git bmake asciidoctor
	+$ brew install hugo ruby git bmake
	....
	+
	. Add Ruby to the Path.
	+
	[source,shell]
	....
	-$ echo 'export PATH="/usr/local/opt/ruby/bin:$PATH"' >> ~/.zshrc
	+$ echo 'export PATH="$(brew --prefix ruby)/bin:$PATH"' >> ~/.zshrc
	....
	+
	. Install the rouge package using RubyGem.
	+
	[source,shell]
	....
	-$ sudo gem install rouge
	+$ sudo gem install rouge asciidoctor asciidoctor-pdf asciidoctor-epub3
	....
	+
	. Install a local working copy of the documentation from the FreeBSD repository in [.filename]#~/doc# (see crossref:working-copy[working-copy,The Working Copy]).
	@@ -284,7 +284,7 @@
	+
	[source,shell]
	....
	-$ bmake run LOCALBASE=/usr
	+$ bmake run LOCALBASE=/usr GEM_PATH=/usr/local/lib/ruby/gems/[ruby_version]
	....
	. Add all the files with `git add .`, then review the diff with `git diff`. For example:
	+
	Index: documentation/content/en/books/porters-handbook/uses/_index.adoc
	===================================================================
	--- documentation/content/en/books/porters-handbook/uses/_index.adoc
	+++ documentation/content/en/books/porters-handbook/uses/_index.adoc
	@@ -1074,25 +1074,6 @@

	For more information see crossref:special[using-lua,Using Lua].

	-[[uses-luajit]]
	-== `luajit`
	-
	-Possible arguments: (none), `_X_`
	-
	-Adds a dependency on luajit runtime.
	-A specific version _X_ can be used. Possible versions are `luajit`, `luajit-devel`, `luajit-openresty`
	-
	-After including [.filename]#bsd.port.options.mk# or [.filename]#bsd.port.pre.mk# the port can inspect these variables:
	-
	-`LUAJIT_VER`::
	-The selected luajit version
	-`LUAJIT_INCDIR`::
	-The path to luajit's header files
	-`LUAJIT_LUAVER`::
	-Which luajit spec version is selected (2.0 for luajit, else 2.1)
	-
	-For more information see crossref:special[using-lua,Using Lua].
	-
	[[uses-lxqt]]
	== `lxqt`

	Index: documentation/static/pgpkeys/meta.key
	===================================================================
	--- documentation/static/pgpkeys/meta.key
	+++ documentation/static/pgpkeys/meta.key
	@@ -2,12 +2,12 @@

	[.literal-block-margin]
	....
	-pub rsa4096/9F72CDBC01BF10EB 2017-06-20 [SC] [expires: 2023-10-27]
	+pub rsa4096/9F72CDBC01BF10EB 2017-06-20 [SC] [expires: 2022-09-21]
	Key fingerprint = 61EC EABB F2BB 40E3 A35D F30A 9F72 CDBC 01BF 10EB
	uid Koichiro IWAO <meta@vmeta.jp>
	uid Koichiro Iwao <meta@FreeBSD.org>
	-sub rsa4096/77C1E7C4CCDE08AA 2017-06-20 [E] [expires: 2023-10-27]
	-sub rsa4096/03993B4065E7193B 2020-06-06 [S] [expires: 2023-10-27]
	+sub rsa4096/77C1E7C4CCDE08AA 2017-06-20 [E] [expires: 2022-09-21]
	+sub rsa4096/03993B4065E7193B 2020-06-06 [S] [expires: 2022-09-21]

	....

	@@ -28,32 +28,32 @@
	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
	@@ -65,18 +65,18 @@
	+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
	@@ -88,7 +88,7 @@
	ijxR8fGynsvYIM+Da+8VVb7qGKOJ/hfL5l8w+lPg4kUUOcOJdbgWneXMpcNvaDlG
	QgRb/87F1cAUzxF+tmIiAwAO7CuH4nSObjkv64mE+5m5c8tEkkV3JwowCluhOSrX
	iPNS/UDGlf2gmPfBGOM66leMuL74MV1vABEBAAGJBHIEGAEIACYCGwIWIQRh7Oq7
	-8rtA46Nd8wqfcs28Ab8Q6wUCY1oPaAUJBl+MtAJAwXQgBBkBCAAdFiEEGKuDipBx
	+8rtA46Nd8wqfcs28Ab8Q6wUCYUmKawUJBE8HtwJAwXQgBBkBCAAdFiEEGKuDipBx
	Z3RZFIcZA5k7QGXnGTsFAl7btjQACgkQA5k7QGXnGTtGwg//UXtfGouT3ScI+5Jy
	PZl4VunOJ/Br8qLGyCW2O7a/NVC3c29HrYKOQnQMfw9qzoOVYTVuhbLIRO5MFwaj
	NrJHIHaowre4mzTn/20aN+e/zOObZqurzY55GY/dE+55yEkbjlf7+n2FLECMERTK
	@@ -100,18 +100,18 @@
	rcRu8h8PLCCYdO5KjeqLfgHOglSDStavm7h3/Lr1k+RxdcJ4JV2uKvjVZ7m/32Bu
	V/zUzltpkq2dOUDw5klHGJCgwoOt8NJ7Zye4bRsqiUXXiGL3ejshj6GuWTzkZ9XD
	Mmv3zfEXVTXOWE6ICKywPPnqaQfsd3FelyOuoQrKtoLyB/k25E5XEFtbs+V5R/jx
	-j7nLC9axZ6coz1zHACCjP++eSlwJEJ9yzbwBvxDrzI4P/jD3sJhZOMGzBbqan9+5
	-6ys+zo0qniPUN23whPqrTQ8JjkO2YxPiFEhU1sChRgOux8WU0i3MLJNS6sUF3z/B
	-lqlJjsvCoeLJiVb5yVUxUFnQ1kj71rDLRh0qD7i4e6wufTOKtKstvhJoasYpy4ic
	-h7TRLxIIS9lqURf1M2CgZyt2Wc/xi4mkUxUquoDas4d5N7bg+0YWL7W8u4ISk4/L
	-+Xyu+qpiVmBHkRh8UARrqH7skMmkZ8QxKiO8r61XWahhXaOQgcZSXs87EmBsa04P
	-9em4czOQfNGvIKtujQ2tILcodjiGUEDcTXUe6oIwBVMUBXr+dkk5xd6EwWj8kDp1
	-a6zXGJaZO/tI7bfBVUkRzkriHAqWdtJctETUTCfP47PBlx2K54pgmmbi0XDLKz5x
	-inHO9iPpoeESrAx1JUKS9Q7XySdl9IfosK8TCYxmvGNunlFiWZopodxbUBjWHx8S
	-Tt+TTE0QDCex7P1O0r0p5b7MsrP49LDDk8a7rarGfgME9R4hGI1q1p3C2A+sTB+u
	-7lwYnwks9m+/MF4Jx2Avk6XzxCD6B4TiTuYGtv2m0O2zmJx0NHY303/OlN2Rt7E8
	-GJx3t69UkvarsGKh0yEx6ufei3sh6U16wfgWa5paMfXQk1pQRzM/DWM9/pML6Cj7
	-H7u/ixKuickf4TWzIfbH+eEN
	-=D6pK
	+j7nLC9axZ6coz1zHACCjP++eSlwJEJ9yzbwBvxDrIc4P/39+6H0FcxTaeQftlT62
	+h1FyG5cBKfmeJGqUQA5gzgeJgz+YFUQd7Mq6kUqdI1MRig6POTNVCCrasZ2Wa74k
	+t7iv82vrCCGHuMIlJCRlYmeRCP6/pgzZh1m/iD4Jwz74fB8QIWoctBsB6rWUBtWB
	+OxlXb7iKqiVOkd1dlnGOYgA66ujIXeqUaVYWiPfv2RDnte+hLrlrFYOKjvPHjJW4
	+y27lgpPdx4hR3LXWHvRSbwSet5LkbiqxouaaWKtR+Qcy4YSSKIbH5Np2TKbwrFcN
	+7bj2P+r59G2PCT0VhicvhzP/x4gvlE5ceUaxdl5YyQfX4ILKOnvFRLsJxLsZWJ1n
	+aYrMjtMkXwnithZtFf7fkpGZCUiATLdsYgavjltb+q80iEy/XAfckSOl+eV2GLV6
	+5mcGMClWj5HL64Y0qPxaTvZfW1WNOyrWSI1GNkTPNZtRaikHyK1D6npXmP/JTlID
	+eTFUQ3dxlnhFLdtivQwnWiIqtOdpnYmJpyMR8xIAw6tdIAahVOiBDyRveEOIigBk
	+nR0jBzh2x9ToYpF4ofcEsWkjlTwCvhT+9x3+hbQDAIobqSnTusx4SXfZsYSRtZmX
	+8W3l6bKkLOypYGTCNFYCfFyGILljxR9998k5Ehj96oOWqIv6FcZsWwIRZOCNBpIx
	+BIpZlccjIn2Zsqgg/VlMpZGQ
	+=f36j
	-----END PGP PUBLIC KEY BLOCK-----
	....
	Index: website/content/en/administration.adoc
	===================================================================
	--- website/content/en/administration.adoc
	+++ website/content/en/administration.adoc
	@@ -151,13 +151,11 @@
	The FreeBSD Security Officer Charter describes the duties and responsibilities of the Security Officer in greater detail.

	* {gordon} (Officer)
	-* {bapt} (Core Team Liaison)
	* {delphij} (Officer Emeritus, Release Engineering Team Liaison)
	* {des} (Officer Emeritus)
	* {gjb} (Cluster Administrators Team Liaison)
	* {emaste} (Officer Deputy)
	* {markj}
	-* {oshogbo}
	* {philip}

	[[t-vendor]]
	Index: website/content/en/releases/12.4R/schedule.adoc
	===================================================================
	--- website/content/en/releases/12.4R/schedule.adoc
	+++ website/content/en/releases/12.4R/schedule.adoc
	@@ -31,7 +31,8 @@
	\|Code slush begins \|7 October 2022 \|7 October 2022 \|Release Engineers announce that all further commits to the {localBranchStable} branch will not require explicit approval, however new features should be avoided.
	\|{localBranchReleng} branch \|21 October 2022 \|20 October 2022 \|{localBranchReleng} branch created; future release engineering proceeds on this branch.
	\|BETA1 builds begin \|21 October 2022 \|21 October 2022 \|First beta test snapshot.
	-\|BETA2 builds begin* \|4 November 2022 \|- \|Second beta test snapshot.
	+\|BETA2 builds begin \|28 October 2022 \|- \|Second beta test snapshot.
	+\|BETA3 builds begin* \|4 November 2022 \|- \|Third beta test snapshot.
	\|RC1 builds begin \|11 November 2022 \|- \|First release candidate.
	\|RC2 builds begin \|18 November 2022 \|- \|Second release candidate.
	\|RC3 builds begin* \|25 November 2022 \|- \|Third release candidate.

File Metadata

Mime Type: text/plain
Expires: Wed, Apr 29, 11:04 PM (15 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 32407940
Default Alt Text: D37143.id112309.diff (14 KB)

D37143.id112309.diffNo OneTemporaryActions

D37143.id112309.diffView Options

File Metadata

Event Timeline

D37143.id112309.diff
No OneTemporary
Actions

D37143.id112309.diff
View Options