git: 3b00998f6f - main - Change capitalization of NGINX and NVIDIA
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 14 Mar 2022 02:06:37 UTC
The branch main has been updated by ygy:
URL: https://cgit.FreeBSD.org/doc/commit/?id=3b00998f6f3a6d40ec3581a55598aff764866962
commit 3b00998f6f3a6d40ec3581a55598aff764866962
Author: Minsoo Choo <fel1x.mintchoco.development@gmail.com>
AuthorDate: 2022-03-14 02:03:12 +0000
Commit: Guangyuan Yang <ygy@FreeBSD.org>
CommitDate: 2022-03-14 02:06:16 +0000
Change capitalization of NGINX and NVIDIA
According to their websites, they use NGINX and NVIDIA instead of nginx
and nVidia.
Reviewed by: PauAmma, debdrup
Differential Revision: https://reviews.freebsd.org/D34373
---
documentation/themes/beastie/layouts/partials/trademarks.html | 8 ++++++++
website/content/en/applications.adoc | 4 ++--
website/content/en/copyright/trademarks.adoc | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/documentation/themes/beastie/layouts/partials/trademarks.html b/documentation/themes/beastie/layouts/partials/trademarks.html
index f0ed62b11c..68a19a144a 100644
--- a/documentation/themes/beastie/layouts/partials/trademarks.html
+++ b/documentation/themes/beastie/layouts/partials/trademarks.html
@@ -56,6 +56,14 @@
<p>{{ i18n "microsoft" }}</p>
{{ end }}
+ {{ if in $trademarks "nginx" }}
+ <p>{{ i18n "nginx" }}</p>
+ {{ end }}
+
+ {{ if in $trademarks "nvidia" }}
+ <p>{{ i18n "nvidia" }}</p>
+ {{ end }}
+
{{ if in $trademarks "opengroup" }}
<p>{{ i18n "opengroup" }}</p>
{{ end }}
diff --git a/website/content/en/applications.adoc b/website/content/en/applications.adoc
index b630e37890..08fdea34fd 100644
--- a/website/content/en/applications.adoc
+++ b/website/content/en/applications.adoc
@@ -21,8 +21,8 @@ Because FreeBSD is based on 4.4BSD, an industry-standard version of UNIX, it is
Here are some examples of the environments in which FreeBSD is used:
-* *Internet services.* Many Internet Service Providers (ISPs) find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other services. Ready-to-run software like the http://nginx.org[nginx] or http://www.apache.org/[Apache] web server or the http://proftpd.org/[ProFTPD] or http://security.appspot.com/vsftpd.html[vsftpd] FTP server make it easy to set up a business or community-centered ISP. Of course, with FreeBSD's unbeatable link:../internet/[networking], your users will enjoy high speed, reliable services.
-* *X Window workstation.* From an inexpensive X terminal to an advanced X display, FreeBSD works quite well. Free X software (http://x.org/[X.Org](T)) comes with the system. http://www.nvidia.com/[nVidia] offers native drivers for their high-performance graphics hardware, and the industry standard http://www.opengroup.org/motif/[Motif](R) and http://www.opengl.org/[OpenGL](R) libraries are supported. The http://xfce.org/[Xfce] and http://lxde.org/[LXDE] products provide a desktop environment. The http://www.kde.org[KDE] and http://www.gnome.org[GNOME] desktop environments also enjoy full support and provide office suite functionality, with further good functionality available in the https://www.libreoffice.org/[LibreOffice], http://www.openoffice.org/[OpenOffice.Org] and http://www.softmaker.com/en/[TextMaker] products.
+* *Internet services.* Many Internet Service Providers (ISPs) find FreeBSD ideal, running WWW, Usenet news, FTP, Email, and other services. Ready-to-run software like the http://nginx.org[NGINX] or http://www.apache.org/[Apache] web server or the http://proftpd.org/[ProFTPD] or http://security.appspot.com/vsftpd.html[vsftpd] FTP server make it easy to set up a business or community-centered ISP. Of course, with FreeBSD's unbeatable link:../internet/[networking], your users will enjoy high speed, reliable services.
+* *X Window workstation.* From an inexpensive X terminal to an advanced X display, FreeBSD works quite well. Free X software (http://x.org/[X.Org](T)) comes with the system. http://www.nvidia.com/[NVIDIA] offers native drivers for their high-performance graphics hardware, and the industry standard http://www.opengroup.org/motif/[Motif](R) and http://www.opengl.org/[OpenGL](R) libraries are supported. The http://xfce.org/[Xfce] and http://lxde.org/[LXDE] products provide a desktop environment. The http://www.kde.org[KDE] and http://www.gnome.org[GNOME] desktop environments also enjoy full support and provide office suite functionality, with further good functionality available in the https://www.libreoffice.org/[LibreOffice], http://www.openoffice.org/[OpenOffice.Org] and http://www.softmaker.com/en/[TextMaker] products.
* *Networking.* From packet filtering to routing to name service, FreeBSD can turn any PC into a Internet firewall, email host, print server, PC/NFS server, and more.
* *Software development.* A suite of development tools comes with FreeBSD, including the GNU C/C++ compiler and debugger. The LLVM-based clang suite is also provided and will eventually replace the GNU suite. Java(R) and Tcl/Tk development are also possible for example, and more esoteric programming languages like Icon work just fine, too. And FreeBSD's shared libraries have always been easy to make and use. You can also choose from a wide range of popular and powerful editors, such as Emacs and Vim.
* *Net surfing.* A real UNIX workstation makes a great Internet surfboard. FreeBSD versions of http://www.chromium.org/Home[Chromium] and http://www.mozilla.org/firefox/[Firefox] are available for serious web users. Surf the web, publish your own web pages, read Usenet news, and send and receive email with a FreeBSD system on your desktop.
diff --git a/website/content/en/copyright/trademarks.adoc b/website/content/en/copyright/trademarks.adoc
index df67aaa629..e7b43068b1 100644
--- a/website/content/en/copyright/trademarks.adoc
+++ b/website/content/en/copyright/trademarks.adoc
@@ -19,6 +19,8 @@ Apple, FireWire, Mac, Macintosh, Mac OS, Quicktime, and TrueType are trademarks
CVSup is a registered trademark of John D. Polstra.
+F5, F5 Networks, and the F5 logo are trademarks of F5 Networks, Inc. in the U.S. and in certain other countries. Other F5 trademarks are identified at f5.com. Any other products, services, taglines/slogans, or company names referenced herein may be trademarks of their respective owners with no endorsement or affiliation, expressed or implied, claimed by F5.
+
IBM and PowerPC are trademarks of International Business Machines Corporation in the United States, other countries, or both.
IEEE, POSIX, and 802 are registered trademarks of The Institute of Electrical and Electronics Engineers, Inc.
@@ -31,6 +33,8 @@ Motif, OSF/1, and UNIX are registered trademarks and IT DialTone and The Open Gr
MySQL is a registered trademark of MySQL AB in the United States, the European Union and other countries.
+NVIDIA, the NVIDIA logo, 3D Play, 3D Vision Pro, 4-Plus-1, APEX, BattleBox, BFGD, Big Format Gaming Display, CUDA, Dabbler, DALI, DGX Station, DirectStylus, DirectTouch, Game Ready, GameStream, Geared For Gaming, GeForce, GeForce Experience, GeForce GTX, GeForce RTX, GPUDirect, G-SYNC, GRID LINK, GRID VGX, IceClear, ICERA, I AM AI, Iray, Jetson, Jetson AGX Xavier, Kepler, Made To Game, Maximus, Mental Ray, NSIST on NVIDIA, nTersect, NVIDIA 3D Vision, NVIDIA AGX, NVIDIA AutoWorks, NVIDIA BATTERY BOOST, NVIDIA BFGD, NVIDIA Big Format Gaming Display, NVIDIA Business Platform, NVIDIA Clara, NVIDIA DALI, NVIDIA Denver, NVIDIA DesignWorks, NVIDIA DGX, NVIDIA DGX POD, NVIDIA DGX Superpod, NVIDIA DRIVE, NVIDIA DRIVE Autopilot, NVIDIA DRIVE Constellation, NVIDIA DRIVE Hyperion, NVIDIA DRIVE Sim, NVIDIA GameWorks, NVIDIA GPU BOOST, NVIDIA GPU CLOUD, NVIDIA GRID, NVIDIA GRID vGPU, NVIDIA G-SYNC, NVIDIA HGX, NVIDIA Holodeck, NVIDIA IndeX, NVIDIA Isaac, NVIDIA Isaac SDK, NVIDIA Isaac SIM, NVIDIA
Jetpack, NVIDIA Kepler, NVIDIA Maglev, NVIDIA Maximus, NVIDIA Maxwell, NVIDIA nForce, NVIDIA OptiX, NVIDIA Orin, NVIDIA PartnerForce, NVIDIA PureAudio, NVIDIA Quadro, NVIDIA RTX, NVIDIA SHIELD, NVIDIA SLI, NVIDIA SLI Ready, NVIDIA Slide Cover, NVIDIA SPOT, NVIDIA Tegra, NVIDIA Turing, nView, NVLink, NVS, NVSwitch, OpenACC, Openautomate, Optimus, OptiX, Pascal, Pegasus, PGI, PGI Visual Fortran, PhysX, Quadro, Quadro Experience, Quadro RTX, RealityServer, SceniX, Shadowplay, SHIELD, SLI, Surround, Tegra, Tegra NOTE, TegraZone, TensorRT, Tesla, The Way It's Meant to be Played, TWIMTBP, ULMB, vGPU, Vibrante, VisionWorks, VRLync, and Xavier are trademarks and/or registered trademarks of NVIDIA Corporation in the U.S. and/or other countries
+
Silicon Graphics, SGI, and OpenGL are registered trademarks of Silicon Graphics, Inc., in the United States and/or other countries worldwide.
Sparc, Sparc64, SPARCEngine, and UltraSPARC are trademarks of SPARC International, Inc in the United States and other countries. Products bearing SPARC trademarks are based upon architecture developed by Sun Microsystems, Inc.