From owner-dev-commits-doc-all@freebsd.org Tue Jul 13 15:46:58 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4ACBD660CB6 for ; Tue, 13 Jul 2021 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPQ421Msgz3kyX; Tue, 13 Jul 2021 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 176B025117; Tue, 13 Jul 2021 15:46:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16DFkvlD036823; Tue, 13 Jul 2021 15:46:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16DFkvAL036822; Tue, 13 Jul 2021 15:46:57 GMT (envelope-from git) Date: Tue, 13 Jul 2021 15:46:57 GMT Message-Id: <202107131546.16DFkvAL036822@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: fa1a2ade0f - internal/admin - Add philip as a new documentation committer MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: fa1a2ade0fbd877c5f2b5bd54feeace4df2b2c6e Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2021 15:46:58 -0000 The branch internal/admin has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=fa1a2ade0fbd877c5f2b5bd54feeace4df2b2c6e commit fa1a2ade0fbd877c5f2b5bd54feeace4df2b2c6e Author: Glen Barber AuthorDate: 2021-07-13 15:45:51 +0000 Commit: Glen Barber CommitDate: 2021-07-13 15:46:44 +0000 Add philip as a new documentation committer I will be philip's mentor. Approved by: doceng (implicit) Sponsored by: Rubicon Communications, LLC ("Netgate") --- access | 1 + mentors | 1 + 2 files changed, 2 insertions(+) diff --git a/access b/access index 74db9dcfad..cecd182f5c 100644 --- a/access +++ b/access @@ -54,6 +54,7 @@ marck mat maxim murray +philip pluknet rcyu rene diff --git a/mentors b/mentors index 7cd5cdb364..03f7de1b97 100644 --- a/mentors +++ b/mentors @@ -11,3 +11,4 @@ # Mentee Mentor Optional comment murray bcr +philip gjb From owner-dev-commits-doc-all@freebsd.org Wed Jul 14 02:41:37 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6FBFE66AD15 for ; Wed, 14 Jul 2021 02:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPhbP2jyYz3Pv1; Wed, 14 Jul 2021 02:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45870605B; Wed, 14 Jul 2021 02:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16E2fbcA015780; Wed, 14 Jul 2021 02:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16E2fbY3015779; Wed, 14 Jul 2021 02:41:37 GMT (envelope-from git) Date: Wed, 14 Jul 2021 02:41:37 GMT Message-Id: <202107140241.16E2fbY3015779@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Philip Paeps Subject: git: c40011e433 - main - website: announce my enhanced commit privileges MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c40011e433a2c886196218e60dcdd68609ed6b76 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 02:41:37 -0000 The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/doc/commit/?id=c40011e433a2c886196218e60dcdd68609ed6b76 commit c40011e433a2c886196218e60dcdd68609ed6b76 Author: Philip Paeps AuthorDate: 2021-07-14 02:38:35 +0000 Commit: Philip Paeps CommitDate: 2021-07-14 02:38:35 +0000 website: announce my enhanced commit privileges I now have the full set of commit bits. Approved by: gjb (mentor, implicit) --- website/data/en/news/news.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/website/data/en/news/news.toml b/website/data/en/news/news.toml index 2ca9215c08..7d392ad839 100644 --- a/website/data/en/news/news.toml +++ b/website/data/en/news/news.toml @@ -1,5 +1,9 @@ # Sort news by year, month and day +[[news]] +date = "2021-07-13" +description = "Enhanced commit privileges: Philip Paeps (src, ports, doc)" + [[news]] date = "2021-05-17" description = "Enhanced commit privileges: Guangyuan Yang (doc, ports)" From owner-dev-commits-doc-all@freebsd.org Wed Jul 14 10:35:34 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9079C66FF4F for ; Wed, 14 Jul 2021 10:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GPv6G3bZ4z4V3t; Wed, 14 Jul 2021 10:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 65029143FD; Wed, 14 Jul 2021 10:35:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EAZYmQ045445; Wed, 14 Jul 2021 10:35:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EAZYDT045444; Wed, 14 Jul 2021 10:35:34 GMT (envelope-from git) Date: Wed, 14 Jul 2021 10:35:34 GMT Message-Id: <202107141035.16EAZYDT045444@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 27a51efaa2 - main - documentation/Makefile: Add HTML targets for offline use MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 27a51efaa2d42b4625214533dba414b3b140e573 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 10:35:34 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=27a51efaa2d42b4625214533dba414b3b140e573 commit 27a51efaa2d42b4625214533dba414b3b140e573 Author: Marc Fonvieille AuthorDate: 2021-07-14 10:28:49 +0000 Commit: Marc Fonvieille CommitDate: 2021-07-14 10:28:49 +0000 documentation/Makefile: Add HTML targets for offline use Addition of various HTML targets allowing the build of books, articles with the choice of the language. For example, to build both en_US and fr_FR books, use: make DOC_LANG="en fr" html-books Documents are installed in documentation/public/lang/. Targets to clean the builds are also available. The produced files do not include some metadatas, they are intended for offline use. Reviewed by: ceri Differential Revision: https://reviews.freebsd.org/D30718 --- documentation/Makefile | 198 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 174 insertions(+), 24 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index 7cbb8cec4d..3ccfc6ca7b 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -9,6 +9,8 @@ # clean - removes generated files # run - serves the built documentation site for local browsing # pdf - build PDF versions of the articles and books. +# html - build HTML versions of the articles and books for +# offline use # # The run target uses hugo's built-in webserver to make the documentation site # available for local browsing. The documentation should have been built prior @@ -19,6 +21,8 @@ MAINTAINER=carlavilla@FreeBSD.org # List of languages without book translations ARTICLEONLY_LANGS= bd da ko tr +# List of languages without article translations +BOOKONLY_LANGS= mn # List of all languages we have content for ALL_LANGUAGES= bd da de el en es fr hu it ja ko mn nl pl pt-br ru tr zh-cn zh-tw @@ -29,11 +33,12 @@ PYTHON_CMD = ${LOCALBASE}/bin/python3 RUBY_CMD = ${LOCALBASE}/bin/ruby HUGO_CMD = ${LOCALBASE}/bin/hugo HUGO_ARGS?= --verbose --minify +ASCIIDOCTOR_CMD= ${LOCALBASE}/bin/asciidoctor ASCIIDOCTORPDF_CMD= ${LOCALBASE}/bin/asciidoctor-pdf - +SED_CMD = /usr/bin/sed .if defined(DOC_LANG) && !empty(DOC_LANG) LANGUAGES= ${DOC_LANG:S/,/ /g} -.if ${LANGUAGES:Men} == "" && ${.TARGETS:Mpdf*} == "" +.if ${LANGUAGES:Men} == "" && ${.TARGETS:Mpdf*} == "" && ${.TARGETS:Mhtml*} == "" .warning "Warning: cannot skip 'en'; adding it back" LANGUAGES+= en .endif @@ -60,13 +65,19 @@ RUN_DEPENDS= ${PYTHON_CMD} \ .HOST=$(HOSTNAME) .endif -# Strip the languages without articles from the list of languages we +# Strip the languages with only articles from the list of languages we # will use to build books. BOOK_LANGS= ${LANGUAGES} .for a in ${ARTICLEONLY_LANGS} BOOK_LANGS:= ${BOOK_LANGS:N${a}} .endfor +# Strip the languages with only books from the list of languages we +# will use to build articles. +ARTICLE_LANGS= ${LANGUAGES} +.for a in ${BOOKONLY_LANGS} +ARTICLE_LANGS:= ${ARTICLE_LANGS:N${a}} +.endfor # Take the list of all languages, and take out the ones we have been # asked for. We'll feed this to hugo. @@ -105,11 +116,13 @@ starting-message: .PHONY @echo --------------------------------------------------------------- generate-books-toc: .PHONY +.if !empty(BOOK_LANGS) ${PYTHON_CMD} ./tools/books-toc-parts-creator.py -l ${BOOK_LANGS} ${PYTHON_CMD} ./tools/books-toc-creator.py -l ${BOOK_LANGS} ${PYTHON_CMD} ./tools/books-toc-figures-creator.py -l ${BOOK_LANGS} ${PYTHON_CMD} ./tools/books-toc-tables-creator.py -l ${BOOK_LANGS} ${PYTHON_CMD} ./tools/books-toc-examples-creator.py -l ${BOOK_LANGS} +.endif generate-pgpkeys-txt: static/pgpkeys/pgpkeys.txt @@ -143,18 +156,14 @@ hugo-clean: .PHONY pdf: pdf-articles pdf-books pdf-books-target: -.for _lang in ${LANGUAGES:S|,| |g} -.if exists(${.CURDIR}/content/${_lang}/books/) -TMP += ${.CURDIR}/content/${_lang}/books/*/ -.endif +.for _lang in ${BOOK_LANGS} +TMP+= ${.CURDIR}/content/${_lang}/books/*/ .endfor BOOKSDIR != echo ${TMP} pdf-articles-target: -.for _lang in ${LANGUAGES:S|,| |g} -.if exists(${.CURDIR}/content/${_lang}/articles/) +.for _lang in ${ARTICLE_LANGS} TTMP += ${.CURDIR}/content/${_lang}/articles/*/ -.endif .endfor ARTICLESDIR != echo ${TTMP} @@ -231,31 +240,172 @@ pdf-books-clean: pdf-books-target toc-clean .for _curpdf in ${BOOKSDIR} rm -f ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}book.pdf .endfor -.for _lang in ${LANGUAGES:S|,| |g} +.for _lang in ${BOOK_LANGS} rm -fr ${.CURDIR}/public/${_lang}/books -.if !exists(${.CURDIR}/public/${_lang}/articles) - rm -fr ${.CURDIR}/public/${_lang} + -rmdir ${.CURDIR}/public/${_lang} +.endfor + -rmdir ${.CURDIR}/public/ + +# +# HTML targets +# Use DOC_LANG to choose the language, e.g., make DOC_LANG="en fr" html-books +# +html: html-articles html-books + +html-books-target: +.for _lang in ${BOOK_LANGS} +TMPH += ${.CURDIR}/content/${_lang}/books/*/ +.endfor +BOOKSDIR != echo ${TMPH} + +html-articles-target: +.for _lang in ${ARTICLE_LANGS} +TTMPH += ${.CURDIR}/content/${_lang}/articles/*/ +.endfor +ARTICLESDIR != echo ${TTMPH} + +html-books: html-books-target generate-books-toc + +# Books build +# +.for _curhtml in ${BOOKSDIR} + @mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||} +.if exists(${_curhtml}book.adoc) + ${ASCIIDOCTOR_CMD} \ + -B ${.CURDIR}/ \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/git-macro.rb \ + -r ./shared/lib/packages-macro.rb \ + -r ./shared/lib/inter-document-references-macro.rb \ + -r ./shared/lib/sectnumoffset-treeprocessor.rb \ + --doctype=book \ + -a skip-front-matter \ + -a linkcss -a copycss=${.CURDIR}/themes/beastie/static/css/docbook.css -a stylesheet=docbook.css -a stylesdir=../../css \ + -a iconfont-remote! -a iconfont-name=font-awesome-min \ + -o ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}book.html \ + ${_curhtml}book.adoc +.if exists(${.CURDIR}/static/images/books/${_curhtml:H:T}) + @mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/books/ + cp -R ${.CURDIR}/static/images/books/${_curhtml:H:T}/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/books/${_curhtml:H:T}/ + ${SED_CMD} -i '' -e "s|../../../../images|../../images|g" \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}book.html .endif +.else +# some books use _index.adoc as main document + ${ASCIIDOCTOR_CMD} \ + -B ${.CURDIR}/ \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/git-macro.rb \ + -r ./shared/lib/packages-macro.rb \ + -r ./shared/lib/inter-document-references-macro.rb \ + -r ./shared/lib/sectnumoffset-treeprocessor.rb \ + --doctype=book \ + -a skip-front-matter \ + -a linkcss -a copycss=${.CURDIR}/themes/beastie/static/css/docbook.css -a stylesheet=docbook.css -a stylesdir=../../css \ + -a iconfont-remote! -a iconfont-name=font-awesome-min \ + -o ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}book.html \ + ${_curhtml}_index.adoc +.if exists(${.CURDIR}/static/images/books/${_curhtml:H:T}) + @mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/books/ + cp -R ${.CURDIR}/static/images/books/${_curhtml:H:T}/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/books/${_curhtml:H:T}/ + ${SED_CMD} -i '' -e "s|../../../../images|../../images|g" \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}book.html +.endif +.endif +.if !exists(${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/) + mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/ + cp -R ${.CURDIR}/themes/beastie/static/fonts/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/ + cp ${.CURDIR}/themes/beastie/static/css/font-awesome-min.css \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/css/ +.endif +.endfor + +html-articles: html-articles-target + +# Articles build +.for _curhtml in ${ARTICLESDIR} + @mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||} + ${ASCIIDOCTOR_CMD} \ + -B ${.CURDIR}/ \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/man-macro.rb \ + -r ./shared/lib/git-macro.rb \ + -r ./shared/lib/packages-macro.rb \ + -r ./shared/lib/inter-document-references-macro.rb \ + -r ./shared/lib/sectnumoffset-treeprocessor.rb \ + --doctype=article \ + -a skip-front-matter \ + -a linkcss -a copycss=${.CURDIR}/themes/beastie/static/css/docbook.css -a stylesheet=docbook.css -a stylesdir=../../css \ + -a iconfont-remote! -a iconfont-name=font-awesome-min \ + -o ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}article.html \ + ${_curhtml}_index.adoc +.if exists(${.CURDIR}/static/source/articles/${_curhtml:H:T}) + cp -R ${.CURDIR}/static/source/articles/${_curhtml:H:T}/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||} +.endif +.if exists(${.CURDIR}/static/images/articles/${_curhtml:H:T}) + @mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/articles/ + cp -R ${.CURDIR}/static/images/articles/${_curhtml:H:T}/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/images/articles/${_curhtml:H:T}/ + ${SED_CMD} -i '' -e "s|../../../images|../../images|g" \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}article.html +.endif +.if !exists(${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/) + mkdir -p ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/ + cp -R ${.CURDIR}/themes/beastie/static/fonts/ \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/fonts/ + cp ${.CURDIR}/themes/beastie/static/css/font-awesome-min.css \ + ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||:H:H:H}/css/ +.endif +.endfor + +html-clean: html-resources-clean html-articles-clean html-books-clean + +html-resources-clean: +.for _lang in ${LANGUAGES} + rm -fr ${.CURDIR}/public/${_lang}/css + rm -fr ${.CURDIR}/public/${_lang}/fonts + rm -fr ${.CURDIR}/public/${_lang}/images +.endfor + +html-books-clean: html-books-target toc-clean +.for _curhtml in ${BOOKSDIR} + rm -f ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}book.html ${_curhtml}toc*.adoc + -rmdir ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||} +.endfor +.for _lang in ${BOOK_LANGS} + rm -fr ${.CURDIR}/public/${_lang}/books + rm -fr ${.CURDIR}/public/${_lang}/images/books + -rmdir ${.CURDIR}/public/${_lang} +.endfor + -rmdir ${.CURDIR}/public + +html-articles-clean: html-articles-target +.for _curhtml in ${ARTICLESDIR} + rm -f ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||}article.html + -rmdir ${.CURDIR}/public${_curhtml:S|^${.CURDIR}/content||} +.endfor +.for _lang in ${ARTICLE_LANGS} + rm -fr ${.CURDIR}/public/${_lang}/articles + rm -fr ${.CURDIR}/public/${_lang}/images/articles + -rmdir ${.CURDIR}/public/${_lang} .endfor - @if [ -d ${.CURDIR}/public/ ]; then \ - if [ -z "`ls -A ${.CURDIR}/public/`" ]; then \ - rm -fr ${.CURDIR}/public; \ - fi; \ - fi + -rmdir ${.CURDIR}/public pdf-articles-clean: pdf-articles-target .for _curpdf in ${ARTICLESDIR} rm -f ${.CURDIR}/public${_curpdf:S|^${.CURDIR}/content||}article.pdf .endfor -.for _lang in ${LANGUAGES:S|,| |g} +.for _lang in ${ARTICLE_LANGS} rm -fr ${.CURDIR}/public/${_lang}/articles .if !exists(${.CURDIR}/public/${_lang}/books) rm -fr ${.CURDIR}/public/${_lang} .endif .endfor - @if [ -d ${.CURDIR}/public/ ]; then \ - if [ -z "`ls -A ${.CURDIR}/public/`" ]; then \ - rm -fr ${.CURDIR}/public; \ - fi; \ - fi + -rmdir ${.CURDIR}/public From owner-dev-commits-doc-all@freebsd.org Wed Jul 14 18:20:42 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 073B6653FA6 for ; Wed, 14 Jul 2021 18:20:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ5Qx6f6Yz3LZQ; Wed, 14 Jul 2021 18:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBB7A1ABD4; Wed, 14 Jul 2021 18:20:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EIKfRk082777; Wed, 14 Jul 2021 18:20:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EIKfO7082776; Wed, 14 Jul 2021 18:20:41 GMT (envelope-from git) Date: Wed, 14 Jul 2021 18:20:41 GMT Message-Id: <202107141820.16EIKfO7082776@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: aed8d4e932 - main - Add freebsd-friday-2021-07-23 event MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aed8d4e9325b663bce10da5c149689b14855cd16 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 18:20:42 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=aed8d4e9325b663bce10da5c149689b14855cd16 commit aed8d4e9325b663bce10da5c149689b14855cd16 Author: Li-Wen Hsu AuthorDate: 2021-07-14 18:19:54 +0000 Commit: Li-Wen Hsu CommitDate: 2021-07-14 18:19:54 +0000 Add freebsd-friday-2021-07-23 event Approved by: carlavilla (implicitly) Sponsored by: The FreeBSD Foundation --- website/data/en/events/events2021.toml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml index 3d4f10e26c..e864665de1 100644 --- a/website/data/en/events/events2021.toml +++ b/website/data/en/events/events2021.toml @@ -83,6 +83,15 @@ endDate = "2021-06-18" site = "live.FreeBSD.org" description = "On June 18th 2021 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: \"How to Submit a Patch to #FreeBSD\" by Drew Gurkowski and Ed Maste." +[[events]] +id = "freebsd-friday-2021-07-23" +name = "FreeBSD Friday: How to Track FreeBSD Using Git" +url = "https://freebsdfoundation.org/freebsd-fridays/" +startDate = "2021-07-23" +endDate = "2021-07-23" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +description = "On July 23th 2021 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: \"How to Track FreeBSD Using Git\" by Warner Losh." + [[events]] id = "eurobsdcon-2021" name = "EuroBSDcon 2021" From owner-dev-commits-doc-all@freebsd.org Wed Jul 14 18:21:53 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A87AC654214 for ; Wed, 14 Jul 2021 18:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ5SK4RZNz3LpZ; Wed, 14 Jul 2021 18:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 823FC1AD23; Wed, 14 Jul 2021 18:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EILrn2085334; Wed, 14 Jul 2021 18:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EILrfL085333; Wed, 14 Jul 2021 18:21:53 GMT (envelope-from git) Date: Wed, 14 Jul 2021 18:21:53 GMT Message-Id: <202107141821.16EILrfL085333@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: 1bb5acf410 - main - Remove countryCode from EuroBSDcon 2021 since it's an online event MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1bb5acf41008cf3d25d0cd7356cdb7f9f76097f3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 18:21:53 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=1bb5acf41008cf3d25d0cd7356cdb7f9f76097f3 commit 1bb5acf41008cf3d25d0cd7356cdb7f9f76097f3 Author: Li-Wen Hsu AuthorDate: 2021-07-14 18:21:16 +0000 Commit: Li-Wen Hsu CommitDate: 2021-07-14 18:21:16 +0000 Remove countryCode from EuroBSDcon 2021 since it's an online event --- website/data/en/events/events2021.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml index e864665de1..dd40ab9bb5 100644 --- a/website/data/en/events/events2021.toml +++ b/website/data/en/events/events2021.toml @@ -98,6 +98,5 @@ name = "EuroBSDcon 2021" url = "https://2021.eurobsdcon.org" startDate = "2021-09-17" endDate = "2021-09-19" -countryCode = "NO" site = "Online" description = "EuroBSDcon is the European annual technical conference gathering users and developers working on and with 4.4BSD (Berkeley Software Distribution) based operating systems family and related projects." From owner-dev-commits-doc-all@freebsd.org Wed Jul 14 18:49:18 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0CDF26541E6 for ; Wed, 14 Jul 2021 18:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ63x6gXvz3QTk; Wed, 14 Jul 2021 18:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CCC131AD53; Wed, 14 Jul 2021 18:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16EInHuw014419; Wed, 14 Jul 2021 18:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16EInHYT014418; Wed, 14 Jul 2021 18:49:17 GMT (envelope-from git) Date: Wed, 14 Jul 2021 18:49:17 GMT Message-Id: <202107141849.16EInHYT014418@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: fa5c57fd0f - main - Use official page for FreeBSD Fridays events MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa5c57fd0f4d18b0fb2f40aa37cf3a39ee2c4082 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 18:49:18 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=fa5c57fd0f4d18b0fb2f40aa37cf3a39ee2c4082 commit fa5c57fd0f4d18b0fb2f40aa37cf3a39ee2c4082 Author: Li-Wen Hsu AuthorDate: 2021-07-14 18:49:13 +0000 Commit: Li-Wen Hsu CommitDate: 2021-07-14 18:49:13 +0000 Use official page for FreeBSD Fridays events And use full URL for site field. Approved by: carlavilla (implicitly) Sponsored by: The FreeBSD Foundation --- website/data/en/events/events2020.toml | 56 +++++++++++++++++----------------- website/data/en/events/events2021.toml | 8 ++--- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/website/data/en/events/events2020.toml b/website/data/en/events/events2020.toml index 81adf97c08..b9f52d4d49 100644 --- a/website/data/en/events/events2020.toml +++ b/website/data/en/events/events2020.toml @@ -56,10 +56,10 @@ description = "On June 24th at 18:00 UTC we will hold the fifth \"FreeBSD Office [[events]] id = "freebsd-friday-2020-07-17" name = "FreeBSD Friday: Intro to FreeBSD" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-07-17" endDate = "2020-07-17" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On July 17th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to FreeBSD by Deb Goodkin." [[events]] @@ -74,37 +74,37 @@ description = "On July 22nd at 18:00 UTC we will hold a \"FreeBSD Office Hours\" [[events]] id = "freebsd-friday-2020-07-24" name = "FreeBSD Friday: FreeBSD Installfest Pt 1" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-07-24" endDate = "2020-07-24" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On July 24th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: FreeBSD Installfest Pt 1 by Roller Angel." [[events]] id = "freebsd-friday-2020-07-31" name = "FreeBSD Friday: FreeBSD Installfest Pt 2" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-07-31" endDate = "2020-07-31" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On July 31st 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: FreeBSD Installfest Pt 2 by Roller Angel." [[events]] id = "freebsd-friday-2020-08-07" name = "FreeBSD Friday: History of BSD Fast Filesystem" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-08-07" endDate = "2020-08-07" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On August 7th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: History of BSD Fast Filesystem by Dr. Marshall Kirk McKusick." [[events]] id = "freebsd-friday-2020-08-14" name = "FreeBSD Friday: Introduction to ZFS" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-08-14" endDate = "2020-08-14" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On August 14th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Introduction to ZFS by Dan Langille." [[events]] @@ -119,19 +119,19 @@ description = "On August 19th at 18:00 UTC we will hold a \"FreeBSD Office Hours [[events]] id = "freebsd-friday-2020-08-28" name = "FreeBSD Friday: Intro to FreeBSD Security" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-08-28" endDate = "2020-08-28" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On August 28th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to FreeBSD Security by Antranig Vartanian." [[events]] id = "freebsd-friday-2020-09-11" name = "FreeBSD Friday: Introduction to Hardware Hacking on Raspberry Pi" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-09-11" endDate = "2020-09-11" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On September 11th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Introduction to Hardware Hacking on Raspberry Pi by Tom Jones." [[events]] @@ -155,19 +155,19 @@ description = "On September 23rd at 18:00 UTC we will hold a \"FreeBSD Office Ho [[events]] id = "freebsd-friday-2020-09-25" name = "FreeBSD Friday: Intro to Jails" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-09-25" endDate = "2020-09-25" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On September 25th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to Jails by Michael W. Lucas." [[events]] id = "freebsd-friday-2020-10-09" name = "FreeBSD Friday: Intro to CheriBSD" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-10-09" endDate = "2020-10-09" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On October 9th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to CheriBSD by Dr. Robert N. M. Watson." [[events]] @@ -182,19 +182,19 @@ description = "On October 14th at 02:00 UTC we will hold the 4th \"FreeBSD Core [[events]] id = "freebsd-friday-2020-10-23" name = "FreeBSD Friday: Intro to Bhyve" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-10-23" endDate = "2020-10-23" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On October 24rd 2020 from 00:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to Bhyve by Peter Grehan." [[events]] id = "freebsd-friday-2020-11-06" name = "FreeBSD Friday: Intro to RISC-V" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-11-06" endDate = "2020-11-06" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On November 6th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to RISC-V by Mitchell Horne." [[events]] @@ -209,10 +209,10 @@ description = "This event wants to bring together FreeBSD developers and vendors [[events]] id = "freebsd-friday-2020-11-20" name = "FreeBSD Friday: Intro to DTrace" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-11-20" endDate = "2020-11-20" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On November 20th 2020 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to DTrace by Mark Johnston." [[events]] @@ -227,10 +227,10 @@ description = "On December 3rd at 18:00 UTC we will hold a \"FreeBSD Office Hour [[events]] id = "freebsd-friday-2020-12-11" name = "FreeBSD Friday: Intro to Capsicum" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-12-11" endDate = "2020-12-11" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On December 11th 2020 from 18:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to Capsicum by Mariusz Zaborski." [[events]] @@ -245,9 +245,9 @@ description = "On December 16th at 21:00 UTC we will hold a \"FreeBSD Office Hou [[events]] id = "freebsd-friday-2020-12-18" name = "FreeBSD Friday: Intro to Documentation" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2020-12-18" endDate = "2020-12-18" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On December 18th 2020 from 18:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: Intro to Documentation by Sergio Carlavilla." diff --git a/website/data/en/events/events2021.toml b/website/data/en/events/events2021.toml index dd40ab9bb5..90a7955cb0 100644 --- a/website/data/en/events/events2021.toml +++ b/website/data/en/events/events2021.toml @@ -59,10 +59,10 @@ description = "On May 26th at 02:00 UTC we will hold a \"FreeBSD Office Hours\", [[events]] id = "freebsd-friday-2021-06-04" name = "FreeBSD Friday: An Introduction to BastilleBSD" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2021-06-04" endDate = "2021-06-04" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On June 4th 2021 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: \"An Introduction to BastilleBSD\" by Christer Edwards." [[events]] @@ -77,10 +77,10 @@ description = "Join us for the online June 2021 FreeBSD Developer Summit. The ev [[events]] id = "freebsd-friday-2021-06-18" name = "FreeBSD Friday: How to Submit a Patch to FreeBSD" -url = "https://live.freebsd.org/FreeBSD/freebsdfriday/" +url = "https://freebsdfoundation.org/freebsd-fridays/" startDate = "2021-06-18" endDate = "2021-06-18" -site = "live.FreeBSD.org" +site = "https://live.freebsd.org/FreeBSD/freebsdfriday/" description = "On June 18th 2021 from 17:00 UTC there will be an 1 hour live streaming session of the FreeBSD Fridays. The topic of this week is: \"How to Submit a Patch to #FreeBSD\" by Drew Gurkowski and Ed Maste." [[events]] From owner-dev-commits-doc-all@freebsd.org Thu Jul 15 21:09:11 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 37EFE650CD0 for ; Thu, 15 Jul 2021 21:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQn6v11Hgz4Vg2; Thu, 15 Jul 2021 21:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00B2310CC4; Thu, 15 Jul 2021 21:09:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FL9AEv027453; Thu, 15 Jul 2021 21:09:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FL9Ah5027452; Thu, 15 Jul 2021 21:09:10 GMT (envelope-from git) Date: Thu, 15 Jul 2021 21:09:10 GMT Message-Id: <202107152109.16FL9Ah5027452@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Kevin Bowling Subject: git: 274b93aba7 - main - comitters-guide: clarify submitted and approved post git MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 274b93aba7f1c27531b5cf4ed5b59bd214087c74 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 21:09:11 -0000 The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=274b93aba7f1c27531b5cf4ed5b59bd214087c74 commit 274b93aba7f1c27531b5cf4ed5b59bd214087c74 Author: Kevin Bowling AuthorDate: 2021-07-15 21:07:50 +0000 Commit: Kevin Bowling CommitDate: 2021-07-15 21:08:27 +0000 comitters-guide: clarify submitted and approved post git Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D30969 --- .../en/articles/committers-guide/_index.adoc | 23 +++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 6c72d36eac..f3e5718ec1 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2803,17 +2803,22 @@ Typically used when there is no PR, for example if the issue was reported on a mailing list. |`Submitted by:` -|The name and e-mail address of the person that submitted the fix; for developers, just the username on the FreeBSD cluster. +|This has been deprecated with git; submitted patches should have the author set by using `git commit --author` with a full name and valid email. -Typically not used with Git; submitted patches should -have the author set by using `git commit --author`. - -If the submitter is the maintainer of the port being committed, include "(maintainer)" after the email address. +|`Reviewed by:` +|The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer: +a| -Avoid obfuscating the email address of the submitter as this adds additional work when searching logs. +Reviewed by a developer: +[source,shell] +.... +Reviewed by: username -|`Reviewed by:` -|The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. +Reviewed by a ports maintainer that is not a developer: +[source,shell] +.... +Reviewed by: Full Name (maintainer) +.... |`Tested by:` |The name and e-mail address of the person or people that tested the change; for developers, just the username on the FreeBSD cluster. @@ -2826,7 +2831,7 @@ The name and e-mail address of the person or people that approved the change; fo There are several cases where approval is customary: * while a new committer is under mentorship -* commits to an area of the tree to which you do not usually commit +* commits to an area of the tree covered by the LOCKS file (src) * during a release cycle * committing to a repo where you do not hold a commit bit (e.g. src committer committing to docs) From owner-dev-commits-doc-all@freebsd.org Thu Jul 15 21:36:13 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 000C56514B4 for ; Thu, 15 Jul 2021 21:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQnk46RXyz4Z7F; Thu, 15 Jul 2021 21:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C55FE11687; Thu, 15 Jul 2021 21:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FLaCqn066851; Thu, 15 Jul 2021 21:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FLaCXE066850; Thu, 15 Jul 2021 21:36:12 GMT (envelope-from git) Date: Thu, 15 Jul 2021 21:36:12 GMT Message-Id: <202107152136.16FLaCXE066850@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Kevin Bowling Subject: git: ad623f3e75 - main - comitters-guide: Fix unterminated block in previous commit MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad623f3e75f4cd02de51e67495f25ec910db8dba Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 21:36:13 -0000 The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=ad623f3e75f4cd02de51e67495f25ec910db8dba commit ad623f3e75f4cd02de51e67495f25ec910db8dba Author: Kevin Bowling AuthorDate: 2021-07-15 21:35:56 +0000 Commit: Kevin Bowling CommitDate: 2021-07-15 21:35:56 +0000 comitters-guide: Fix unterminated block in previous commit --- documentation/content/en/articles/committers-guide/_index.adoc | 1 + 1 file changed, 1 insertion(+) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index f3e5718ec1..f6c7d510ba 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2813,6 +2813,7 @@ Reviewed by a developer: [source,shell] .... Reviewed by: username +.... Reviewed by a ports maintainer that is not a developer: [source,shell] From owner-dev-commits-doc-all@freebsd.org Thu Jul 15 21:56:23 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E832E6518BB for ; Thu, 15 Jul 2021 21:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQp9M60tdz4cZZ; Thu, 15 Jul 2021 21:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B20E8112EA; Thu, 15 Jul 2021 21:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FLuNQM093460; Thu, 15 Jul 2021 21:56:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FLuNUW093459; Thu, 15 Jul 2021 21:56:23 GMT (envelope-from git) Date: Thu, 15 Jul 2021 21:56:23 GMT Message-Id: <202107152156.16FLuNUW093459@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Kevin Bowling Subject: git: adb40cf142 - main - committers-guide: Fix col formatting error in last commits MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: adb40cf1421429466766fdab91d0eb4112950a08 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 21:56:24 -0000 The branch main has been updated by kbowling (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=adb40cf1421429466766fdab91d0eb4112950a08 commit adb40cf1421429466766fdab91d0eb4112950a08 Author: Kevin Bowling AuthorDate: 2021-07-15 21:50:37 +0000 Commit: Kevin Bowling CommitDate: 2021-07-15 21:56:01 +0000 committers-guide: Fix col formatting error in last commits Pointy hat: me --- documentation/content/en/articles/committers-guide/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index f6c7d510ba..a8d3fe542f 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2806,8 +2806,8 @@ a mailing list. |This has been deprecated with git; submitted patches should have the author set by using `git commit --author` with a full name and valid email. |`Reviewed by:` -|The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer: a| +The name and e-mail address of the person or people that reviewed the change; for developers, just the username on the FreeBSD cluster. If a patch was submitted to a mailing list for review, and the review was favorable, then just include the list name. If the reviewer is not a member of the project, provide the name, email, and if ports an external role like maintainer: Reviewed by a developer: [source,shell] From owner-dev-commits-doc-all@freebsd.org Thu Jul 15 22:21:39 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 74C2D652591 for ; Thu, 15 Jul 2021 22:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQpkW2tDBz4hLH; Thu, 15 Jul 2021 22:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4B89211CEB; Thu, 15 Jul 2021 22:21:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16FMLdGY032809; Thu, 15 Jul 2021 22:21:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16FMLdxK032808; Thu, 15 Jul 2021 22:21:39 GMT (envelope-from git) Date: Thu, 15 Jul 2021 22:21:39 GMT Message-Id: <202107152221.16FMLdxK032808@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: e06f3556be - main - website/press: Adjust all links MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e06f3556beb198cbaf10136ad54af94e19cebf10 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 22:21:39 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=e06f3556beb198cbaf10136ad54af94e19cebf10 commit e06f3556beb198cbaf10136ad54af94e19cebf10 Author: Danilo G. Baio AuthorDate: 2021-07-15 11:48:00 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-15 22:09:25 +0000 website/press: Adjust all links - Fix RSS/Feed links They were without the anchor part, causing 404 requests: https://www.freebsd.org/press/2021-03:0 The correct is: https://www.freebsd.org/press/#2021-03:0 - Make links unique When investigating the above issue, we could note that the links were not unique. Every time a new press item is added, the entire chain of links is changed. We add the old behavior with this change, which counts press items for each month and generates the unique link based on the month and in the month counter. This change also needs to be added to the News and Events items. Reviewed by: carlavilla Differential Revision: https://reviews.freebsd.org/D31190 --- website/themes/beastie/layouts/partials/press.html | 13 +++++++++-- website/themes/beastie/layouts/press/list.html | 13 ++++++++--- website/themes/beastie/layouts/press/press.rss.xml | 27 ++++++++++++++-------- website/themes/beastie/layouts/press/single.html | 13 ++++++++--- 4 files changed, 49 insertions(+), 17 deletions(-) diff --git a/website/themes/beastie/layouts/partials/press.html b/website/themes/beastie/layouts/partials/press.html index ca0e3c1d16..6bca5eece6 100644 --- a/website/themes/beastie/layouts/partials/press.html +++ b/website/themes/beastie/layouts/partials/press.html @@ -16,14 +16,23 @@ {{ with $pressData.press }} {{ $pressCounter := 0 }} + {{ $pressMonthCounter := 1 }} + {{ $pressMonthPrev := false }} {{ range (sort .press "date" "desc") }} {{ if lt $pressCounter 5 }} + {{ $pressMonthCur := dateFormat "2006-01" .date }} + {{ if eq $pressMonthCur $pressMonthPrev }} + {{ $pressMonthCounter = add $pressMonthCounter 1 }} + {{ else }} + {{ $pressMonthCounter = 1 }} + {{ end }}

{{ dateFormat "2006-01" .date }}
- {{ .name }} + {{ .name }}

+ {{ $pressCounter = add $pressCounter 1 }} + {{ $pressMonthPrev = $pressMonthCur }} {{ end }} - {{ $pressCounter = add $pressCounter 1 }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html index f34ae7e986..332c4de940 100644 --- a/website/themes/beastie/layouts/press/list.html +++ b/website/themes/beastie/layouts/press/list.html @@ -39,7 +39,8 @@ {{ $yearsMonths = $yearsMonths | uniq }} - {{ $pressCounter := 0 }} + {{ $pressMonthCounter := 1 }} + {{ $pressMonthPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -50,9 +51,15 @@ {{ with $pressData.press }} {{ range (sort .press "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $pressMonthCur := dateFormat "2006-01" .date }} + {{ if eq $pressMonthCur $pressMonthPrev }} + {{ $pressMonthCounter = add $pressMonthCounter 1 }} + {{ else }} + {{ $pressMonthCounter = 1 }} + {{ end }}

  • - + {{ .name }} @@ -62,7 +69,7 @@ {{ .description | safeHTML}}

    • - {{ $pressCounter = add $pressCounter 1 }} + {{ $pressMonthPrev = $pressMonthCur }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/press/press.rss.xml b/website/themes/beastie/layouts/press/press.rss.xml index 98f0348c85..660c49652d 100644 --- a/website/themes/beastie/layouts/press/press.rss.xml +++ b/website/themes/beastie/layouts/press/press.rss.xml @@ -12,28 +12,37 @@ https://www.FreeBSD.org/press/ + {{ $pressMonthPrev := false }} {{ $data := index .Site.Data "en" }} {{ $pressData := $data.press }} {{ with $pressData.press }} {{ $pressCounter := 0 }} - {{ range (sort .press "date" "desc") }} - {{ if lt $pressCounter 10 }} + {{ $pressMonthCounter := 1 }} + {{ range (sort .press "date" "desc") }} + {{ if lt $pressCounter 10 }} + {{ $pressMonthCur := dateFormat "2006-01" .date }} + {{ if eq $pressMonthCur $pressMonthPrev }} + {{ $pressMonthCounter = add $pressMonthCounter 1 }} + {{ else }} + {{ $pressMonthCounter = 1 }} + {{ end }} - {{ if .name }} + {{ if .name }} {{ .name }} - {{ end }} - {{ if .description }} + {{ end }} + {{ if .description }} {{ .description }} - {{ end }} - {{ absLangURL ($.Site.BaseURL) }}press/{{ dateFormat "2006-01" .date }}:{{ $pressCounter }} - {{ absLangURL ($.Site.BaseURL) }}press/{{ dateFormat "2006-01" .date }}:{{ $pressCounter }} + {{ end }} + {{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }} + {{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }} {{ dateFormat "2006-01-02" .date }} - {{ end }} + {{ $pressMonthPrev = $pressMonthCur }} + {{ end }} {{ $pressCounter = add $pressCounter 1 }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html index f34ae7e986..332c4de940 100644 --- a/website/themes/beastie/layouts/press/single.html +++ b/website/themes/beastie/layouts/press/single.html @@ -39,7 +39,8 @@ {{ $yearsMonths = $yearsMonths | uniq }} - {{ $pressCounter := 0 }} + {{ $pressMonthCounter := 1 }} + {{ $pressMonthPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -50,9 +51,15 @@ {{ with $pressData.press }} {{ range (sort .press "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $pressMonthCur := dateFormat "2006-01" .date }} + {{ if eq $pressMonthCur $pressMonthPrev }} + {{ $pressMonthCounter = add $pressMonthCounter 1 }} + {{ else }} + {{ $pressMonthCounter = 1 }} + {{ end }}

  • - + {{ .name }} @@ -62,7 +69,7 @@ {{ .description | safeHTML}}

    • - {{ $pressCounter = add $pressCounter 1 }} + {{ $pressMonthPrev = $pressMonthCur }} {{ end }} {{ end }} {{ end }} From owner-dev-commits-doc-all@freebsd.org Fri Jul 16 19:16:50 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D6ACF66667F for ; Fri, 16 Jul 2021 19:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GRLZp5RB9z4Xhs; Fri, 16 Jul 2021 19:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9EA122297F; Fri, 16 Jul 2021 19:16:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16GJGoLx002941; Fri, 16 Jul 2021 19:16:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16GJGok3002940; Fri, 16 Jul 2021 19:16:50 GMT (envelope-from git) Date: Fri, 16 Jul 2021 19:16:50 GMT Message-Id: <202107161916.16GJGok3002940@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Li-Wen Hsu Subject: git: fe5726f17f - main - Q2 is from April to June MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe5726f17fbdbdc0c7d28f0123402d1e21cb4f59 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 19:16:50 -0000 The branch main has been updated by lwhsu (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=fe5726f17fbdbdc0c7d28f0123402d1e21cb4f59 commit fe5726f17fbdbdc0c7d28f0123402d1e21cb4f59 Author: Li-Wen Hsu AuthorDate: 2021-07-16 19:15:59 +0000 Commit: Li-Wen Hsu CommitDate: 2021-07-16 19:15:59 +0000 Q2 is from April to June Approved by: carlavilla (implicitly) --- website/content/en/status/_index.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/status/_index.adoc b/website/content/en/status/_index.adoc index e0b295847c..8e48a9e2ff 100644 --- a/website/content/en/status/_index.adoc +++ b/website/content/en/status/_index.adoc @@ -5,7 +5,7 @@ sidenav: about = FreeBSD Status Reports -== Next Quarterly Status Report submissions (April - July) due: June 30th, 2021 +== Next Quarterly Status Report submissions (April - June) due: June 30th, 2021 Submit your entries as Pull Requests from your fork of link:https://github.com/freebsd/freebsd-quarterly[FreeBSD Status Report GitHub repo] or submit them via e-mail to quarterly-submissions@FreeBSD.org, using the link:https://github.com/freebsd/freebsd-quarterly/blob/master/report-sample.adoc[report-sample.adoc template]. From owner-dev-commits-doc-all@freebsd.org Fri Jul 16 22:16:54 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF456668A75 for ; Fri, 16 Jul 2021 22:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GRQZZ4c2Hz3Q4M; Fri, 16 Jul 2021 22:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8729124FAD; Fri, 16 Jul 2021 22:16:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16GMGsUd041561; Fri, 16 Jul 2021 22:16:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16GMGsPf041560; Fri, 16 Jul 2021 22:16:54 GMT (envelope-from git) Date: Fri, 16 Jul 2021 22:16:54 GMT Message-Id: <202107162216.16GMGsPf041560@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: cafcba7d54 - main - website/events: Fix unique links MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cafcba7d545f4785028bb7a7e8797efeac3c9d0b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 22:16:54 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=cafcba7d545f4785028bb7a7e8797efeac3c9d0b commit cafcba7d545f4785028bb7a7e8797efeac3c9d0b Author: Danilo G. Baio AuthorDate: 2021-07-16 22:05:18 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-16 22:09:19 +0000 website/events: Fix unique links Every time an event item is added, the entire chain of links is changed. All events already have an exclusive ID, so instead of generating a new reference for each item, point to it. --- website/themes/beastie/layouts/events/events.rss.xml | 2 +- website/themes/beastie/layouts/events/list.html | 3 --- website/themes/beastie/layouts/events/single.html | 3 --- website/themes/beastie/layouts/partials/events.html | 2 +- 4 files changed, 2 insertions(+), 8 deletions(-) diff --git a/website/themes/beastie/layouts/events/events.rss.xml b/website/themes/beastie/layouts/events/events.rss.xml index 194a747341..aaf582bc6b 100644 --- a/website/themes/beastie/layouts/events/events.rss.xml +++ b/website/themes/beastie/layouts/events/events.rss.xml @@ -30,7 +30,7 @@ {{ end }} {{ .url }} - {{ .url }} + {{ absLangURL ($.Site.BaseURL) }}events/#{{ .id }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html index 29c1afffd1..8384a25a97 100644 --- a/website/themes/beastie/layouts/events/list.html +++ b/website/themes/beastie/layouts/events/list.html @@ -109,7 +109,6 @@ {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -140,7 +139,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -186,7 +184,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html index 29c1afffd1..8384a25a97 100644 --- a/website/themes/beastie/layouts/events/single.html +++ b/website/themes/beastie/layouts/events/single.html @@ -109,7 +109,6 @@ {{ if and (ge (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -140,7 +139,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} @@ -186,7 +184,6 @@ {{ if and (lt (dateFormat "20060102" .endDate) (dateFormat "20060102" now)) (eq (dateFormat "2006-1" .endDate) $yearMonth) }}

  • - {{ .name }}, {{ .site }}, {{ .city }}, {{ .country }}
    {{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }} diff --git a/website/themes/beastie/layouts/partials/events.html b/website/themes/beastie/layouts/partials/events.html index 0852e870cc..b4bdb21ce5 100644 --- a/website/themes/beastie/layouts/partials/events.html +++ b/website/themes/beastie/layouts/partials/events.html @@ -18,7 +18,7 @@

    {{ dateFormat "2006-01-02" .startDate }} - {{ dateFormat "2006-01-02" .endDate }}
    - + {{ .name }}
    {{ if or (.city) (.country) }}({{end}}{{ if .city }}{{ .city }},{{ end }} {{ if .country }}{{ .country }}{{ end }}{{ if or (.city) (.country) }}){{end}} From owner-dev-commits-doc-all@freebsd.org Fri Jul 16 22:16:55 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CD1E0668A76 for ; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GRQZb5S3lz3QNS; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A25E624BCC; Fri, 16 Jul 2021 22:16:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16GMGt6v041585; Fri, 16 Jul 2021 22:16:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16GMGt2O041584; Fri, 16 Jul 2021 22:16:55 GMT (envelope-from git) Date: Fri, 16 Jul 2021 22:16:55 GMT Message-Id: <202107162216.16GMGt2O041584@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" Subject: git: e95429614a - main - website/news: Make links unique MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e95429614afa637ee6d05de7cc70290a54e10f78 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Jul 2021 22:16:55 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=e95429614afa637ee6d05de7cc70290a54e10f78 commit e95429614afa637ee6d05de7cc70290a54e10f78 Author: Danilo G. Baio AuthorDate: 2021-07-16 22:07:22 +0000 Commit: Danilo G. Baio CommitDate: 2021-07-16 22:09:19 +0000 website/news: Make links unique Every time a news item is added, the entire chain of links is changed. This adds the old behavior, which counts news items for each day and adds that to the ID. This commit follows e06f3556be --- website/themes/beastie/layouts/news/list.html | 13 ++++++++++--- website/themes/beastie/layouts/news/news.rss.xml | 15 ++++++++++++--- website/themes/beastie/layouts/news/single.html | 13 ++++++++++--- website/themes/beastie/layouts/partials/news.html | 13 +++++++++++-- 4 files changed, 43 insertions(+), 11 deletions(-) diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html index b4b175fbb0..26409dfdfe 100644 --- a/website/themes/beastie/layouts/news/list.html +++ b/website/themes/beastie/layouts/news/list.html @@ -40,7 +40,8 @@ {{ $yearsMonths = $yearsMonths | uniq }} - {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -51,14 +52,20 @@ {{ with $newsData.news }} {{ range (sort .news "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }}

  • - + {{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}: {{ .description | safeHTML }}

    • - {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/news/news.rss.xml b/website/themes/beastie/layouts/news/news.rss.xml index d119936093..f109d6ca67 100644 --- a/website/themes/beastie/layouts/news/news.rss.xml +++ b/website/themes/beastie/layouts/news/news.rss.xml @@ -16,8 +16,16 @@ {{ $newsData := $data.news }} {{ with $newsData.news }} {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range (sort .news "date" "desc") }} {{ if lt $newsCounter 10 }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} {{ if .title }} @@ -33,12 +41,13 @@ {{ $description }} </description> {{ end }} - <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</link> - <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</guid> + <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</link> + <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</guid> <pubDate>{{ dateFormat "2006-01-02" .date }}</pubDate> </item> + {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} - {{ $newsCounter = add $newsCounter 1 }} {{ end }} {{ end }} </channel> diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html index b4b175fbb0..26409dfdfe 100644 --- a/website/themes/beastie/layouts/news/single.html +++ b/website/themes/beastie/layouts/news/single.html @@ -40,7 +40,8 @@ <!-- Remove duplicates --> {{ $yearsMonths = $yearsMonths | uniq }} - {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range $year := seq now.Year 2010 }} {{ range $month := seq 12 1 }} {{ $yearMonth := (printf "%d-%d" $year $month) }} @@ -51,14 +52,20 @@ {{ with $newsData.news }} {{ range (sort .news "date" "desc") }} {{ if eq (dateFormat "2006-1" .date) $yearMonth }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} <li> <p class="localized"> - <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a> + <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a> <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong> {{ .description | safeHTML }} </p> </li> - {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} {{ end }} {{ end }} diff --git a/website/themes/beastie/layouts/partials/news.html b/website/themes/beastie/layouts/partials/news.html index e3fb22646d..23b22fbaa7 100644 --- a/website/themes/beastie/layouts/partials/news.html +++ b/website/themes/beastie/layouts/partials/news.html @@ -11,12 +11,20 @@ {{ with $newsData.news }} {{ $newsCounter := 0 }} + {{ $newsDayCounter := 1 }} + {{ $newsDayPrev := false }} {{ range (sort .news "date" "desc") }} {{ if lt $newsCounter 6 }} + {{ $newsDayCur := dateFormat "2006-01-02" .date }} + {{ if eq $newsDayCur $newsDayPrev }} + {{ $newsDayCounter = add $newsDayCounter 1 }} + {{ else }} + {{ $newsDayCounter = 1 }} + {{ end }} <p> <span class="txtdate">{{ dateFormat "2006-01-02" .date }}</span> <br /> - <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"> + <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"> {{ if .title }} {{ $title := replaceRE "<a .*\">" "" .title }} {{ $title = replaceRE "</a>" "" $title }} @@ -28,7 +36,8 @@ {{ end }} </a> </p> + {{ $newsCounter = add $newsCounter 1 }} + {{ $newsDayPrev = $newsDayCur }} {{ end }} - {{ $newsCounter = add $newsCounter 1 }} {{ end }} {{ end }} From owner-dev-commits-doc-all@freebsd.org Sat Jul 17 12:32:53 2021 Return-Path: <owner-dev-commits-doc-all@freebsd.org> Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 51615653F4C for <dev-commits-doc-all@mailman.nyi.freebsd.org>; Sat, 17 Jul 2021 12:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GRnZF1TwFz4Tq7; Sat, 17 Jul 2021 12:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1A74710ACA; Sat, 17 Jul 2021 12:32:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16HCWrS7086842; Sat, 17 Jul 2021 12:32:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16HCWqbQ086841; Sat, 17 Jul 2021 12:32:52 GMT (envelope-from git) Date: Sat, 17 Jul 2021 12:32:52 GMT Message-Id: <202107171232.16HCWqbQ086841@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Danilo G. Baio" <dbaio@FreeBSD.org> Subject: git: 7213f1292c - main - Fix broken links for errata FreeBSD-EN-21:22.linux_futex MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7213f1292c2211e70275618fb653daa6dd785840 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository <dev-commits-doc-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/> List-Post: <mailto:dev-commits-doc-all@freebsd.org> List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 17 Jul 2021 12:32:53 -0000 The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/doc/commit/?id=7213f1292c2211e70275618fb653daa6dd785840 commit 7213f1292c2211e70275618fb653daa6dd785840 Author: Danilo G. Baio <dbaio@FreeBSD.org> AuthorDate: 2021-07-16 22:55:47 +0000 Commit: Danilo G. Baio <dbaio@FreeBSD.org> CommitDate: 2021-07-17 12:30:06 +0000 Fix broken links for errata FreeBSD-EN-21:22.linux_futex Reported by: Laurence Parry <greenreaper@gmail.com> --- website/content/en/releases/11.4R/errata.adoc | 2 +- website/content/en/releases/12.2R/errata.adoc | 2 +- website/content/en/releases/13.0R/errata.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/website/content/en/releases/11.4R/errata.adoc b/website/content/en/releases/11.4R/errata.adoc index 969d34e778..6c143a24da 100644 --- a/website/content/en/releases/11.4R/errata.adoc +++ b/website/content/en/releases/11.4R/errata.adoc @@ -62,7 +62,7 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/ |https://www.FreeBSD.org/security/advisories/FreeBSD-SA-21:10.jail_mount.asc[FreeBSD-SA-21:10.jail_mount] |6 April 2021 |Privilege escalation |https://www.FreeBSD.org/security/advisories/FreeBSD-SA-21:12.libradius.asc[FreeBSD-SA-21:12.libradius] |26 May 2021 |Denial of service |https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:19.libcasper.asc[FreeBSD-EN-21:19.libcasper] |30 June 2021 |libcasper assertion failure -|https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futexasc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability +|https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futex.asc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability |=== [[errata]] diff --git a/website/content/en/releases/12.2R/errata.adoc b/website/content/en/releases/12.2R/errata.adoc index bc55c853df..21821da451 100644 --- a/website/content/en/releases/12.2R/errata.adoc +++ b/website/content/en/releases/12.2R/errata.adoc @@ -81,7 +81,7 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/ |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:16.bc.asc[FreeBSD-EN-21:16.bc] |26 May 2021 |dc update |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:17.libradius.asc[FreeBSD-EN-21:17.libradius] |1 June 2021 |Incorrect validation in rad_get_attr(3) |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:19.libcasper.asc[FreeBSD-EN-21:19.libcasper] |30 June 2021 |libcasper assertion failure -|link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futexasc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability +|link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futex.asc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability |=== [[open-issues]] diff --git a/website/content/en/releases/13.0R/errata.adoc b/website/content/en/releases/13.0R/errata.adoc index f8a6130d1f..81048fd4f8 100644 --- a/website/content/en/releases/13.0R/errata.adoc +++ b/website/content/en/releases/13.0R/errata.adoc @@ -60,7 +60,7 @@ For a list of all FreeBSD CERT security advisories, see https://www.FreeBSD.org/ |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:19.libcasper.asc[FreeBSD-EN-21:19.libcasper] |30 June 2021 |libcasper assertion failure |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:20.vlan.asc[FreeBSD-EN-21:20.vlan] |30 June 2021 |Missing backwards compatibility in vlan(4) |link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:21.ipfw.asc[FreeBSD-EN-21:21.ipfw] |30 June 2021 |Kernel panic with ipfw link-layer filtering enabled -|link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futexasc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability +|link:https://www.FreeBSD.org/security/advisories/FreeBSD-EN-21:22.linux_futex.asc[FreeBSD-EN-21:22.linux_futex] |30 June 2021 |Linux compatibility layer futex(2) system call vulnerability |=== [[open-issues]] From owner-dev-commits-doc-all@freebsd.org Sat Jul 17 21:36:09 2021 Return-Path: <owner-dev-commits-doc-all@freebsd.org> Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E007965C394 for <dev-commits-doc-all@mailman.nyi.freebsd.org>; Sat, 17 Jul 2021 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GS1d53b5Hz580g; Sat, 17 Jul 2021 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EA1717F4D; Sat, 17 Jul 2021 21:36:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16HLa9VX009448; Sat, 17 Jul 2021 21:36:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16HLa97L009447; Sat, 17 Jul 2021 21:36:09 GMT (envelope-from git) Date: Sat, 17 Jul 2021 21:36:09 GMT Message-Id: <202107172136.16HLa97L009447@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Alan Somers <asomers@FreeBSD.org> Subject: git: 24be2a2c5e - main - Correct the 13.0 release notes for ctld's -t feature MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24be2a2c5eb70b7d894a461bc80c647ab9283270 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository <dev-commits-doc-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/> List-Post: <mailto:dev-commits-doc-all@freebsd.org> List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sat, 17 Jul 2021 21:36:10 -0000 The branch main has been updated by asomers (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=24be2a2c5eb70b7d894a461bc80c647ab9283270 commit 24be2a2c5eb70b7d894a461bc80c647ab9283270 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2021-07-15 14:42:46 +0000 Commit: Alan Somers <asomers@FreeBSD.org> CommitDate: 2021-07-17 21:35:29 +0000 Correct the 13.0 release notes for ctld's -t feature Reviewed by: mhorne, dbaio Approved by: dbaio (docs) Differential Revision: https://reviews.freebsd.org/D31193 --- website/content/en/releases/13.0R/relnotes.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/content/en/releases/13.0R/relnotes.adoc b/website/content/en/releases/13.0R/relnotes.adoc index 7a90817852..36b280ad5f 100644 --- a/website/content/en/releases/13.0R/relnotes.adoc +++ b/website/content/en/releases/13.0R/relnotes.adoc @@ -416,7 +416,7 @@ This section covers changes and additions to file systems and other storage subs For man:iscsi[4] and man:ctld[8], support for specifying network QoS in the form of DiffServ Codepoints (DSCP) and Ethernet Priority Code Point (PCP) was added. gitref:ddf1072aac49[repository=src] {{< sponsored "NetApp" >}} -The man:ctld[8] utility now supports the `-f` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] +The man:ctld[8] utility now supports the `-t` flag to test the validity of configuration files. gitref:7fcbecd004f[repository=src] Removed the man:nand[4] device framework and man:nandfs[5] filesystem and associated utilities. gitref:f5a95d9a0794[repository=src] From owner-dev-commits-doc-all@freebsd.org Sun Jul 18 00:47:40 2021 Return-Path: <owner-dev-commits-doc-all@freebsd.org> Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7B9566611D3 for <dev-commits-doc-all@mailman.nyi.freebsd.org>; Sun, 18 Jul 2021 00:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GS5t42kK7z4Vrq; Sun, 18 Jul 2021 00:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45CAF1A750; Sun, 18 Jul 2021 00:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16I0leba063887; Sun, 18 Jul 2021 00:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16I0le2u063886; Sun, 18 Jul 2021 00:47:40 GMT (envelope-from git) Date: Sun, 18 Jul 2021 00:47:40 GMT Message-Id: <202107180047.16I0le2u063886@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: "Bjoern A. Zeeb" <bz@FreeBSD.org> Subject: git: d4ff44ceba - main - Document __FreeBSD_version 1300512 (LinuxKPI, OFED, net80211, and driver MFCs). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4ff44cebae17e33bd6668051b40aa980f3e8d1b Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository <dev-commits-doc-all.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-doc-all/> List-Post: <mailto:dev-commits-doc-all@freebsd.org> List-Help: <mailto:dev-commits-doc-all-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-doc-all>, <mailto:dev-commits-doc-all-request@freebsd.org?subject=subscribe> X-List-Received-Date: Sun, 18 Jul 2021 00:47:40 -0000 The branch main has been updated by bz (src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=d4ff44cebae17e33bd6668051b40aa980f3e8d1b commit d4ff44cebae17e33bd6668051b40aa980f3e8d1b Author: Bjoern A. Zeeb <bz@FreeBSD.org> AuthorDate: 2021-07-18 00:44:05 +0000 Commit: Bjoern A. Zeeb <bz@FreeBSD.org> CommitDate: 2021-07-18 00:45:52 +0000 Document __FreeBSD_version 1300512 (LinuxKPI, OFED, net80211, and driver MFCs). Sponsored by: The FreeBSD Foundation --- documentation/content/en/books/porters-handbook/versions/_index.adoc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/documentation/content/en/books/porters-handbook/versions/_index.adoc b/documentation/content/en/books/porters-handbook/versions/_index.adoc index 52ee514ef3..eb46a87419 100644 --- a/documentation/content/en/books/porters-handbook/versions/_index.adoc +++ b/documentation/content/en/books/porters-handbook/versions/_index.adoc @@ -926,6 +926,11 @@ Here is a convenient list of `__FreeBSD_version` values as defined in https://cg |gitref:658f5eed38c35f3f7d6695110b7dae8dc94d12c7[repository="src",length=12] |June 11, 2021 |13.0-STABLE after adding macros for might_lock_nested() and lockdep_(re/un/)pin_lock() to the LinuxKPI. + +|1300512 +|gitref:f72db34d2295080f57a283858125aa906c0d409e[repository="src",length=12] +|July 18, 2021 +|13.0-STABLE after various merges to LinuxKPI, OFED, net80211, and drivers. |=== [[versions-12]]