diff options
109 files changed, 231 insertions, 353 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index 0b23426894..71bb302151 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -833,8 +833,10 @@ To abort and get back to the state before "git rebase", run "git rebase --abort" Could not apply 646e0f9cda11... no color ls .... which looks scary. + If you bring up an editor, you will see it is a typical 3-way merge conflict resolution that you may be familiar with from other source code systems (the rest of ls.c has been omitted): [source,shell] +.... <<<<<<< HEAD #ifdef COLORLS_NEW #include <terminfo.h> @@ -844,7 +846,9 @@ If you bring up an editor, you will see it is a typical 3-way merge conflict res #include <termcap.h> >>>>>>> 646e0f9cda11... no color ls .... + The new code is first, and your code is second. + The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then delete the old changes: [source,shell] .... @@ -853,6 +857,7 @@ The right fix here is to just add a #undef COLORLS_NEW before #ifdef and then de #include <terminfo.h> .... save the file. + The rebase was interrupted, so you have to complete it: [source,shell] .... diff --git a/documentation/content/en/books/fdp-primer/structure/_index.adoc b/documentation/content/en/books/fdp-primer/structure/_index.adoc index 864ad53d7e..6aa5e17776 100644 --- a/documentation/content/en/books/fdp-primer/structure/_index.adoc +++ b/documentation/content/en/books/fdp-primer/structure/_index.adoc @@ -264,7 +264,22 @@ toc::[] The FreeBSD project recognizes contributors in several different lists in the documentation and in printed materials. This section describes how the documentation team manages changes to these lists. -=== Finding the Correct Files +=== Mentor and New Committer Relationship Lists + +Since FreeBSD 7.0, FreeBSD has maintained link:https://cgit.freebsd.org/src/tree/share/misc[three lists of contributor mentor / mentee relationships] - one for source code, one for ports and one for documentation. +These files are in *".dot"* format, intended for use with the popular graphing toolkit package:graphics/graphviz[] available as a FreeBSD package or port. + +[NOTE] +==== +man:dot[1] is installed as part of the package:graphics/graphviz[] package or port. +The [.filename]#dot# program reads files in *".dot"* format and creates a graphical image of the directed graph. +==== + +The three files often serve as a learning experience for new committers of all three teams who are instructed to add themselves, and their mentor, to the appropriate file as their first commit. +Each file has a "current" section for new committers, an "alumni" section for when the commit bit is returned, and a "mentor / mentee" section showing the relationships. +The format for each type of entry is explained at the top of the file. + +=== General Contributor Lists extref:{contributors}[Contributors] to FreeBSD are maintained in article format. The source file for managing the *Contributors* article file is located at: @@ -334,19 +349,19 @@ The order of entries for all files is found in the table below. === "In Memoriam" Section -If the intent is to notify the BSD community of the death of a community member, the following procedures should be used: +When notifying the BSD community of the death of a community member, the following procedure should be used: -. Search the files above for the name, email address, and nickname (such as `foobsd`). -. Since the member is deceased (which should be double checked) remove the name from the appropriate file and add them to the "In Memoriam" file ([.filename]#contrib-develinmemoriam.adoc# as noted above) by editing the appropriate files. -Try to find some additional information about their contributions to FreeBSD over the years and add it with their entry in the file. -This may require asking in the development mailing lists, contacting colleagues, contacting the FreeBSD Foundation, or searching through the commit logs. -. Where an email address is found with a name, remove the email address, but leave the name. +. Use the file [.filename]#~/doc/shared/authors.adoc# to look up the person's name and attribute reference, such as `{foobsd}`. +. If they are a current member of one or more FreeBSD project teams in [.filename]#~/doc/website/content/en/administration.adoc#, remove all instances of their attribute reference. +Also, complete the following edits: + -[cols="25%,25%,25%,25%", frame="none", options="header"] -|=== -| Purpose | Section Anchor | File in ~/doc/documentation/content/{language}/articles/contributors/ | Order Specification -| *Development Team: In Memoriam* | [.filename]#contrib-develinmemoriam.adoc# | [.filename]#contrib-develinmemoriam.adoc# | rough reverse chronological order -|=== +* [.filename]#~/doc/shared/contrib-committers.adoc# - Remove the attribute reference. +* [.filename]#~/doc/shared/contrib-corealumni.adoc# - If they are a _current_ member of the core team, create an entry showing start and end dates. +* [.filename]#~/doc/shared/contrib-develalumni.adoc# - Add the attribute reference and dates of activity as a committer. +* [.filename]#~/doc/shared/contrib-portmgralumni.adoc# - Add the attribute reference if necessary. +* [.filename]#~/doc/shared/contrib-additional.adoc# - Remove the entry. +* [.filename]#~/doc/shared/contrib-386bsd.adoc# - This is a historical document only. +No changes are needed. + . In the [.filename]#~/doc/shared/authors.adoc# file, comment out (using one backslash '\') the email address to avoid creating the email link "mailto:" See the example for `itojun` below: @@ -363,4 +378,43 @@ See the example for `itojun` below: [..] .... ++ +. Since the member is deceased (which should be double checked), add them to the "In Memoriam" file [.filename]#contrib-develinmemoriam.adoc#. ++ +Try to find some factual information about their contributions to FreeBSD over the years and add it with their entry in the file. +This may require asking in the development mailing lists, contacting colleagues, contacting the FreeBSD Foundation, or searching through the commit logs. ++ +To find the date of their first commit, use: ++ +[source.programlisting,asciidoc] +.... +% cd ~/src +% git log --reverse --author=foobsd # search for first commit of foobsd +.... ++ +This will print out their commits in reverse order. +The date of the first commit will be at the top. ++ +Ensure that the format of the dates match other entries: ++ +[source.programlisting,asciidoc] +.... +(year of commit bit start - year of commit bit end; RIP year deceased) +For example: + +* Foo BSD (2007 - 2010; RIP 2016) +.... ++ +Check the ordering of the entries in the file. ++ +[cols="25%,25%,25%,25%", frame="none", options="header"] +|=== +| Purpose | Section Anchor | File in ~/doc/documentation/content/{language}/articles/contributors/ | Order Specification +| *Development Team: In Memoriam* | [.filename]#contrib-develinmemoriam.adoc# | [.filename]#contrib-develinmemoriam.adoc# | rough reverse chronological order +|=== ++ +See the "In Memoriam" file for similar entries. ++ +. Finally, if applicable, move the committer member entry from the "current" section to the "alumni" section of the appropriate link:https://cgit.freebsd.org/src/tree/share/misc[list of contributor mentor / mentee relationships] along with an appropriate date. +It is not necessary to change the mentor / mentee relationship. diff --git a/documentation/content/en/books/fdp-primer/translations/_index.adoc b/documentation/content/en/books/fdp-primer/translations/_index.adoc index 664ac9b216..7dbfa915c0 100644 --- a/documentation/content/en/books/fdp-primer/translations/_index.adoc +++ b/documentation/content/en/books/fdp-primer/translations/_index.adoc @@ -176,7 +176,7 @@ documentation/ `sv` is the name of the translation, in [.filename]#lang# form. Note the two Makefiles, which will be used to build the documentation. -Use git diff command to generate a diff and send it to the link:reviews.freebsd.org/[reviews system]. +Use git diff command to generate a diff and send it to the link:https://reviews.freebsd.org/[reviews system]. [source,shell] .... diff --git a/documentation/content/en/books/handbook/desktop/_index.adoc b/documentation/content/en/books/handbook/desktop/_index.adoc index 225ed297b2..829a63d77c 100644 --- a/documentation/content/en/books/handbook/desktop/_index.adoc +++ b/documentation/content/en/books/handbook/desktop/_index.adoc @@ -151,12 +151,21 @@ Enable D-BUS service in `/etc/rc.conf` to start at system boot: # sysrc dbus_enable="YES" .... -To increase messages size execute: +KDE Plasma requires larger message sizes for optimal performance. + +Add the following lines to man:sysctl.conf[5]: + +[.programlisting] +.... +sysctl net.local.stream.recvspace=65536 +sysctl net.local.stream.sendspace=65536 +.... + +To apply the change, either run the following command as root or simply reboot the system: [source,shell] .... -# sysctl net.local.stream.recvspace=65536 -# sysctl net.local.stream.sendspace=65536 +# sysctl -f /etc/sysctl.conf .... [[kde-start]] @@ -281,15 +290,6 @@ To install the XFCE meta package, execute: [[xfce-configuration]] ==== Configure XFCE -XFCE requires `/proc` to be mounted. -Add this line to `/etc/fstab` to mount this file system automatically during system startup: - -[.programlisting] -.... -# Device Mountpoint FStype Options Dump Pass# -proc /proc procfs rw 0 0 -.... - XFCE uses man:dbus-daemon[1] for a message bus and hardware abstraction. This application is automatically installed as a dependency of XFCE. diff --git a/documentation/content/en/books/handbook/jails/_index.adoc b/documentation/content/en/books/handbook/jails/_index.adoc index a9b941a3a2..fd652694cc 100644 --- a/documentation/content/en/books/handbook/jails/_index.adoc +++ b/documentation/content/en/books/handbook/jails/_index.adoc @@ -1051,7 +1051,7 @@ Finally, it will be necessary to remove the jail entry in [.filename]#/etc/jail. The man:pkg[8] tool supports the `-j` argument in order to handle packages installed inside the jail. -For example, to install package:nginx-lite[] in the jail, the next command can be executed *from the host*: +For example, to install package:www/nginx-lite[] in the jail, the next command can be executed *from the host*: [source,shell] .... diff --git a/documentation/content/en/books/handbook/mirrors/_index.adoc b/documentation/content/en/books/handbook/mirrors/_index.adoc index e921ce156e..9c308e1dbf 100644 --- a/documentation/content/en/books/handbook/mirrors/_index.adoc +++ b/documentation/content/en/books/handbook/mirrors/_index.adoc @@ -96,6 +96,8 @@ http://ftp-archive.FreeBSD.org is not in the GeoDNS Infrastructure, hosted in on The project is looking for new locations; those willing to sponsor, please reach out to the Cluster Administrators team for more information. +There is an ongoing project to provide **download.FreeBSD.org** and **pkg.FreeBSD.org** through link:https://www.fastly.com[Fastly], using its CDN acceleration, caching, and bandwidth to bring FreeBSD images and packages to our globally distributed community. + Mirror list maintained by the community and other companies: [cols="1,1,3"] diff --git a/documentation/content/en/books/handbook/network/_index.adoc b/documentation/content/en/books/handbook/network/_index.adoc index 5d54ddd5e8..bb49981b31 100644 --- a/documentation/content/en/books/handbook/network/_index.adoc +++ b/documentation/content/en/books/handbook/network/_index.adoc @@ -577,11 +577,15 @@ The following sections discuss each step. Connecting FreeBSD to an existing wireless network is a very common situation. -This procedure shows the steps required: +This Quick Start procedure shows the steps required to connect to a network using basic authentication. +A more detailed procedure is given in the next section. -* The first step will be to obtain the SSID (Service Set Identifier) and PSK (Pre-Shared Key) for the wireless network from the network administrator. +The first step is to obtain the Service Set Identifier (SSID) and Pre-Shared Key (PSK) for the wireless network from the network administrator. -* The second step will be to add default configuration paramaters and an entry for this network to [.filename]#/etc/wpa_supplicant.conf#. If the file does not exist, create it: +The second step is to add an entry for this network to [.filename]#/etc/wpa_supplicant.conf#. + +If the file does not exist, create it. +Consult man:wpa_supplicant.conf[5] for details on formatting entries in this file. [.programlisting] .... @@ -596,10 +600,28 @@ network={ } .... -<.> Is the SSID of the wireless network. Replace it with the name of the wireless network. -<.> Is the PSK of the wireless network. Replace it with the password of the wireless network. +<.> Is the SSID of the wireless network. +Replace it with the name of the wireless network. +<.> Is the PSK of the wireless network. +Replace it with the password of the wireless network. + +The third step is to add the network interface entry to configure the network on startup. +Obtain the network device interface by using the sysctl `net.wlan.devices`. +In the listing below, the output of this sysctl shows the network device interface is "iwn0". + +[source,shell] +.... +# sysctl net.wlan.devices +.... + +The output should be similar to the following: + +[.programlisting] +.... +net.wlan.devices: iwm0 +.... -* The third step will be to add the network entry to configure the network on startup: +In the sysrc line that follows, replace "iwn0" with the output of the sysctl command if needed. [source,shell] .... @@ -607,7 +629,7 @@ network={ # sysrc ifconfig_wlan0="WPA DHCP" .... -* And the last step will be the restart `netif` service executing the following command: +* And the last step is to restart the `netif` service executing the following command: [source,shell] .... @@ -617,7 +639,7 @@ network={ [[basic-wireless-configuration]] === Basic Wireless Configuration -The first step will be to configure the wireless network card to an interface. +This section provides a more detailed example of configuring a wireless network card. To find out what wireless network cards are in the system check the section crossref:network[config-identify-network-adapter, Identify Network Adapters]. diff --git a/documentation/content/en/books/handbook/wayland/_index.adoc b/documentation/content/en/books/handbook/wayland/_index.adoc index 48d9e4a4e1..aa402971ff 100644 --- a/documentation/content/en/books/handbook/wayland/_index.adoc +++ b/documentation/content/en/books/handbook/wayland/_index.adoc @@ -73,9 +73,10 @@ After reading this chapter, you will know: [[wayland-overview]] == Wayland Overview -Wayland is a new display server, but it differs from Xorg in several important ways. -First, Wayland is only a protocol that acts as an intermediary between clients using a different mechanism which removes the dependency on an X server. -Xorg includes both the X11 protocol, used to run remote displays and the X server will accept connections and display windows. +Wayland is a communication protocol that can replace a display server such as Xorg. +It differs from Xorg in several important ways. +First, Wayland is only a protocol that acts as an intermediary between clients using a mechanism which removes the dependency on an X server. +Xorg includes both the X11 protocol, used to run remote displays, and the X server, used to accept connections and display windows. Under Wayland, the compositor or window manager provides the display server instead of a traditional X server. Since Wayland is not an X server, traditional X screen connections will need to utilize other methods such as VNC or RDP for remote desktop management. diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc index 7b76b21ab1..e98d2ff336 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc @@ -101,8 +101,8 @@ From time to time, some software will use a version scheme that is not compatibl [TIP] ==== -When updating a port, it is possible to use man:pkg-version[8]'s `-t` argument to check if the new version is greater or lesser than before. -See crossref:makefiles[makefile-versions-ex-pkg-version, Using man:pkg-version\[8\] to Compare Versions]. +When updating a port, it is possible to use the `-t` argument of man:pkg-version[8] to check if the new version is greater or lesser than before. +See below on how to use man:pkg-version[8] to compare versions. ==== [[makefile-versions-ex-pkg-version]] @@ -1581,8 +1581,8 @@ USE_GITHUB= yes GH_TAGNAME= c472d66b .... -This creates a versioning scheme that increases over time, and that is still -before version `0` (see crossref:makefiles[makefile-versions-ex-pkg-version, Using man:pkg-version\[8\] to Compare Versions] for details on man:pkg-version[8]): +This creates a versioning scheme that increases over time, and that is still before version `0`. +See crossref:makefiles[makefile-versions-ex-pkg-version, this secion on how to compare versions] using man:pkg-version[8]): [source,shell] .... @@ -1627,7 +1627,7 @@ USE_GITHUB= yes .... This creates a versioning scheme that increases over time (well, over commits), and does not conflict with the creation of a `0.7.4` version. -(See crossref:makefiles[makefile-versions-ex-pkg-version, Using man:pkg-version\[8\] to Compare Versions] for details on man:pkg-version[8]): +See crossref:makefiles[makefile-versions-ex-pkg-version, this section for how to compare versions] using man:pkg-version[8]): [source,shell] .... diff --git a/documentation/content/en/books/porters-handbook/testing/_index.adoc b/documentation/content/en/books/porters-handbook/testing/_index.adoc index 0f7239536f..4c94b4fc85 100644 --- a/documentation/content/en/books/porters-handbook/testing/_index.adoc +++ b/documentation/content/en/books/porters-handbook/testing/_index.adoc @@ -113,9 +113,7 @@ For a new port, `portlint -A` is the most thorough; for an existing port, `portl Since `portlint` uses heuristics to try to figure out errors, it can produce false positive warnings. In addition, occasionally something that is flagged as a problem really cannot be done in any other way due to limitations in the ports framework. -pass:[<!-- vale Vale.Terms = NO -->] When in doubt, the best thing to do is ask on {freebsd-ports}. -pass:[<!-- vale Vale.Terms = YES -->] [[testing-porttools]] == Port Tools @@ -354,9 +352,7 @@ The command: .... updates the specified jail to the latest version available. -pass:[<!-- vale Vale.Terms = NO -->] For FreeBSD releases, update to the latest patchlevel with man:freebsd-update[8]. -pass:[<!-- vale Vale.Terms = YES -->] For FreeBSD versions built from source, update to the latest git revision in the branch. [TIP] diff --git a/documentation/content/en/books/porters-handbook/versions/_index.adoc b/documentation/content/en/books/porters-handbook/versions/_index.adoc index f7aeec0525..e633ba2fb7 100644 --- a/documentation/content/en/books/porters-handbook/versions/_index.adoc +++ b/documentation/content/en/books/porters-handbook/versions/_index.adoc @@ -4060,9 +4060,7 @@ Template: |1001509 |link:https://svnweb.freebsd.org/changeset/base/279287[279287] |February 25, 2015 -pass:[<!-- vale Vale.Terms = NO -->] |10-STABLE after FreeBSD-EN-15:01.vt, FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp, and FreeBSD-SA-15:05.bind. -pass:[<!-- vale Vale.Terms = YES -->] |1001510 |link:https://svnweb.freebsd.org/changeset/base/279329[279329] @@ -4710,9 +4708,7 @@ pass:[<!-- vale Vale.Terms = YES -->] |903508 |link:https://svnweb.freebsd.org/changeset/base/279287[279287] |February 25, 2015 -pass:[<!-- vale Vale.Terms = NO -->] |9-STABLE after FreeBSD-EN-15:01.vt, FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp, and FreeBSD-SA-15:05.bind. -pass:[<!-- vale Vale.Terms = YES -->] |903509 |link:https://svnweb.freebsd.org/changeset/base/296219[296219] @@ -5495,9 +5491,7 @@ pass:[<!-- vale Vale.Terms = YES -->] |804508 |link:https://svnweb.freebsd.org/changeset/base/279287[279287] |February 25, 2015 -pass:[<!-- vale Vale.Terms = NO -->] |8-STABLE after FreeBSD-EN-15:01.vt, FreeBSD-EN-15:02.openssl, FreeBSD-EN-15:03.freebsd-update, FreeBSD-SA-15:04.igmp, and FreeBSD-SA-15:05.bind. -pass:[<!-- vale Vale.Terms = YES -->] |804509 |link:https://svnweb.freebsd.org/changeset/base/305736[305736] diff --git a/documentation/static/pgpkeys/alven.key b/documentation/static/pgpkeys/alven.key index 3d6e0d52fe..e155701ac5 100644 --- a/documentation/static/pgpkeys/alven.key +++ b/documentation/static/pgpkeys/alven.key @@ -1,14 +1,13 @@ -// sh addkey.sh alven DD1B3D2699B582B2 ; +// sh addkey.sh alven DDC8E1AB9DC2A78E ; [.literal-block-margin] .... -pub ed25519/DD1B3D2699B582B2 2025-07-31 [SC] - Key fingerprint = AF09 BABD 4256 85D4 26BF EB44 DD1B 3D26 99B5 82B2 +pub ed448/DDC8E1AB9DC2A78E 2025-08-10 [SCA] [expires: 2029-01-01] + Key fingerprint = DDC8E 1AB9D C2A78 EC36F 46EB2 10988 6F994 EAC88 ED79E 53526 uid Älven <alven@FreeBSD.org> uid Älven <alster@vinterdalen.se> -sub cv25519/8B691B60C80A84BB 2025-07-31 [E] -sub ed25519/BD3430002006E8DC 2025-07-31 [S] [expires: 2029-01-01] -sub cv25519/9309301585E17CBD 2025-07-31 [E] [expires: 2029-01-01] +sub cv448/CF2C4446588CC2E7 2025-08-10 [E] [expires: 2029-01-01] +sub ed25519/5F457A537E502C86 2025-08-10 [A] [expires: 2029-01-01] .... @@ -16,29 +15,28 @@ sub cv25519/9309301585E17CBD 2025-07-31 [E] [expires: 2029-01-01] .... -----BEGIN PGP PUBLIC KEY BLOCK----- -mDMEaIuWzRYJKwYBBAHaRw8BAQdARVYyNPGqIxnJpjZ1sRmxQA19TciGzDL919GM -K5ocjq20GsOEbHZlbiA8YWx2ZW5ARnJlZUJTRC5vcmc+iJMEExYKADsWIQSvCbq9 -QlaF1Ca/60TdGz0mmbWCsgUCaIuXlAIbAwgLCQ0IDAcLAwUVCgkICwUWAwIBAAIe -BQIXgAAKCRDdGz0mmbWCslHmAP90LjEImM2zgeqtZUiSeiEx2e54W6hee2hno+Yi -4nJ3ZgD/Z83A2pqPX/EGqnU5WJYQtnFMRTmvjaHh1qbjezBJ2w60HsOEbHZlbiA8 -YWxzdGVyQHZpbnRlcmRhbGVuLnNlPoiTBBMWCgA7FiEErwm6vUJWhdQmv+tE3Rs9 -Jpm1grIFAmiLls0CGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQ3Rs9 -Jpm1grIlhwD+ILE7megBT76mIBbJk84FZXJ5W8t92EPmz6c3MJXfwmAA/iIYpA/I -5Sy4Be5sSINj9Tgtxh+GiUG83pT9gajRiogPuDgEaIuWzRIKKwYBBAGXVQEFAQEH -QJjuFO3/9sW8ODpumC1cnGgtfDCZuee4IdS9J/wPP343AwEIB4h4BBgWCgAgFiEE -rwm6vUJWhdQmv+tE3Rs9Jpm1grIFAmiLls0CGwwACgkQ3Rs9Jpm1grLzzgD+IJG1 -nP+U2z8igSzRagwyDegwYXZIeyq2wFoo8MOS+eEA/0IlHsYmk6aNlPYSXsW0w5br -+DOWFC/qrZj/eY6AM3YEuDMEaIuYDhYJKwYBBAHaRw8BAQdAtwLXNzHSZtauXvqb -3S6vLv3J4aRDkm47hrONT9ATwYeI9QQYFgoAJhYhBK8Jur1CVoXUJr/rRN0bPSaZ -tYKyBQJoi5gOAhsCBQkGb30VAIEJEN0bPSaZtYKydiAEGRYKAB0WIQSBwje1tFJS -jqyZnOK9NDAAIAbo3AUCaIuYDgAKCRC9NDAAIAbo3KMJAQCsfQSmHa0LyRcgMMuK -EZp5aqOyPSLzqeobFjo3nA45mwD7BrzUevDdht6K8nXbAooQYsNc8Lrfl7KV+Pb8 -wj7cEwQuAwEAyA2R8v0Wpg8nHI6JZvHKOprTa9pw4Ndrm0VBlN21D0kA/jUlif4p -Gr0NBSCh+1Ao6ss2AMMzThttmZIR2UAzOokJuDgEaIuarxIKKwYBBAGXVQEFAQEH -QGU+Upjskmh6rvZLlpqB3rljxY2eLNngYOBW3Si52C10AwEIB4h+BBgWCgAmFiEE -rwm6vUJWhdQmv+tE3Rs9Jpm1grIFAmiLmq8CGwwFCQZvesMACgkQ3Rs9Jpm1grKT -GgD/eq3VoFVg41AUtgJfivD/Qpotu5/6AS7mJ+SDZf+LeM4BAKZ92udM8GC3XcxG -1wWdZkhhx3g93Fm70W5f9zp4Z50P -=CAS/ +mEkFaJjdLBYAAAA/AytlcQHHeXKFnsUgKI+1Ow6WVFut2PHmhDdXD8ct1YGUM8Dn +F+hdA2ApOxJlckAUcNIgeskcqKcANNqQBhUAtBrDhGx2ZW4gPGFsdmVuQEZyZWVC +U0Qub3JnPojKBRMWCgBKIiEF3cjhq53Cp47Db0brIQmIb5lOrIjteeU1Jt/yDtTO +5uMFAmiY3bYCGyMFCQZiOHYFCwkIBwMFFQoJCAsFFgIDAQACHgUCF4AAAMi4AciV +9ZUgvNG9na39YXp+JtemUI+yJwSaTPrP4yX18mjT6dNnZifad3w870MeypGukuDV +BjBdfu2AGYAByL/5kuou6KMfqTYR8jFykKofFhx+pPU+aLeikaUyM42DWGh3YmcR +1cLSoDqfBgpRIIFvOarDsTYZALQew4RsdmVuIDxhbHN0ZXJAdmludGVyZGFsZW4u +c2U+iMoFExYKAEoiIQXdyOGrncKnjsNvRushCYhvmU6siO155TUm3/IO1M7m4wUC +aJjdLAIbIwUJBmI4dgULCQgHAwUVCgkICwUWAgMBAAIeBQIXgAAAEOkBxjUB7Eh/ +gJQjM3sSUlYamvDHPiPk/DBRJJ8JYibZGiTeOYSJzMcFZORs8FV0F9pUFFdtcHaA +t2HcAAHHfYCrrzjmKpMBrlbnr4q8zHCsZrmeNE2Z+O+UR5DnZ7AcPj7Yty+ojFJP +oFkIu8exiocQ3/Gf6TQAuEwFaJjeaBIAAABCAytlbwHAtqQxAQtaNjYxJ5Ybyw2A +2kQScoGDT26pm7CBTNFfui7tF+dhWqmlvU9/7FGj01c837Al7hGntkcDAQoJiLIF +GBYKADIiIQXdyOGrncKnjsNvRushCYhvmU6siO155TUm3/IO1M7m4wUCaJjeaAIb +DAUJBmI3DAAAQHsByO3A2s00C6JU4jGOMWLYkVuV6jPIFTqyNaSdMb4MMvlA4Mcs +OPM77n89l8QO+mgLtxfmHApvBDKjgAHImNSOK1FN/21yl5YR5Lk9vCVmqZd8bUa0 +tbavSd2W88yhlJQ3jnQ7e51m0SqRB+/P37EcDW8mGAQAuDMEaJjeuBYJKwYBBAHa +Rw8BAQdAkcTKW0cwPudYArg5Nj2ysDON7j1KlReHu1f5CQcAXkyIsgUYFgoAMiIh +Bd3I4audwqeOw29G6yEJiG+ZTqyI7XnlNSbf8g7UzubjBQJomN64AhsgBQkGYjaz +AACB0gHIxT4QJIdqdsAwBzRMVEEVLX9RH4ltorLgi1BQOUPpNW179YmK5GnpETCb +mdFwomAHpO0ATDHWnWKAAcY9AQa8CdssWZ9qoBsE9DELHukbXhQONHBDtG02xGkj +c9YJ1fMW10tXWafMHpduowklVOT/X163LwA= +=aMb9 -----END PGP PUBLIC KEY BLOCK----- .... diff --git a/documentation/themes/beastie/assets/js/copy-clipboard.js b/documentation/themes/beastie/assets/js/copy-clipboard.js index 7ee41cfef4..9c2473dad8 100644 --- a/documentation/themes/beastie/assets/js/copy-clipboard.js +++ b/documentation/themes/beastie/assets/js/copy-clipboard.js @@ -1,8 +1,8 @@ /* BSD 2-Clause License -Copyright (c) 1994-2023, The FreeBSD Documentation Project -Copyright (c) 2021-2023, Sergio Carlavilla +Copyright (c) 1994-2025, The FreeBSD Documentation Project +Copyright (c) 2021-2025, Sergio Carlavilla All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/js/search.js b/documentation/themes/beastie/assets/js/search.js index 12e9fc3b04..d9cd420eb2 100644 --- a/documentation/themes/beastie/assets/js/search.js +++ b/documentation/themes/beastie/assets/js/search.js @@ -1,8 +1,8 @@ /* BSD 2-Clause License -Copyright (c) 1994-2023, The FreeBSD Documentation Project -Copyright (c) 2021-2023, Sergio Carlavilla +Copyright (c) 1994-2025, The FreeBSD Documentation Project +Copyright (c) 2021-2025, Sergio Carlavilla All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/js/theme-chooser.js b/documentation/themes/beastie/assets/js/theme-chooser.js index 62b6235853..7a075580f5 100644 --- a/documentation/themes/beastie/assets/js/theme-chooser.js +++ b/documentation/themes/beastie/assets/js/theme-chooser.js @@ -1,8 +1,8 @@ /* BSD 2-Clause License -Copyright (c) 1994-2023, The FreeBSD Documentation Project -Copyright (c) 2021-2023, Sergio Carlavilla +Copyright (c) 1994-2025, The FreeBSD Documentation Project +Copyright (c) 2021-2025, Sergio Carlavilla All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/documentation.scss b/documentation/themes/beastie/assets/styles/documentation.scss index 678e3c4cbc..c993293349 100644 --- a/documentation/themes/beastie/assets/styles/documentation.scss +++ b/documentation/themes/beastie/assets/styles/documentation.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/footer.scss b/documentation/themes/beastie/assets/styles/footer.scss index dca2960eb9..8ac35990bb 100644 --- a/documentation/themes/beastie/assets/styles/footer.scss +++ b/documentation/themes/beastie/assets/styles/footer.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/global.scss b/documentation/themes/beastie/assets/styles/global.scss index 98881886be..7a2db627a4 100644 --- a/documentation/themes/beastie/assets/styles/global.scss +++ b/documentation/themes/beastie/assets/styles/global.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/header.scss b/documentation/themes/beastie/assets/styles/header.scss index 6f7461c8c0..fb07877df4 100644 --- a/documentation/themes/beastie/assets/styles/header.scss +++ b/documentation/themes/beastie/assets/styles/header.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/main.scss b/documentation/themes/beastie/assets/styles/main.scss index 48db35239d..6824f1c398 100644 --- a/documentation/themes/beastie/assets/styles/main.scss +++ b/documentation/themes/beastie/assets/styles/main.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/assets/styles/variables.scss b/documentation/themes/beastie/assets/styles/variables.scss index 16199befd6..4c67fe1772 100644 --- a/documentation/themes/beastie/assets/styles/variables.scss +++ b/documentation/themes/beastie/assets/styles/variables.scss @@ -1,6 +1,6 @@ /* - * Copyright (c) 1994-2023, The FreeBSD Documentation Project - * Copyright (c) 2021-2023, Sergio Carlavilla <carlavilla@FreeBSD.org> + * Copyright (c) 1994-2025, The FreeBSD Documentation Project + * Copyright (c) 2021-2025, Sergio Carlavilla <carlavilla@FreeBSD.org> * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/documentation/themes/beastie/layouts/partials/global-search.html b/documentation/themes/beastie/layouts/_partials/global-search.html index 26b3c0db4b..26b3c0db4b 100644 --- a/documentation/themes/beastie/layouts/partials/global-search.html +++ b/documentation/themes/beastie/layouts/_partials/global-search.html diff --git a/documentation/themes/beastie/layouts/partials/menu.html b/documentation/themes/beastie/layouts/_partials/menu.html index e189abad53..e189abad53 100644 --- a/documentation/themes/beastie/layouts/partials/menu.html +++ b/documentation/themes/beastie/layouts/_partials/menu.html diff --git a/documentation/themes/beastie/layouts/partials/site-footer.html b/documentation/themes/beastie/layouts/_partials/site-footer.html index aab2506f36..aab2506f36 100755 --- a/documentation/themes/beastie/layouts/partials/site-footer.html +++ b/documentation/themes/beastie/layouts/_partials/site-footer.html diff --git a/documentation/themes/beastie/layouts/partials/site-head.html b/documentation/themes/beastie/layouts/_partials/site-head.html index c531d57d9e..c531d57d9e 100644 --- a/documentation/themes/beastie/layouts/partials/site-head.html +++ b/documentation/themes/beastie/layouts/_partials/site-head.html diff --git a/documentation/themes/beastie/layouts/partials/site-header.html b/documentation/themes/beastie/layouts/_partials/site-header.html index 642ca7e468..642ca7e468 100755 --- a/documentation/themes/beastie/layouts/partials/site-header.html +++ b/documentation/themes/beastie/layouts/_partials/site-header.html diff --git a/documentation/themes/beastie/layouts/partials/trademarks.html b/documentation/themes/beastie/layouts/_partials/trademarks.html index 2266c2a2db..2266c2a2db 100644 --- a/documentation/themes/beastie/layouts/partials/trademarks.html +++ b/documentation/themes/beastie/layouts/_partials/trademarks.html diff --git a/documentation/themes/beastie/layouts/shortcodes/lang.html b/documentation/themes/beastie/layouts/_shortcodes/lang.html index e1a02d383e..e1a02d383e 100644 --- a/documentation/themes/beastie/layouts/shortcodes/lang.html +++ b/documentation/themes/beastie/layouts/_shortcodes/lang.html diff --git a/documentation/themes/beastie/layouts/shortcodes/languages-selection.html b/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html index bbfff53f3d..bbfff53f3d 100644 --- a/documentation/themes/beastie/layouts/shortcodes/languages-selection.html +++ b/documentation/themes/beastie/layouts/_shortcodes/languages-selection.html diff --git a/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html b/documentation/themes/beastie/layouts/_shortcodes/list-articles-directories.html index 33eab8f495..33eab8f495 100644 --- a/documentation/themes/beastie/layouts/shortcodes/list-articles-directories.html +++ b/documentation/themes/beastie/layouts/_shortcodes/list-articles-directories.html diff --git a/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html b/documentation/themes/beastie/layouts/_shortcodes/list-books-directories.html index d98353f942..d98353f942 100644 --- a/documentation/themes/beastie/layouts/shortcodes/list-books-directories.html +++ b/documentation/themes/beastie/layouts/_shortcodes/list-books-directories.html diff --git a/documentation/themes/beastie/layouts/_default/baseof.html b/documentation/themes/beastie/layouts/baseof.html index 9ad1667a73..9ad1667a73 100644 --- a/documentation/themes/beastie/layouts/_default/baseof.html +++ b/documentation/themes/beastie/layouts/baseof.html diff --git a/documentation/themes/beastie/layouts/_default/languages.html b/documentation/themes/beastie/layouts/languages.html index 8743c86312..8743c86312 100644 --- a/documentation/themes/beastie/layouts/_default/languages.html +++ b/documentation/themes/beastie/layouts/languages.html diff --git a/documentation/themes/beastie/layouts/_default/list.html b/documentation/themes/beastie/layouts/list.html index b45d15b378..b45d15b378 100644 --- a/documentation/themes/beastie/layouts/_default/list.html +++ b/documentation/themes/beastie/layouts/list.html diff --git a/documentation/themes/beastie/layouts/_default/single.html b/documentation/themes/beastie/layouts/single.html index b45d15b378..b45d15b378 100644 --- a/documentation/themes/beastie/layouts/_default/single.html +++ b/documentation/themes/beastie/layouts/single.html diff --git a/documentation/themes/beastie/theme.toml b/documentation/themes/beastie/theme.toml index 03ac34d6a9..01c9e63531 100644 --- a/documentation/themes/beastie/theme.toml +++ b/documentation/themes/beastie/theme.toml @@ -3,7 +3,7 @@ copyright = "BSD 2-clause 'Simplified' License" description = "Theme to build the FreeBSD Documentation Portal" homepage = "https://docs.FreeBSD.org" tags = ["website", "freebsd", "bsd", "documentation"] -min_version = "0.78" +min_version = "0.146.0" [author] name = "Sergio Carlavilla" diff --git a/website/content/en/cgi/man.cgi b/website/content/en/cgi/man.cgi index 01821697dc..6f1903bffd 100755 --- a/website/content/en/cgi/man.cgi +++ b/website/content/en/cgi/man.cgi @@ -940,7 +940,8 @@ $manPathDefault = 'FreeBSD 14.3-RELEASE and Ports'; 'Debian 10.13.0', "$manLocalDir/Debian-10.13.0/man:$manLocalDir/Debian-10.13.0/misc", 'Debian 11.11.0', "$manLocalDir/Debian-11.11.0/man:$manLocalDir/Debian-11.11.0/misc", 'Debian 12.11.0', "$manLocalDir/Debian-12.11.0/man:$manLocalDir/Debian-12.11.0/misc", - 'Debian 13.0 unstable', "$manLocalDir/Debian-unstable/man:$manLocalDir/Debian-unstable/misc", + 'Debian 13.0.0', "$manLocalDir/Debian-13.0.0/man:$manLocalDir/Debian-13.0.0/misc", + 'Debian 14.0 unstable', "$manLocalDir/Debian-unstable/man:$manLocalDir/Debian-unstable/misc", 'Ubuntu 23.10 mantic', "$manLocalDir/Ubuntu-mantic-23.10/man:$manLocalDir/Ubuntu-mantic-23.10/misc", @@ -1217,12 +1218,12 @@ while ( ( $key, $val ) = each %manPath ) { 'slackware', 'Linux Slackware 3.1', 'redhat', 'Red Hat 9', 'suse', 'SuSE 11.3', - 'debian', 'Debian 12.11.0', + 'debian', 'Debian 13.0.0', 'ubuntu', 'Ubuntu 24.04 noble', 'dragonfly', 'DragonFly 6.4.0', 'centos', 'CentOS 7.9', 'rocky', 'Rocky 10.0', - 'linux', 'Debian 12.11.0', + 'linux', 'Debian 13.0.0', 'darwin', 'Darwin 8.0.1/ppc', 'opendarwin', 'OpenDarwin 7.2.1', 'macosx', 'Darwin 8.0.1/ppc', diff --git a/website/content/en/docproj/translations.adoc b/website/content/en/docproj/translations.adoc index cf3f6ec413..ab9baa8840 100644 --- a/website/content/en/docproj/translations.adoc +++ b/website/content/en/docproj/translations.adoc @@ -232,13 +232,9 @@ Handbook Documents available: -* link:https://docs.freebsd.org/ru/books/faq/[FAQ] -* link:https://www.freebsd.org/ru/[WWW] -* link:http://www.freebsd.org.ua/docs.html[Other documents list] - -Documents currently being worked on: - -* link:http://www.freebsd.org.ua/doc/ru_RU.KOI8-R/books/handbook/[Handbook] +* link:https://docs.freebsd.org/ru/[FreeBSD documentation] +* link:https://docs.freebsd.org/ru/books/[Books] +* link:https://docs.freebsd.org/ru/books/handbook/[Handbook] [[spanish]] == The FreeBSD Spanish Documentation Project diff --git a/website/content/en/events/2003.adoc b/website/content/en/events/2003.adoc index 8be785d4da..28fd480492 100644 --- a/website/content/en/events/2003.adoc +++ b/website/content/en/events/2003.adoc @@ -7,5 +7,3 @@ year: 2003 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2004.adoc b/website/content/en/events/2004.adoc index 6b169ef8b3..f39fd313d5 100644 --- a/website/content/en/events/2004.adoc +++ b/website/content/en/events/2004.adoc @@ -7,5 +7,3 @@ year: 2004 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2005.adoc b/website/content/en/events/2005.adoc index d14fa7909a..5b319696f7 100644 --- a/website/content/en/events/2005.adoc +++ b/website/content/en/events/2005.adoc @@ -7,5 +7,3 @@ year: 2005 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2006.adoc b/website/content/en/events/2006.adoc index f6284e3391..9afd2e2f0a 100644 --- a/website/content/en/events/2006.adoc +++ b/website/content/en/events/2006.adoc @@ -7,5 +7,3 @@ year: 2006 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2007.adoc b/website/content/en/events/2007.adoc index 60837d412b..e838343f48 100644 --- a/website/content/en/events/2007.adoc +++ b/website/content/en/events/2007.adoc @@ -7,5 +7,3 @@ year: 2007 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2008.adoc b/website/content/en/events/2008.adoc index 4bd3c336ee..02e4de5c0c 100644 --- a/website/content/en/events/2008.adoc +++ b/website/content/en/events/2008.adoc @@ -7,5 +7,3 @@ year: 2008 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2009.adoc b/website/content/en/events/2009.adoc index d3a2ef7c99..ac88d5aeb4 100644 --- a/website/content/en/events/2009.adoc +++ b/website/content/en/events/2009.adoc @@ -7,5 +7,3 @@ year: 2009 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2010.adoc b/website/content/en/events/2010.adoc index b6ea650cd6..83b07176c2 100644 --- a/website/content/en/events/2010.adoc +++ b/website/content/en/events/2010.adoc @@ -7,5 +7,3 @@ year: 2010 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2011.adoc b/website/content/en/events/2011.adoc index eae4fc9679..bd368f023d 100644 --- a/website/content/en/events/2011.adoc +++ b/website/content/en/events/2011.adoc @@ -7,5 +7,3 @@ year: 2011 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2012.adoc b/website/content/en/events/2012.adoc index 10c3d5eb77..7fba506c0e 100644 --- a/website/content/en/events/2012.adoc +++ b/website/content/en/events/2012.adoc @@ -7,5 +7,3 @@ year: 2012 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2013.adoc b/website/content/en/events/2013.adoc index 5fd0d45c64..ad0d1cb238 100644 --- a/website/content/en/events/2013.adoc +++ b/website/content/en/events/2013.adoc @@ -7,5 +7,3 @@ year: 2013 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2014.adoc b/website/content/en/events/2014.adoc index e635ab1379..548b59d71f 100644 --- a/website/content/en/events/2014.adoc +++ b/website/content/en/events/2014.adoc @@ -7,5 +7,3 @@ year: 2014 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2015.adoc b/website/content/en/events/2015.adoc index 684e7e6e86..e32c1c1411 100644 --- a/website/content/en/events/2015.adoc +++ b/website/content/en/events/2015.adoc @@ -7,5 +7,3 @@ year: 2015 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2016.adoc b/website/content/en/events/2016.adoc index 83c4e0c5f1..cef6741818 100644 --- a/website/content/en/events/2016.adoc +++ b/website/content/en/events/2016.adoc @@ -7,5 +7,3 @@ year: 2016 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2017.adoc b/website/content/en/events/2017.adoc index 4723378198..4b8038ffc2 100644 --- a/website/content/en/events/2017.adoc +++ b/website/content/en/events/2017.adoc @@ -7,5 +7,3 @@ year: 2017 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2018.adoc b/website/content/en/events/2018.adoc index f8e8d1418c..4687c72371 100644 --- a/website/content/en/events/2018.adoc +++ b/website/content/en/events/2018.adoc @@ -7,5 +7,3 @@ year: 2018 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2019.adoc b/website/content/en/events/2019.adoc index 6c7f31a224..51d439cc76 100644 --- a/website/content/en/events/2019.adoc +++ b/website/content/en/events/2019.adoc @@ -7,5 +7,3 @@ year: 2019 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2020.adoc b/website/content/en/events/2020.adoc index 4a7766fd22..a078b71fe8 100644 --- a/website/content/en/events/2020.adoc +++ b/website/content/en/events/2020.adoc @@ -7,5 +7,3 @@ year: 2020 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2021.adoc b/website/content/en/events/2021.adoc index 22af582d92..9d6ff930bf 100644 --- a/website/content/en/events/2021.adoc +++ b/website/content/en/events/2021.adoc @@ -7,5 +7,3 @@ year: 2021 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/2022.adoc b/website/content/en/events/2022.adoc index 00ed6feee7..01572c2137 100644 --- a/website/content/en/events/2022.adoc +++ b/website/content/en/events/2022.adoc @@ -7,5 +7,3 @@ year: 2022 = FreeBSD Past Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/events/_index.adoc b/website/content/en/events/_index.adoc index 41ac0fc4f8..b013917568 100644 --- a/website/content/en/events/_index.adoc +++ b/website/content/en/events/_index.adoc @@ -6,5 +6,3 @@ sidenav: community = FreeBSD Events Please send details of any FreeBSD related events or events that are of interest for FreeBSD users which are not listed here to freebsd-doc@FreeBSD.org. - -Countries and regions displayed in dark red on the map below are hosting upcoming FreeBSD-related events. Countries that have hosted FreeBSD-related events in the past show up in yellow or orange, with darker colors representing a larger number of previous events. diff --git a/website/content/en/internal/about.adoc b/website/content/en/internal/about.adoc index 1d50c99c86..8e86eb6490 100644 --- a/website/content/en/internal/about.adoc +++ b/website/content/en/internal/about.adoc @@ -14,10 +14,8 @@ image:../../gifs/powerlogo.gif[Powered by FreeBSD] Naturally, all systems in the FreeBSD.org cluster run FreeBSD. The hardware and network connection have been generously provided by: -* https://www.bytemark.co.uk/[Bytemark Hosting] * Cloud and SDN Laboratory at https://www.bbtower.co.jp/en/corporate/[BroadBand Tower, Inc] * https://www.cs.nycu.edu.tw/[Department of Computer Science, National Yang Ming Chiao Tung University] -* https://deploy.equinix.com/[Equinix] * https://internet.asn.au/[Internet Association of Australia] * https://www.isc.org/[Internet Systems Consortium] * https://www.inx.net.za/[INX-ZA] @@ -28,6 +26,7 @@ Naturally, all systems in the FreeBSD.org cluster run FreeBSD. The hardware and * https://nic.br/[NIC.br] * https://www.teleservice.net/[Teleservice Skåne AB] * https://your.org/[Your.Org] +* https://www.sonic.com/[Sonic.net, LLC] -- and other link:../../donations/donors[contributors] to the FreeBSD project. diff --git a/website/content/en/portmgr/_index.adoc b/website/content/en/portmgr/_index.adoc index 2b4c6440ab..a7257c449a 100644 --- a/website/content/en/portmgr/_index.adoc +++ b/website/content/en/portmgr/_index.adoc @@ -43,7 +43,7 @@ The central reference book for FreeBSD ports submitters, maintainers, and commit * https://pkg-status.freebsd.org/[FreeBSD Ports Build Cluster] + These machines continually build packages on all possible combinations of OS release and CPU architecture (in our terminology, `build environments`), and produce error logs of problems that are encountered along the way. -* link:{releng}#release-build[FreeBSD Release Engineering for Third Party Packages] + +* link:{freebsd-releng}[FreeBSD Release Engineering] + Describes the approach used by the FreeBSD release engineering team to produce a high quality package set suitable for official FreeBSD release media, with specific emphasis on how to split up the packages for the release media, and how to verify that a package set is consistent. * link:{committers-guide}[FreeBSD Committer's Guide] + diff --git a/website/content/en/releases/14.0R/relnotes.adoc b/website/content/en/releases/14.0R/relnotes.adoc index 7a79c85cae..14d6e83b7a 100644 --- a/website/content/en/releases/14.0R/relnotes.adoc +++ b/website/content/en/releases/14.0R/relnotes.adoc @@ -361,7 +361,7 @@ A new man:fwget[8] utility inspects the system for peripherals that need firmwar For now, only the PCI subsystem is supported, and only video firmware for Intel and AMD GPUs is known. gitref:d198b8774d2c[repository=src] gitref:d198b8774d2c[repository=src] (Sponsored by Beckhoff Automation GmbH & Co. KG) -The usability of man:head[1] and man:tail[1] has been improved by consistently supporting the `-q` and `-h` options, allowing numbers with SI suffixes, and removing the 2^31 limit on lines for man:head[1]. +The usability of man:head[1] and man:tail[1] has been improved by consistently supporting the `-q` and `-v` options, allowing numbers with SI suffixes, and removing the 2^31 limit on lines for man:head[1]. gitref:643ac419fafb[repository=src] man:makefs[8] now has experimental ZFS support. diff --git a/website/content/en/status/report-2025-04-2025-06/doceng.adoc b/website/content/en/status/report-2025-04-2025-06/doceng.adoc index 4b1d477a83..2c779528f3 100644 --- a/website/content/en/status/report-2025-04-2025-06/doceng.adoc +++ b/website/content/en/status/report-2025-04-2025-06/doceng.adoc @@ -112,6 +112,6 @@ doceng@: ==== Open issues -There is 1 Open PRs in bugzilla assigned to doceng@: +There is 1 Open PRs in Bugzilla assigned to doceng@: * 267274 Please remove the zh-CN Handbook of the current FreeBSD website diff --git a/website/content/en/usergroups/_index.adoc b/website/content/en/usergroups/_index.adoc index b07c659e54..1048277d55 100644 --- a/website/content/en/usergroups/_index.adoc +++ b/website/content/en/usergroups/_index.adoc @@ -351,6 +351,9 @@ For more information please visit our link:https://bsdtw.org[website]. link:https://ambug.org[Armenia BSD User Group]:: We're a community of BSD Hackers, Unix Sysadmins and Unix-like system users who gather once a month (online and offline) to discuss BSD Unix related topics. +link:https://arbian.org[Saudi Arabia BSD User Group]:: +Arbian open source community in Saudi Arabia, *BSD one of part of the community, represents and supports Arabic language. + [[oceania]] === Oceania diff --git a/website/content/en/where.adoc b/website/content/en/where.adoc index 1e9e3f59a3..dc4dac809e 100644 --- a/website/content/en/where.adoc +++ b/website/content/en/where.adoc @@ -224,7 +224,7 @@ The word `CURRENT` is sometimes a source of confusion: * if you are looking for the _current version_ of FreeBSD, you most likely want a `RELEASE` version (see above) – **not** `CURRENT` – `CURRENT` has special meaning in the development process. [[download-snapshots]] -=== Development Snapshots +== Development Snapshots See link:../snapshots/[FreeBSD Snapshot Releases]. @@ -293,3 +293,12 @@ The projects below are of particular interest. == Archives http://ftp-archive.FreeBSD.org/pub/FreeBSD-Archive/old-releases/[Past releases] of FreeBSD. + +[[fastly]] +== Fastly CDN + +The FreeBSD project gratefully acknowledges the support of https://www.fastly.com[Fastly], providing CDN acceleration, caching, and bandwidth to bring FreeBSD images and packages to our globally distributed community. + +image::../gifs/fastlyLogo-red-SVG.svg[Fastly Logo,120] + +See also the link:{handbook}mirrors[FreeBSD project mirrors]. diff --git a/website/data/en/vendors/consulting.toml b/website/data/en/vendors/consulting.toml index 29d769472f..3517b6e1e9 100644 --- a/website/data/en/vendors/consulting.toml +++ b/website/data/en/vendors/consulting.toml @@ -30,11 +30,11 @@ url = "http://www.bpanet.de/" description = "Black Point Arts Internet Solutions GmbH is located in Germany (Frankfurt/Main). We have experiences with FreeBSD, Linux and Windows Servers. Our business activities include hosting/homing, programming and webdesign. We develop solutions for your intra-, extra- and internet needs. For more information you can visit <a href=\"http://www.bpanet.de/\">our website</a> or write an email to <a href=\"mailto:service@bpanet.de\">service@bpanet.de</a>." [[consulting]] -id = "RossCameron" +id = "PrometheusSystems" category = "africa" -name = "Ross Cameron" -url = "mailto:rwd.cameron@consultant.com" -description = "Based in Johannesburg, South Africa, we provide a broad range of UNIX systems consulting services including systems administration services (onsite and remote), network design and implementation (LANs, WiFi deployments, private and public cloud services, custom FreeBSD based firewalls), large storage deployments (ZFS, NFS, CIFS), and hypervisor deployments and management (Bhyve and KVM). Contact Ross <a href=\"mailto:rwd.cameron@consultant.com\">via Email</a>." +name = "Prometheus Systems" +url = "https://prometheus-systems.co.za/" +description = "Based in Johannesburg, South Africa, we provide a broad range of UNIX systems consulting services including systems administration services, both onsite and remote, network design and implementation (LANs, WiFi deployments, private and public cloud services, custom FreeBSD based firewalls), large storage deployments (ZFS, NFS, CIFS), and hypervisor deployments and management (Bhyve and KVM)." [[consulting]] id = "CloneConsulting" diff --git a/website/data/en/vendors/hardware.toml b/website/data/en/vendors/hardware.toml index 6b459c776a..f88996e3e6 100644 --- a/website/data/en/vendors/hardware.toml +++ b/website/data/en/vendors/hardware.toml @@ -1,5 +1,4 @@ # Sort the entries by name -# $FreeBSD$ [[hardware]] id = "ABMX" @@ -34,7 +33,7 @@ description = "Aspen Systems is based out of Wheat Ridge, CO and has been in bus [[hardware]] id = "atto" name = "ATTO Technology" -url = "http://www.attotech.com" +url = "https://www.atto.com/" description = "For over 25 years, ATTO Technology, Inc. has been a global leader in storage and network connectivity and infrastructure solutions for data-intensive computing environments. ATTO manufactures Host Bus Adapters, RAID adapters, network adapters, RAID storage controllers, Thunderbolt-enabled Desklink devices, bridges, switches and software. ATTO's Celerity 16Gb Fibre Channel adapters, ExpressSAS 12Gb SAS/SATA HBAs and SAN Storage Controllers all support 9.3 and 10.x operating systems." [[hardware]] @@ -50,12 +49,6 @@ url = "https://core-systems.com" description = "Core Systems is a global leader in Rugged Computers and Rugged Displays for military and industrial needs based out of California. We build rugged products that are deployed in ground vehicles, aircraft, and maritime installations worldwide." [[hardware]] -id = "CoyotePointSystems" -name = "Coyote Point Systems" -url = "http://www.coyotepoint.com/" -description = "Coyote Point Systems offers the Equalizer Load Balancing Appliance. Equalizer distributes client UDP/TCP requests to multiple server machines and includes load balancing, server failure detection/correction, and an easy-to-use administrative interface. Capable of handling over 20,000 HTTP GET operations per minute, Equalizer enhances the Scalability, Availability and Manageability of any server cluster. Equalizer works with all standard protocols, including: HTTP, FTP, POP, SMTP, DNS, etc. Equalizer is based on the FreeBSD kernel." - -[[hardware]] id = "DAVICOM" name = "DAVICOM Semiconductor, Inc." url = "http://www.davicom.com.tw/index.php?lang_id=en" @@ -100,7 +93,7 @@ description = "MOXA makes attractively priced multi-port serial cards which are [[hardware]] id = "Netgate" name = "Netgate" -url = "http://store.netgate.com/" +url = "https://shop.netgate.com/" description = "Netgate is a high quality communications appliance manufacturer that designs highly configurable computers engineered for low-power, high-throughput, dependable deployments. We offer quick deployment with off-the-shelf systems, specialized custom product solutions and an end-to-end OEM service program for large customers. <p>Netgate directly supports Open Source software and Open Source hardware projects by providing management, engineering and support resources for the pfSense project.</p>" [[hardware]] @@ -110,12 +103,6 @@ url = "http://www.iXsystems.com/" description = "iXsystems (formerly OffMyServer) provides FreeBSD and Linux-based Internet infrastructure-grade rackmount servers, network appliances, enterprise blade servers, and storage products to a global market. We use only the best quality components and do the required testing in advance - knowing that you are going to run your mission-critical applications on our servers. We are confident that you will appreciate our approach - give us an opportunity to server you! Send us an email at <a href=\"mailto:info@iXsystems.com\">info@iXsystems.com</a>." [[hardware]] -id = "OrbitMicro" -name = "Orbit Micro" -url = "http://www.orbitmicro.com/" -description = "Orbit Micro is a system integrator of servers, workstations, industrial computers and networking products. Our application design approach allows us to maximize performance for your computing needs. Our products line also includes a vareity of computer components and peripherals as well as software. Contact us at <a href=\"mailto:sales@orbitmicro.com\">sales@orbitmicro.com</a> to speak to a sales engineer or if you have questions or comments." - -[[hardware]] id = "PCW" name = "PCW Microsystems, Inc." url = "http://www.rackmount.com/" @@ -140,21 +127,9 @@ url = "http://www.perle.com/" description = "Perle Specialix makes a wide variety of multi-port async serial expansion products. The ISA, EISA, and PCI SI/XIO host cards work under FreeBSD, using the <em>si</em> driver." [[hardware]] -id = "serveru" -name = "ServerU Inc." -url = "https://www.serveru.us/en/" -description = "We make Server hardware for open source flavors of Unix-like systems. ServerU is a joint effort of FreeBSD specialist company with more than 15 years expertise, and ServerU itself, a US company based on Miami, FL. We focus on designing and making rack-mount 1U networking appliances completely supported by open source Unix-like systems. We make hardware supported and certified for FreeBSD, OpenBSD and Linux. We also focus on ProApps, pfSense, Vyatta (VyOS), Endian and other systems, as well as Juniper, Brocade and other networking products accelerated by Netmap and DPDK technologies. Se offer FreeBSD consulting, support and services on US east cost and Caribbean." - -[[hardware]] -id = "StoreAnyWhere" -name = "StoreAnyWhere.com" -url = "http://StoreAnyWhere.com/" -description = "StoreAnyWhere.com offers a wide range of high-performance and cost-effective quad- and dual-processor servers, workstations, and networking products with FreeBSD and Linux as their operating systems. Just go to our website for servers in a variety of configurations or custom-made systems." - -[[hardware]] id = "SWTechnology" name = "SW Technology" -url = "http://freebsd.swt.com/" +url = "https://www.swt.com/" description = "SW Technology offers quality Pentium machines with FreeBSD pre-installed." [[hardware]] @@ -164,12 +139,6 @@ url = "http://www.synetic.net/" description = "Synetic Inc. is a Canadian and North American distributor for IDE-to-IDE, SCSI-to-IDE and SCSI-to-SCSI RAID controllers, supporting the FreeBSD platform." [[hardware]] -id = "Zantech" -name = "Zantech KVM Australia" -url = "http://www.zantech.com.au/" -description = "Zantech KVM Australia is an Australian distributor of FreeBSD compatible KVM switches, KVM over IP products and serial console terminal servers." - -[[hardware]] id = "NCSTechnologies" name = "NCS Technologies" url = "http://www.ncst.com/" @@ -213,9 +182,9 @@ description = "Server Racks Online computer rack superstore. At Server Racks Onl [[hardware]] id = "CPTechnologies" -name = "CP Technologies" -url = "https://cp-techusa.com/" -description = "CP Technologies designs, fabricates and integrates standard and custom high-performance computing platforms, data links, and LCD displays for military, industrial, and commercial markets." +name = "CP North America" +url = "https://cpnorthamerica.com/" +description = "CP North America designs, fabricates and integrates standard and custom high-performance computing platforms, data links, and LCD displays for military, industrial, and commercial markets." [[hardware]] id = "servaris" @@ -230,12 +199,6 @@ url = "https://www.thinkpenguin.com" description = "ThinkPenguin specializes in supporting free software operating systems via one of the largest hardware catalogs in the world. We stock a wide array of computers, peripherals, and accessories. What sets us apart is our devotion to improving hardware support for free software operating systems and ensuring that hardware can be properly and natively supported by the FreeBSD community." [[hardware]] -id = "bargainhardware" -name = "Bargain Hardware" -url = "https://www.bargainhardware.co.uk" -description = "Bargain Hardware supply a huge variety of refurbished desktops and laptops, all of which are offered with FreeBSD OS installation as an option on the website configurator. Server and Workstation installation is also available by request of our sales team." - -[[hardware]] id = "minifree" name = "Minifree" url = "https://minifree.org" diff --git a/website/data/en/vendors/isp.toml b/website/data/en/vendors/isp.toml index 2fe87fcfca..f41e5fbc39 100644 --- a/website/data/en/vendors/isp.toml +++ b/website/data/en/vendors/isp.toml @@ -98,12 +98,6 @@ url = "https://www.eserver.ru/" description = "We provide high quality web-hosting and VIP-hosting services in Russia and CIS based only on FreeBSD systems customized for hosting needs, dedicated servers with support of all currently available FreeBSD distributions." [[isp]] -id = "Quonix" -name = "Quonix Networks" -url = "http://www.quonix.net/" -description = "Quonix Networks provides a variety of personal and enterprise hosting solutions powered by FreeBSD, including web, mail, secure shell hosting, dedicated servers and colocation." - -[[isp]] id = "peaknetworks" name = "peaknetworks" url = "https://www.peaknetworks.net" @@ -128,24 +122,12 @@ url = "http://www.venigo.fr/" description = "Venigo Internet Services is a French based company, which provides hosting solutions like shared, dedicated, colocation hostings, and VPN solutions based on FreeBSD. Venigo Internet Services is also able to provide management and support for variety of BSD & Linux systems." [[isp]] -id = "SolutionPoint" -name = "Solution Point" -url = "http://www.solutionpoint.in/" -description = "Based in New Delhi, India, Solution Point provides <a href=\"http://www.solutionpoint.in/node/565\">VPS Hosting on FreeBSD/amd64</a>. We use only official FreeBSD and provide various capacities to serve most demanding requirements of full dedicated servers." - -[[isp]] id = "netcup" name = "netcup GmbH" url = "http://www.netcup.de/" description = "Netcup is a hosting provider located in Germany and we are specialized in providing webhosting and virtual servers. At the beginning of 2013 we changed our virtualisation technology to KVM. This gives you the possibility to run the operating system of your choice. You can easily setup your vServer with just a few clicks by using our prepared FreeBSD image." [[isp]] -id = "NQhost" -name = "NQhost" -url = "http://nqhost.com/" -description = "NQhost offers virtual private servers with guaranteed resources. Our <a href=\"http://nqhost.com/freebsd-vps.html\">FreeBSD VPS</a> packages can be created in Germany or US-located data centers. We offer flexible tariff plans, configurations and friendly support." - -[[isp]] id = "NYI" name = "NYI" url = "http://www.nyi.net/" @@ -176,15 +158,9 @@ url = "http://www.bytecamp.net/" description = "We run a homogenic FreeBSD environment in our own datacenter located in East Germany near Berlin since 2000. Our developers contribute code to many open source projects. bytecamp is the home for <a href=\"http://www.desktopbsd.net/\">desktopbsd.net</a> and both biggest German BSD communities, <a href=\"http://www.bsdforen.de/\">bsdforen.de</a> and <a href=\"http://www.bsdgroup.de/\">bsdgroup.de</a>. bytecamp offers professional hosting on a FreeBSD cluster, enterprise email solutions, domain name registration, dedicated and virtual servers. We offer several shared, reseller and shell hosting plans on FreeBSD platform that will meet and exceed all of your web presence needs from small personal family web sites to full blown online e-commerce solutions." [[isp]] -id = "oph" -name = "OPH" -url = "http://www.oph.net/" -description = "OPH is a internet hosting provider located in Amsterdam. We deliver powerful FreeBSD dedicated servers and custom-built servers to meet your requirements. On the network side, all our servers include full 100Mbps / 1Gbps connections to the Internet. For more information, please check our <a href=\"http://www.oph.net\">website</a>, or call us at +31 527 688768." - -[[isp]] id = "ovh" name = "OVH" -url = "http://www.ovh.com/" +url = "https://www.ovhcloud.com" description = "With many own datacenters on 4 continents and extensive offers for even the most demanding infrastructure needs, OVH is the number 3 internet hosting company in the world and a globally leading cloud provider on the market. Among almost 100 other Unix/Linux distributions, OVH is proud to provide the latest FreeBSD versions for dedicated and virtual servers since FreeBSD 4." [[isp]] @@ -194,12 +170,6 @@ url = "http://www.transip.nl" description = "Transip B.V. is a top 5 domain registrar in the Netherlands. TransIP uses FreeBSD exclusively on its own servers and offers virtual hosting and dedicated servers based on FreeBSD." [[isp]] -id = "kionic" -name = "Kionic.com Web Hosting" -url = "http://www.kionic.com" -description = "We provide fast, reliable, and affordable web hosting and reseller hosting services backed by fast and friendly customer service. Our operating system of choice is FreeBSD." - -[[isp]] id = "JohnCompanies" name = "JohnCompanies" url = "https://www.jcihosting.com/" @@ -212,12 +182,6 @@ url = "http://www.fastpcnet.net" description = "We offer colocation and managed services via our data center facilities. We recommend FreeBSD to our colocation customers who want a stable and flexible platform. We provide a pure colocation environment or dedicated managed hosting." [[isp]] -id = "pairnetworks" -name = "pair Networks, Inc." -url = "http://www.pair.com" -description = "pair Networks, a global FreeBSD-based Web hosting and domain name registration company, headquartered in Pittsburgh, PA, hosts hundreds of thousands of Web sites for businesses, bloggers, artists, educational institutions and non-profit organizations from around the world. pair Networks first went online in January 1996 and has experienced strong growth year after year. All pair Networks' Web servers run the reliable FreeBSD operating system. For more information <a href=\"http://www.pair.com/contact/\">contact us</a> via e-mail or phone." - -[[isp]] id = "hamburgnet" name = "Hamburgnet" url = "http://www.hamburgnet.de" @@ -230,12 +194,6 @@ url = "http://www.swishmail.com/" description = "Swishmail, New York City based company, provides business <a href=\"http://www.swishmail.com/emailhosting1.php\">email hosting</a> with virus/spam-scanning running on FreeBSD amd64 on HP AMD Dual Opteron 64 bit servers since 1999. Swishmail is in the business of <a href=\"http://www.swishmail.com/emailhosting1.php\">email hosting</a>, shell providing, <a href=\"http://www.swishmail.com/webhosting1.php\">web hosting</a>, dedicated servers, and email accounting." [[isp]] -id = "reliableservers" -name = "ReliableServers" -url = "http://www.reliableservers.com/" -description = "ReliableServers provides managed and unmanaged dedicated server hosting and colocation. FreeBSD is our #1 installed OS, we even provide a local cvsup for all clients. Our datacenter is staffed around the clock to provide the best possible support. Visit us at <a href=\"http://www.reliableservers.com/\">www.ReliableServers.Com</a>" - -[[isp]] id = "colocrossing" name = "Colocrossing" url = "http://www.colocrossing.com" @@ -248,12 +206,6 @@ url = "https://www.netactuate.com/" description = "NetActuate is a hosting company specializing in virtual FreeBSD hosting and managed services. The FreeBSD Virtual Private Servers allow users to modify the kernel, setup a firewall and many more options. Each VPS includes root access and a web-based control panel for managing the virtual environment. Technical support is handled in-house by FreeBSD experts who can diagnose problems and help you get up and running quickly. NetActuate has donated services to FreeBSD developers to support the community." [[isp]] -id = "SimpleRezo" -name = "SimpleRezo" -url = "http://www.simplerezo.com" -description = "SimpleRezo, a French company, provides web hosting solutions based exclusively on FreeBSD and technologies (jails or dedicated server, Apache, PHP, Tomcat, MySQL, pgSQL...). Other services include: Network architecture consulting (fail-over, high availability), FreeBSD server administration or support (fileserver, firewalls, mailserver) and others more. Please visit our <a href=\"http://www.simplerezo.com/nous-contacter.php\">website</a> to get more information." - -[[isp]] id = "webdrops" name = "Webdrops ICT" url = "http://www.webdrops.net" @@ -296,12 +248,6 @@ url = "https://www.delimiter.com/" description = "Delimiter provides unmanaged, affordable dedicated servers, and cloud hosting from our US based data centers. Our unmanaged service includes a wide range of self-serve tools including automated OS installations and dedicated KVM functionality. We also offer cheap bare metal dedicated servers. Our support technicians have 5+ years of Unix, BSD, and Linux sysadmin experience." [[isp]] -id = "linevast" -name = "Linevast" -url = "https://linevast.de/" -description = "Linevast has been providing reliable dedicated-server and vps products since 2013. The provider offers various FreeBSD templates for their server-products. Each product comes with free ddos-protection and unmetered traffic." - -[[isp]] id = "surelinebroadband" name = "Sureline Broadband" url = "http://www.surelinebroadband.com" @@ -326,18 +272,6 @@ url = "https://www.elmotaheda-web.com" description = "El Motaheda are specialized in providing local (Egypt) solutions for businesses and organizations totally centered on open source. We provide based firewalls and storage solutions." [[isp]] -id = "vstack" -name = "vStack" -url = "https://vstack.com" -description = "vStack builds hyper-converged infrastructure providing unified cluster space, software defined computing, storage and networking capabilities, redundancy and failover features." - -[[isp]] -id = "serveria" -name = "Serveria" -url = "https://serveria.com/" -description = "Serveria offers shared hosting, cloud VPS, dedicated servers, colocation, domain registration, SSL certificates etc. All of their services are 100% confidential. They support and offer services since 2009." - -[[isp]] id = "bestbuyrdp" name = "Bestbuyrdp" url = "https://bestbuyrdp.com/" diff --git a/website/data/en/vendors/misc.toml b/website/data/en/vendors/misc.toml index 414466f943..fefc82d8a0 100644 --- a/website/data/en/vendors/misc.toml +++ b/website/data/en/vendors/misc.toml @@ -1,21 +1,7 @@ # Sort the entries by name -# $FreeBSD$ [[misc]] id = "FreeBSDMall" name = "FreeBSD Mall" url = "http://www.freebsdmall.com/" description = "The FreeBSD Mall can provide everything you may want or need to enhance your FreeBSD experience. Are you new to FreeBSD? Or, perhaps you've been using it for years? We have something for you. We have the latest FreeBSD CDROMs, helpful books, and colorful shirts and hats. Stay current with FreeBSD and put it to work for you!" - -[[misc]] -id = "exavault" -name = "ExaVault" -url = "http://www.exavault.com" -description = "ExaVault provides inexpensive online remote backup space that is accessible via open, industry standard protocols, including rsync, FTP and SFTP. It is ideal for small and medium businesses, web hosting companies and others that need a quick, transparent, maintenance-free way of mirroring a copy of their data to a remote backup server. We are fully FreeBSD compatible, and provide full support for getting things setup on your FreeBSD system." - -[[misc]] -id = "gfuschulung" -name = "GFU Schulung" -url = "http://www.gfu.net/" -description = "GFU offers <a href=\"http://www.gfu.net/seminare-schulungen-kurse/oracle_db_sprachen_design_sk38/freebsd_training_s856.html\">FreeBSD Training</a> for customizing servers with a whole bunch of open source software like PostgreSQL, OpenOffice, Cyrus IMAP, etc. Upon customer request especially: <a href=\"http://www.gfu.net/seminare-schulungen-kurse/oracle_db_sprachen_design_sk38/oracle_unter_freebsd_s854.html\">Oracle Administration under FreeBSD</a>." - diff --git a/website/static/.well-known/security.txt b/website/static/.well-known/security.txt new file mode 100644 index 0000000000..6c99200641 --- /dev/null +++ b/website/static/.well-known/security.txt @@ -0,0 +1,18 @@ +# Our security addresses +Contact: mailto:security-officer@FreeBSD.org +Contact: mailto:secteam@FreeBSD.org + +# Our OpenPGP key +Encryption: https://www.freebsd.org/security/so_public_key.asc + +# The codes for the languages our security contacts prefer to use +Preferred-Languages: en + +# The official URL for this file +Canonical: https://www.freebsd.org/.well-known/security.txt + +# Our security policy pages +Policy: https://www.freebsd.org/security/#reporting +Policy: https://www.freebsd.org/security/reporting/ + +Expires: 2025-12-06T00:00:00.000Z diff --git a/website/static/gifs/fastlyLogo-red-SVG.svg b/website/static/gifs/fastlyLogo-red-SVG.svg new file mode 100644 index 0000000000..c372d52649 --- /dev/null +++ b/website/static/gifs/fastlyLogo-red-SVG.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 198.27"><defs><style>.cls-1{fill:#ff282d;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g id="Fastly_Logo_-_Red" data-name="Fastly Logo - Red"><g id="Fastly_Logo_-_Red-2" data-name="Fastly Logo - Red"><polygon class="cls-1" points="348.44 20.35 348.44 153.94 388.57 153.94 388.57 133.53 375.31 133.53 375.31 0 348.44 0 348.44 20.35"/><path class="cls-1" d="M0,133.53H13.64V69.08H0V51.35l13.64-2.24V31.17C13.64,9.43,18.37,0,46.09,0A115.17,115.17,0,0,1,65.38,2L61.7,23.85a49.78,49.78,0,0,0-9-.78c-9.76,0-12.23,1-12.23,10.51V49.11H60.79v20H40.51v64.45H54v20.4H0Z"/><path class="cls-1" d="M334.78,127.08a53.11,53.11,0,0,1-10.54.84c-11.06.27-10.1-3.36-10.1-13.78V69.08h21v-20h-21V0H287.27V119.71c0,23.5,5.8,34.23,31.08,34.23,6,0,14.21-1.54,20.42-2.87Z"/><path class="cls-1" d="M501.7,133.63a10.14,10.14,0,1,1-10.19,10.14,10.14,10.14,0,0,1,10.19-10.14m0,18.68a8.55,8.55,0,0,0,8.51-8.54,8.5,8.5,0,1,0-8.51,8.54m1.88-3.56-2.05-3h-1.42v3h-2.29v-10H502c2.46,0,4,1.24,4,3.45a3,3,0,0,1-2.08,3.09l2.49,3.42Zm-3.47-5h1.82c1,0,1.74-.4,1.74-1.5s-.7-1.45-1.68-1.45h-1.88Z"/><path class="cls-1" d="M253.72,69V65.46A115.8,115.8,0,0,0,233.14,64c-12.5,0-14,6.63-14,10.23,0,5.08,1.74,7.83,15.29,10.79,19.8,4.45,39.69,9.09,39.69,33.64,0,23.29-12,35.32-37.21,35.32-16.88,0-33.26-3.63-45.76-6.8V127.08h20.35v3.56c8.75,1.69,17.93,1.52,22.73,1.52,13.34,0,15.49-7.17,15.49-11,0-5.29-3.82-7.83-16.32-10.37-23.56-4-42.25-12.07-42.25-36,0-22.65,15.14-31.54,40.37-31.54,17.09,0,30.08,2.65,42.59,5.83V69Z"/><path class="cls-1" d="M127.84,85.09,118,93.69a5.25,5.25,0,1,0,3.19,3.2l8.72-9.75Z"/><path class="cls-1" d="M171.25,127.07V43.46H144.37V51a55,55,0,0,0-18.11-6.77v-9.1h3.28V28.28H102.48v6.83h3.28v9.17a55.32,55.32,0,1,0,38.76,101.87l4.77,7.78h28.38V127.07Zm-26.64-26.83A28.42,28.42,0,0,1,117.73,127v-3.18h-3.22V127a28.43,28.43,0,0,1-26.68-26.89H91V96.91H87.85a28.42,28.42,0,0,1,26.66-26.65v3.16h3.22V70.25A28.42,28.42,0,0,1,144.61,97h-3.2v3.22Z"/><path class="cls-1" d="M456.58,49.11H512v20H498.75l-34,83.62c-9.74,23.48-25.74,45.59-50.1,45.59a93.67,93.67,0,0,1-19.5-2l2.43-24.39a68.7,68.7,0,0,0,10.63,1.1c11.3,0,24-7,28-19.19L401.82,69.06H388.57v-20H444v20H430.78l19.51,48h0l19.51-48H456.58Z"/></g></g></g></g></svg>
\ No newline at end of file diff --git a/website/themes/beastie/layouts/partials/advisories.html b/website/themes/beastie/layouts/_partials/advisories.html index b9eab4285b..b9eab4285b 100644 --- a/website/themes/beastie/layouts/partials/advisories.html +++ b/website/themes/beastie/layouts/_partials/advisories.html diff --git a/website/themes/beastie/layouts/partials/commercial-consulting.html b/website/themes/beastie/layouts/_partials/commercial-consulting.html index 5d959a5ef2..5d959a5ef2 100644 --- a/website/themes/beastie/layouts/partials/commercial-consulting.html +++ b/website/themes/beastie/layouts/_partials/commercial-consulting.html diff --git a/website/themes/beastie/layouts/partials/commercial-hardware.html b/website/themes/beastie/layouts/_partials/commercial-hardware.html index 3026998b59..3026998b59 100644 --- a/website/themes/beastie/layouts/partials/commercial-hardware.html +++ b/website/themes/beastie/layouts/_partials/commercial-hardware.html diff --git a/website/themes/beastie/layouts/partials/commercial-isp.html b/website/themes/beastie/layouts/_partials/commercial-isp.html index 8aaaf074af..8aaaf074af 100644 --- a/website/themes/beastie/layouts/partials/commercial-isp.html +++ b/website/themes/beastie/layouts/_partials/commercial-isp.html diff --git a/website/themes/beastie/layouts/partials/commercial-misc.html b/website/themes/beastie/layouts/_partials/commercial-misc.html index 32423ad919..32423ad919 100644 --- a/website/themes/beastie/layouts/partials/commercial-misc.html +++ b/website/themes/beastie/layouts/_partials/commercial-misc.html diff --git a/website/themes/beastie/layouts/partials/commercial-software.html b/website/themes/beastie/layouts/_partials/commercial-software.html index c596ba87d8..c596ba87d8 100644 --- a/website/themes/beastie/layouts/partials/commercial-software.html +++ b/website/themes/beastie/layouts/_partials/commercial-software.html diff --git a/website/themes/beastie/layouts/partials/errata-notices.html b/website/themes/beastie/layouts/_partials/errata-notices.html index a043fbc9ce..a043fbc9ce 100644 --- a/website/themes/beastie/layouts/partials/errata-notices.html +++ b/website/themes/beastie/layouts/_partials/errata-notices.html diff --git a/website/themes/beastie/layouts/partials/events.html b/website/themes/beastie/layouts/_partials/events.html index 79148da802..79148da802 100644 --- a/website/themes/beastie/layouts/partials/events.html +++ b/website/themes/beastie/layouts/_partials/events.html diff --git a/website/themes/beastie/layouts/partials/news.html b/website/themes/beastie/layouts/_partials/news.html index ce1052fe45..ce1052fe45 100644 --- a/website/themes/beastie/layouts/partials/news.html +++ b/website/themes/beastie/layouts/_partials/news.html diff --git a/website/themes/beastie/layouts/partials/press.html b/website/themes/beastie/layouts/_partials/press.html index d3bed55a6f..d3bed55a6f 100644 --- a/website/themes/beastie/layouts/partials/press.html +++ b/website/themes/beastie/layouts/_partials/press.html diff --git a/website/themes/beastie/layouts/partials/sidenav.html b/website/themes/beastie/layouts/_partials/sidenav.html index 7ccc4df3b4..7ccc4df3b4 100644 --- a/website/themes/beastie/layouts/partials/sidenav.html +++ b/website/themes/beastie/layouts/_partials/sidenav.html diff --git a/website/themes/beastie/layouts/partials/site-footer.html b/website/themes/beastie/layouts/_partials/site-footer.html index ca4ee18ff3..ca4ee18ff3 100755 --- a/website/themes/beastie/layouts/partials/site-footer.html +++ b/website/themes/beastie/layouts/_partials/site-footer.html diff --git a/website/themes/beastie/layouts/partials/site-head.html b/website/themes/beastie/layouts/_partials/site-head.html index 476d144e77..476d144e77 100644 --- a/website/themes/beastie/layouts/partials/site-head.html +++ b/website/themes/beastie/layouts/_partials/site-head.html diff --git a/website/themes/beastie/layouts/partials/site-header.html b/website/themes/beastie/layouts/_partials/site-header.html index 6bb1ac5e90..6bb1ac5e90 100755 --- a/website/themes/beastie/layouts/partials/site-header.html +++ b/website/themes/beastie/layouts/_partials/site-header.html diff --git a/website/themes/beastie/layouts/partials/site-navigation.html b/website/themes/beastie/layouts/_partials/site-navigation.html index 5663b39477..5663b39477 100644 --- a/website/themes/beastie/layouts/partials/site-navigation.html +++ b/website/themes/beastie/layouts/_partials/site-navigation.html diff --git a/website/themes/beastie/layouts/shortcodes/form-ports.html b/website/themes/beastie/layouts/_shortcodes/form-ports.html index 6df709a7d3..6df709a7d3 100644 --- a/website/themes/beastie/layouts/shortcodes/form-ports.html +++ b/website/themes/beastie/layouts/_shortcodes/form-ports.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mail.html b/website/themes/beastie/layouts/_shortcodes/form-search-mail.html index 115d24701d..115d24701d 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-mail.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-mail.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-man.html b/website/themes/beastie/layouts/_shortcodes/form-search-man.html index 3a13ae4dfa..3a13ae4dfa 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-man.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-man.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html b/website/themes/beastie/layouts/_shortcodes/form-search-mid-id.html index 0f7cdf46a1..0f7cdf46a1 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-mid-id.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-mid-id.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html b/website/themes/beastie/layouts/_shortcodes/form-search-mid-message.html index 35d0d8d197..35d0d8d197 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-mid-message.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-mid-message.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-ports.html b/website/themes/beastie/layouts/_shortcodes/form-search-ports.html index b2d6f259f3..b2d6f259f3 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-ports.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-ports.html diff --git a/website/themes/beastie/layouts/shortcodes/form-search-site.html b/website/themes/beastie/layouts/_shortcodes/form-search-site.html index eb5ddb12e0..eb5ddb12e0 100644 --- a/website/themes/beastie/layouts/shortcodes/form-search-site.html +++ b/website/themes/beastie/layouts/_shortcodes/form-search-site.html diff --git a/website/themes/beastie/layouts/shortcodes/get-event-last-year-info.html b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html index 14d2e8683a..14d2e8683a 100644 --- a/website/themes/beastie/layouts/shortcodes/get-event-last-year-info.html +++ b/website/themes/beastie/layouts/_shortcodes/get-event-last-year-info.html diff --git a/website/themes/beastie/layouts/shortcodes/get-usergroups-info.html b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html index b041e9b1c0..b041e9b1c0 100644 --- a/website/themes/beastie/layouts/shortcodes/get-usergroups-info.html +++ b/website/themes/beastie/layouts/_shortcodes/get-usergroups-info.html diff --git a/website/themes/beastie/layouts/shortcodes/manpage.html b/website/themes/beastie/layouts/_shortcodes/manpage.html index 14ca61b630..14ca61b630 100644 --- a/website/themes/beastie/layouts/shortcodes/manpage.html +++ b/website/themes/beastie/layouts/_shortcodes/manpage.html diff --git a/website/themes/beastie/layouts/shortcodes/revision.html b/website/themes/beastie/layouts/_shortcodes/revision.html index 088673d57c..088673d57c 100644 --- a/website/themes/beastie/layouts/shortcodes/revision.html +++ b/website/themes/beastie/layouts/_shortcodes/revision.html diff --git a/website/themes/beastie/layouts/shortcodes/sponsored.html b/website/themes/beastie/layouts/_shortcodes/sponsored.html index 7f7dbb8c57..7f7dbb8c57 100644 --- a/website/themes/beastie/layouts/shortcodes/sponsored.html +++ b/website/themes/beastie/layouts/_shortcodes/sponsored.html diff --git a/website/themes/beastie/layouts/_default/baseof.html b/website/themes/beastie/layouts/baseof.html index 46d88a99a9..46d88a99a9 100644 --- a/website/themes/beastie/layouts/_default/baseof.html +++ b/website/themes/beastie/layouts/baseof.html diff --git a/website/themes/beastie/layouts/events/list.html b/website/themes/beastie/layouts/events/list.html index 97faff7303..0d00620073 100644 --- a/website/themes/beastie/layouts/events/list.html +++ b/website/themes/beastie/layouts/events/list.html @@ -27,37 +27,6 @@ {{ $eventsData = $dataDefaultLanguage }} {{ end }} - <!-- Load events and number of times --> - {{ $countriesCodes := slice }} - {{ $countriesCodesTimes := newScratch }} - - {{ with $eventsData }} - {{ range (sort .events "year" "desc") }} - {{ range .events }} - {{ if .countryCode }} - {{ $countriesCodes = $countriesCodes | append .countryCode }} - - {{ if $countriesCodesTimes.Get .countryCode }} - {{ $countriesCodesTimes.Add .countryCode 1 }} - {{ else }} - {{ $countriesCodesTimes.Set .countryCode 1 }} - {{ end }} - {{ end }} - {{ end }} - {{ end }} - {{ end }} - - {{ $countriesCodes = $countriesCodes | uniq }} - - {{ $countriesTimes := slice }} - {{ range $element := $countriesCodes }} - {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }} - {{ end }} - - {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }} - - <img alt="events map" src={{ $eventsImageUrl }} /> - {{ $eventsCounter := 0 }} {{ if isset .Params "year" }} @@ -113,7 +82,7 @@ <p> <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }} <br /> - <em>{{ dateFormat "02 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> + <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> <br /> {{ .description | safeHTML }} </p> @@ -143,7 +112,7 @@ <p> <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }} <br /> - <em>{{ dateFormat "02 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> + <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> <br /> {{ .description | safeHTML }} </p> @@ -188,7 +157,7 @@ <p> <b><a href="{{ .url }}">{{ .name }}</a></b>, {{ .site }}, {{ .city }}, {{ .country }} <br /> - <em>{{ dateFormat "02 January, 2006" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> + <em>{{ dateFormat "02" .startDate }} - {{ dateFormat "02 January, 2006" .endDate }}</em> <br /> {{ .description | safeHTML }} </p> diff --git a/website/themes/beastie/layouts/events/events.rss.xml b/website/themes/beastie/layouts/events/rss.xml index aaf582bc6b..aaf582bc6b 100644 --- a/website/themes/beastie/layouts/events/events.rss.xml +++ b/website/themes/beastie/layouts/events/rss.xml diff --git a/website/themes/beastie/layouts/events/single.html b/website/themes/beastie/layouts/events/single.html index 542de502f2..0d00620073 100644 --- a/website/themes/beastie/layouts/events/single.html +++ b/website/themes/beastie/layouts/events/single.html @@ -27,37 +27,6 @@ {{ $eventsData = $dataDefaultLanguage }} {{ end }} - <!-- Load events and number of times --> - {{ $countriesCodes := slice }} - {{ $countriesCodesTimes := newScratch }} - - {{ with $eventsData }} - {{ range (sort .events "year" "desc") }} - {{ range .events }} - {{ if .countryCode }} - {{ $countriesCodes = $countriesCodes | append .countryCode }} - - {{ if $countriesCodesTimes.Get .countryCode }} - {{ $countriesCodesTimes.Add .countryCode 1 }} - {{ else }} - {{ $countriesCodesTimes.Set .countryCode 1 }} - {{ end }} - {{ end }} - {{ end }} - {{ end }} - {{ end }} - - {{ $countriesCodes = $countriesCodes | uniq }} - - {{ $countriesTimes := slice }} - {{ range $element := $countriesCodes }} - {{ $countriesTimes = $countriesTimes | append ($countriesCodesTimes.Get .) }} - {{ end }} - - {{ $eventsImageUrl := (printf "https://chart.googleapis.com/chart?cht=t&chs=400x200&chtm=world&chco=ffffff,ffbe38,600000&chf=bg,s,4D89F9&chd=t:%s&chld=%s" (delimit $countriesTimes ",") (delimit $countriesCodes "")) }} - - <img alt="events map" src={{ $eventsImageUrl }} /> - {{ $eventsCounter := 0 }} {{ if isset .Params "year" }} diff --git a/website/themes/beastie/layouts/_default/list.html b/website/themes/beastie/layouts/list.html index 286e9ccd5e..286e9ccd5e 100644 --- a/website/themes/beastie/layouts/_default/list.html +++ b/website/themes/beastie/layouts/list.html diff --git a/website/themes/beastie/layouts/_default/list.ics b/website/themes/beastie/layouts/list.ics index f6adf934ca..f6adf934ca 100644 --- a/website/themes/beastie/layouts/_default/list.ics +++ b/website/themes/beastie/layouts/list.ics diff --git a/website/themes/beastie/layouts/news/news.rss.xml b/website/themes/beastie/layouts/news/rss.xml index fa369c9fa2..fa369c9fa2 100644 --- a/website/themes/beastie/layouts/news/news.rss.xml +++ b/website/themes/beastie/layouts/news/rss.xml diff --git a/website/themes/beastie/layouts/press/press.rss.xml b/website/themes/beastie/layouts/press/rss.xml index f21b03d89f..f21b03d89f 100644 --- a/website/themes/beastie/layouts/press/press.rss.xml +++ b/website/themes/beastie/layouts/press/rss.xml diff --git a/website/themes/beastie/layouts/security/security.rss.xml b/website/themes/beastie/layouts/security/rss.xml index 37dd78fadc..37dd78fadc 100644 --- a/website/themes/beastie/layouts/security/security.rss.xml +++ b/website/themes/beastie/layouts/security/rss.xml diff --git a/website/themes/beastie/layouts/_default/single.html b/website/themes/beastie/layouts/single.html index 286e9ccd5e..286e9ccd5e 100644 --- a/website/themes/beastie/layouts/_default/single.html +++ b/website/themes/beastie/layouts/single.html diff --git a/website/themes/beastie/theme.toml b/website/themes/beastie/theme.toml index 80b80d83f1..5058603475 100644 --- a/website/themes/beastie/theme.toml +++ b/website/themes/beastie/theme.toml @@ -3,7 +3,7 @@ copyright = "BSD 2-clause 'Simplified' License" description = "Theme to build the FreeBSD website" homepage = "https://www.freebsd.org" tags = ["website", "freebsd", "bsd"] -min_version = "0.60.0" +min_version = "0.146.0" [author] name = "Sergio Carlavilla" |
