freebsd · grahamperrin · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 4, 2023
diff --git a/website/content/en/commercial/_index.adoc b/website/content/en/commercial/_index.adoc
@@ -5,18 +5,39 @@ sidenav: support
 
 = Commercial Vendors
 
-The power, flexibility, and reliability of FreeBSD attract a wide variety of users and vendors.
-Below is a list of vendors offering commercial products, services, and/or consulting for FreeBSD.
-
-* link:consult_bycat[Consulting Services] Whether you are just starting out with FreeBSD, or need to complete a large project, hiring consultants might be your answer.
-You can see the link:consult[alphabetical] list, or, if you prefer, view it by link:consult_bycat[categories].
-* link:hardware[Hardware Vendors] Need specialized tools, looking to buy a new desktop, or to fill a cage with rack mount servers that come with FreeBSD pre-installed?
-These companies may have what you need!
-* link:isp[Internet Service Providers] If you need webspace on a FreeBSD-based system or want your company connected to the internet, these companies may offer what you need!
-* link:misc[Miscellaneous Vendors] Books and accessories you just cannot live without!
-* link:software_bycat[Software Vendors] Vendors From audio players, network drivers, to commercial databases, FreeBSD has a wide variety of industrial strength software available.
-You can see the link:software[alphabetical] list, or, if you prefer, view it by link:software_bycat[categories].
-
-If your company supports a FreeBSD related product, service, consulting, or support that should be added to this page, please fill out a link:../support/bugreports/[problem report] in category Documentation->Website.
-Submissions should contain a medium-sized paragraph in length, describing your company.
-Please note that the inclusion of vendors in our list does not signify our endorsement of their products or services by the FreeBSD Project.
+The power, flexibility, and reliability of FreeBSD attract a variety of users and vendors.
+
+== Consultancy
+
+Whether you are starting with FreeBSD, or need to complete a large project. Consultants are listed: 
+
+* link:consult[alphabetically], with descriptions
+* link:consult_bycat[by region], without descriptions.
+
+== Hardware
+
+Need specialized tools, looking to buy a new desktop, or to fill a rack with servers with FreeBSD preinstalled?
+link:hardware[These vendors] may have what you need.
+
+== Internet Service Providers
+
+If you need webspace on a FreeBSD-based system, or want your company connected to the Internet, link:isp[these ISPs] may offer what you need.
+
+== Software
+
+From audio players and network drivers, to commercial databases, a wide variety of industrial-strength software is available for FreeBSD. Vendors are listed: 
+
+* link:software[alphabetically], with descriptions
+* link:software_bycat[categorically], without descriptions.
+
+== More
+
+link:misc[Miscellaneous vendors].
+
+'''
+
+Please note that FreeBSD Project listing of a vendor does not signify endorsement by the Project.
+
+== Additions and Errata
+
+Please https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Documentation[make a documentation bug report] -- choose _Website_.
diff --git a/website/content/en/commercial/consult.adoc b/website/content/en/commercial/consult.adoc
@@ -5,12 +5,4 @@ vendor: consult
 grouped: false
 ---
 
-The power, flexibility, and reliability of FreeBSD attract a wide variety of users and vendors.
-Here you will find vendors offering commercial products and/or services for FreeBSD.
-
-For your convenience, we have divided our growing commercial listing into several sections.
-If your company supports a FreeBSD related product, service, consulting, or support that should be added to this page, please fill out a https://www.freebsd.org/support/bugreports/[problem report] in category Documentation->Website.
-Submissions should contain a medium-sized paragraph in length, describing your company.
-Please note that the inclusion of vendors in our list does not signify our endorsement of their products or services by the FreeBSD Project.
-
-== Consulting Services
+= Consulting Services
diff --git a/website/content/en/commercial/consult_bycat.adoc b/website/content/en/commercial/consult_bycat.adoc
@@ -5,15 +5,4 @@ vendor: consult
 grouped: true
 ---
 
-The power, flexibility, and reliability of FreeBSD attract a wide variety of users and vendors.
-Here you will find vendors offering commercial products and/or services for FreeBSD.
-
-For your convenience, we have divided our growing commercial listing into several sections.
-If your company supports a FreeBSD related product, service, consulting, or support that should be added to this page, please fill out a https://www.freebsd.org/support/bugreports/[problem report] in category Documentation->Website.
-Submissions should contain a medium-sized paragraph in length, describing your company.
-Please note that the inclusion of vendors in our list does not signify our endorsement of their products or services by the FreeBSD Project.
-
-== Consulting Services
-
-This file has been divided into sub-categories for your convenience.
-The following shortcuts will take you to the proper gallery entries.
+= Consulting Services
diff --git a/website/data/en/vendors/consulting.toml b/website/data/en/vendors/consulting.toml
@@ -15,13 +15,6 @@ name = "A-Team Systems"
 url = "http://www.ateamsystems.com/"
 description = "A-Team Systems has over 15 years of experience helping clients leverage the power of in combination with other open source software such as PHP, MySQL and Apache in a secure, customized and cohesive way. We have been with since version 1.0! We can help you with your existing deployment or future plans: From encrypted backups to web and mail servers. Visit our <a href=\"http://www.ateamsystems.com/\">website</a> for more information."
 
-[[consulting]]
-id = "anonbsd"
-category = "samerica"
-name = "AnonBSD Inc."
-url = "https://sites.google.com/site/anonbsd/"
-description = "We provide IT environment consulting. Support in FreeBSD, OpenBSD, Linux (Debian, RedHat, SUSE, Gentoo, Slackware) and OpenSolaris. High availability, virtualization, monitoring, security, deployment, network infrastructure. We service in São Paulo/SP and Campinas/SP in Brazil. Contact us via e-mail (<a href=\"mailto:ricardo.ichizo@gmail.com\">ricardo.ichizo@gmail.com</a>) or by phone at +55 (19) 8202-1567."
-
 [[consulting]]
 id = "audacix"
 category = "australia"
@@ -344,13 +337,13 @@ name = "FirmbIT"
 url = "http://www.firmbit.com/index.php"
 description = "FirmbIT is a high quality server management and security company providing friendly reliable support specializing in high security installations and scalable solutions with support for FreeBSD, OpenBSD, NetBSD, Redhat, Fedora, CentOS, Debian, Slackware, Gentoo, SuSe, Mandrake and Sun Solaris servers."
 
-[[consulting]]
-id = "oullet"
-category = "namerica"
-name = "Ouellet Consulting Inc."
-url = "http://sirius.danosoft.com/oci/index.html"
-description = "OCI specialize in systems/networks design, implementation and security solutions, including solutions meeting HIPPA requirements. We spec out, configure and support firewalls, proxy-arrays, servers, switches, mail systems, web servers, databases, etc. We are familiar with and support most Windows and Unix/Linux systems including FreeBSD. We offer remote administration services worldwide, on all supported platforms. We plan and assist with Active Directory migrations. For more information please contact us via <a href=\"mailto:info@danosoft.com\">e-mail</a> or call us +1-850-510-6162. Please see <a href=\"http://sirius.danosoft.com/oci/index.html\">our website</a> for complete details on what we offer."
-
+# [[consulting]]
+# id = "oullet"
+# category = "namerica"
+# name = "Ouellet Consulting Inc."
+# url = "http://sirius.danosoft.com/oci/index.html"
+# description = "OCI specialize in systems/networks design, implementation and security solutions, including solutions meeting HIPPA requirements. We spec out, configure and support firewalls, proxy-arrays, servers, switches, mail systems, web servers, databases, etc. We are familiar with and support most Windows and Unix/Linux systems including FreeBSD. We offer remote administration services worldwide, on all supported platforms. We plan and assist with Active Directory migrations. For more information please contact us via <a href=\"mailto:info@danosoft.com\">e-mail</a> or call us +1-850-510-6162. Please see <a href=\"http://sirius.danosoft.com/oci/index.html\">our website</a> for complete details on what we offer."
+# 
 [[consulting]]
 id = "hahnefeld"
 category = "europe"