From 78d387bc4090b6188c32c9bd701060da2a778d3a Mon Sep 17 00:00:00 2001 From: Justin Wheeler Date: Mar 05 2026 04:11:15 +0000 Subject: 📝🔥 Drop `/engineering/` and `/mindshare/` modules This commit completely drops all of the content in `/engineering/` and `/mindshare/` modules, because we are publishing them twice: > https://gitlab.com/fedora/docs/docs-website/pages This repository is where the docs.fp.o/engineering/ and docs.fp.o/mindshare/ pages are actually getting generated from. The source content in this repository appears to be duplicative. In the interest of greater simplicity, we should remove things which are no longer being used. @pbokoc can verify whether the removal of this content will cause any issues or breakages in the Fedora Docs publishing pipeline. Signed-off-by: Justin Wheeler --- diff --git a/README.adoc b/README.adoc index 343e7ff..457423a 100644 --- a/README.adoc +++ b/README.adoc @@ -1,5 +1,5 @@ == Fedora Governance Docs -=== _Components:_ Project, Council, Engineering, Mindshare +=== _Components:_ Project & Council // NOTE: Follow the One Sentence Per Line convention for AsciiDoc when making changes to this document. // https://asciidoctor.org/docs/asciidoc-recommended-practices/#one-sentence-per-line @@ -11,12 +11,10 @@ image::https://img.shields.io/badge/License-CC%20BY--SA%204.0-lightgrey.svg[Fedo image::https://img.shields.io/badge/Chat-in?style=flat&logo=Matrix&label=%23council%3Afedoraproject.org&link=https%3A%2F%2Fmatrix.to%2F%23%2F%23council%3Afedoraproject.org[Join us at #council:fedoraproject.org on Matrix] Please report issues and submit pull requests for *Content Fixes* to various Fedora governance documentation against this repo. -This repository includes four different Antora components: +This repository includes two different Antora components: * https://docs.fedoraproject.org/en-US/project/[Fedora Project] * https://docs.fedoraproject.org/en-US/council/[Fedora Council] -* https://docs.fedoraproject.org/en-US/engineering/[Engineering in Fedora] -* https://docs.fedoraproject.org/en-US/mindshare/[Mindshare in Fedora] General appearance issues and publishing issues should be reported to the https://forge.fedoraproject.org/docs/tickets[Fedora Docs Team]. diff --git a/docsbuilder.sh b/docsbuilder.sh index ecff84d..312673b 100755 --- a/docsbuilder.sh +++ b/docsbuilder.sh @@ -126,8 +126,6 @@ start_preview () { echo "Spaces:" echo " * Project ........ http://localhost:8080/project/" echo " * Council ........ http://localhost:8080/council/" - echo " * Engineering .... http://localhost:8080/engineering/" - echo " * Mindshare ...... http://localhost:8080/mindshare/" echo "" docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx @@ -140,8 +138,6 @@ start_preview () { echo "Spaces:" echo " * Project ........ http://localhost:8080/project/" echo " * Council ........ http://localhost:8080/council/" - echo " * Engineering .... http://localhost:8080/engineering/" - echo " * Mindshare ...... http://localhost:8080/mindshare/" echo "" pushd "${buildir}" > /dev/null 2>&1 python3 -m http.server 8080 & diff --git a/engineering/antora.yml b/engineering/antora.yml deleted file mode 100644 index ab5e56b..0000000 --- a/engineering/antora.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Name will be mostly visible in the URL. Treat it as an identifier. -# Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) -name: engineering - -# Title will be visible on the page. -title: Engineering Teams - -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: ~ - -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. -start_page: ROOT:index.adoc - -# This lists all the menu definitions of your component. -#nav: -# - modules/ROOT/nav.adoc diff --git a/engineering/modules/ROOT/pages/index.adoc b/engineering/modules/ROOT/pages/index.adoc deleted file mode 100644 index b07915b..0000000 --- a/engineering/modules/ROOT/pages/index.adoc +++ /dev/null @@ -1,60 +0,0 @@ -= Fedora Engineering -:page-layout: without_menu - -xref:fesco:ROOT:index.adoc[**Fedora Engineering Steering Committee**] — FESCo is the Fedora Engineering Steering Committee. It is a fully community elected body and represents the technical leadership in Fedora. - -== Engineering Teams - -// Include individual team entries as follows: -// include::COMPONENT:MODULE:partial$FILENAME.adoc[] -// include::partial$team_render.adoc[] -// -// Or if it's a local file: -// include::partial$FILENAME.adoc[] -// include::partial$team_render.adoc[] - - -// Example 1: A team entry using data stored in a different space - -// The Template Team -include::engineering:ROOT:partial$TEMPLATE_team_info.adoc[] -include::partial$team_render.adoc[] - - -// Example 2: A team entry using data stored in this repository (using the template) - -// The Template Team -include::partial$TEMPLATE_team_info.adoc[] -include::partial$team_render.adoc[] - - - -// Old entries: -* xref:modularity:ROOT:index.adoc[**Fedora Modularity**] — Modularity introduces an optional Modular repository that provides additional versions of software on independent lifecycles. - -* xref:containers:ROOT:index.adoc[**Fedora Containers**] — Here you will find Documentation and Guidelines regarding creation, usage and maintenance of Containers in Fedora. - -* xref:neurofedora:ROOT:overview.adoc[**NeuroFedora**] — NeuroFedora is an initiative to provide a ready to use Fedora based Free/Open source software platform for neuroscience. - -* xref:teleirc-sig:ROOT:index.adoc[**Fedora Teleirc SIG**] — The Teleirc SIG is a volunteer-driven group to manage Teleirc bridge bots. - -* xref:ci:ROOT:index.adoc[**Fedora CI**] — Fedora Continuous Integration Portal - -* link:https://fedora-infra-docs.readthedocs.io/en/latest/[**Fedora Infrastructure 🔗**] — Documentation covering the development and administration of the many projects that make Fedora work. - -* xref:qa-docs:ROOT:index.adoc[**Fedora QA**] — This docs outlines all the activities you can get involved in to help with Fedora QA (Quality Assurance) and is meant to guide you through the QA ecosystem. - -* xref:cpe:ROOT:index.adoc[**CPE**] - The Community Platform Engineering Team is a Red Hat team dedicated to the Fedora and CentOS projects where they contribute to the infrastructure and release engineering. - -* xref:kubedevsig:ROOT:index.adoc[**Kubernetes Development SIG**] — SIG for those interested in using, developing and extending Kubernetes related technologies. - -== Other Engineering Resources -//// -Because this page has already existed and linked to other spaces -that not necessarily represent teams, we have this category to keep those -so people can still find them. -//// - -* xref:flatpak:ROOT:index.adoc[**Flatpak in Fedora**] — Learn how to build Flatpaks out of Fedora RPM packages. - -* xref:minimization:ROOT:index.adoc[**Fedora Minimization Objective**] — Home of the Fedora Minimization Objective. diff --git a/engineering/modules/ROOT/partials/CI_team_info.adoc b/engineering/modules/ROOT/partials/CI_team_info.adoc deleted file mode 100644 index b2af649..0000000 --- a/engineering/modules/ROOT/partials/CI_team_info.adoc +++ /dev/null @@ -1,27 +0,0 @@ -// Team name: -:team_name: Fedora Continuous Integration - -// Team summary: -:team_summary: Continuous integration aims to ensure broken changes are revealed as soon as possible and do not affect other developers, packagers, maintainers or users. - -// Team page URL: -:team_url: https://docs.fedoraproject.org/en-US/ci/ - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://lists.fedoraproject.org/admin/lists/ci.lists.fedoraproject.org/ - -// Preferred Synch (IRC channel, telegram, etc, none) -:team_synch_communication: #fedora-ci - -// Issue tracker -:team_issue_tracker: https://pagure.io/fedora-ci/general/issues - -// Meetings -:team_meetings: https://fedoraproject.org/wiki/SIGs/CI#Meetings - -// Any other information? -:team_other: https://docs.fedoraproject.org/en-US/ci/manifesto/ diff --git a/engineering/modules/ROOT/partials/FESCo_team_info.adoc b/engineering/modules/ROOT/partials/FESCo_team_info.adoc deleted file mode 100644 index 3fdc1ab..0000000 --- a/engineering/modules/ROOT/partials/FESCo_team_info.adoc +++ /dev/null @@ -1,33 +0,0 @@ -// This is a data store of information about a Fedora team. - -// File like this would be stored either in the team's docs -// git repository, or if they don't have any (maybe they live on a wiki). -// then it can be stored in the council-docs repo next to the template. - -// Team name: -:team_name: Fedora Engineering Steering Committee (FESCo) - -// Team summary: -:team_summary: FESCo is the Fedora Engineering Steering Committee. It is a fully community elected body and represents the technical leadership in Fedora. - -// Team page URL: -:team_url: https://docs.fedoraproject.org/en-US/fesco/ - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://lists.fedoraproject.org/admin/lists/devel.lists.fedoraproject.org/ - -// Preferred Synch (IRC channel, telegram, etc, none) -:team_synch_communication: #fedora - -// Issue tracker -:team_issue_tracker: https://pagure.io/fesco - -// Meetings -:team_meetings: https://docs.fedoraproject.org/en-US/fesco/#_meetings - -// Any other information? -:team_other: https://docs.fedoraproject.org/en-US/fesco/#_common_tasks_and_responsibilities diff --git a/engineering/modules/ROOT/partials/KubeDevSIG_team_info.adoc b/engineering/modules/ROOT/partials/KubeDevSIG_team_info.adoc deleted file mode 100644 index 4a68b39..0000000 --- a/engineering/modules/ROOT/partials/KubeDevSIG_team_info.adoc +++ /dev/null @@ -1,27 +0,0 @@ -// Team name: -:team_name: Kubernetes Development SIG - -// Team summary: -:team_summary: The KubeDev SIG (Special Interest Group) is a group of Fedora contributors that discuss and work on Kubernetes related technologies. - -// Team page URL: -:team_url: https://fedoraproject.org/wiki/SIGs/KubeDev - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://fedoraproject.org/wiki/SIGs/KubeDev - -// Preferred Synch (IRC channel, telegram, etc, none) -:team_synch_communication: #fedora-kube - -// Issue tracker -//:team_issue_tracker: https://pagure.io/Fedora-Council/tickets - -// Meetings -:team_meetings: https://fedoraproject.org/wiki/SIGs/KubeDev#Meetings - -// Any other information? -//:team_other: Lorem ipsum \ No newline at end of file diff --git a/engineering/modules/ROOT/partials/NeuroFedora_team_info.adoc b/engineering/modules/ROOT/partials/NeuroFedora_team_info.adoc deleted file mode 100644 index 0b55045..0000000 --- a/engineering/modules/ROOT/partials/NeuroFedora_team_info.adoc +++ /dev/null @@ -1,33 +0,0 @@ -// This is a data store of information about a Fedora team. - -// File like this would be stored either in the team's docs -// git repository, or if they don't have any (maybe they live on a wiki). -// then it can be stored in the council-docs repo next to the template. - -// Team name: -:team_name: NeuroFedora SIG - -// Team summary: -:team_summary: The Neuroscience Special Interest Group aims to provide a ready to use Fedora based Free/Open Source platform for neuroscience research. - -// Team page URL: -:team_url: https://neuro.fedoraproject.org - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://lists.fedoraproject.org/admin/lists/neurofedora.lists.fedoraproject.org/ - -// Preferred Synch (IRC channel, telegram, etc, none) -:team_synch_communication: #fedora-neuro on IRC, https://t.me/NeuroFedora on Telegram - -// Issue tracker -:team_issue_tracker: https://pagure.io/neuro-sig/NeuroFedora - -// Meetings -:team_meetings: https://docs.fedoraproject.org/en-US/neurofedora/communicating/ - -// Any other information? -:team_other: Blog: https://neuroblog.fedoraproject.org/, Twitter: https://twitter.com/neurofedora, GitHub: https://github.com/neurofedora diff --git a/engineering/modules/ROOT/partials/PythonSIG_team_info.adoc b/engineering/modules/ROOT/partials/PythonSIG_team_info.adoc deleted file mode 100644 index 1156c89..0000000 --- a/engineering/modules/ROOT/partials/PythonSIG_team_info.adoc +++ /dev/null @@ -1,33 +0,0 @@ -// This is a data store of information about a Fedora team. - -// File like this would be stored either in the team's docs -// git repository, or if they don't have any (maybe they live on a wiki). -// then it can be stored in the council-docs repo next to the template. - -// Team name: -:team_name: Python SIG - -// Team summary: -:team_summary: Python Special Interest Group aims to address any and all issues and tasks related to Python in Fedora, including packaging and optimizing various Python runtimes, Python libraries and applications, and setting and improving standards for packaging and maintaining Python RPM packages in Fedora and EPEL. It is a volunteer based group without a strict governance model. https://fedoralovespython.org/[Fedora Loves Python!] - -// Team page URL: -:team_url: https://fedoraproject.org/wiki/SIGs/Python - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://lists.fedoraproject.org/archives/list/python-devel@lists.fedoraproject.org/ - -// Preferred Synch (IRC channel, telegram, etc, none) -:team_synch_communication: #fedora-python - -// Issue tracker -:team_issue_tracker: http://bugzilla.redhat.com/ - -// Meetings -:team_meetings: there are no regular meetings - -// Any other information? -:team_other: https://packager.fedorainfracloud.org/python-sig https://fedoralovespython.org/ diff --git a/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc b/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc deleted file mode 100644 index 377a230..0000000 --- a/engineering/modules/ROOT/partials/TEMPLATE_team_info.adoc +++ /dev/null @@ -1,35 +0,0 @@ -// TEMPLATE - -// This is a data store of information about a Fedora team. - -// File like this would be stored either in the team's docs -// git repository, or if they don't have any (maybe they live on a wiki). -// then it can be stored in the council-docs repo next to the template. - -// Team name: -:team_name: Team Name - -// Team summary: -:team_summary: We serve as a template. - -// Team page URL: -:team_url: https://docs.fedoraproject.org/en-US/council/ - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://discussion.fedoraproject.org/tag/council - -// Preferred Synch (Matrix room, none, etc.) -:team_synch_communication: #council:fedoraproject.org - -// Issue tracker -:team_issue_tracker: https://pagure.io/Fedora-Council/tickets - -// Meetings -:team_meetings: https://fedoraproject.org/wiki/Council_Meetings - -// Any other information? -:team_other: Lorem ipsum diff --git a/engineering/modules/ROOT/partials/team_render.adoc b/engineering/modules/ROOT/partials/team_render.adoc deleted file mode 100644 index 40e29e7..0000000 --- a/engineering/modules/ROOT/partials/team_render.adoc +++ /dev/null @@ -1 +0,0 @@ -* {team_url}[**{team_name}**] — {team_summary} \ No newline at end of file diff --git a/mindshare/antora.yml b/mindshare/antora.yml deleted file mode 100644 index adb4b3c..0000000 --- a/mindshare/antora.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Name will be mostly visible in the URL. Treat it as an identifier. -# Tip: If you want to use the local preview scripts that come with this repository, please change this value in the site.yml file as well. (under site/start_page) -name: mindshare - -# Title will be visible on the page. -title: Mindshare Teams - -# If you don't plan to have multiple versions of the docs (for example, to document multiple versions of some software), you can ignore this field. Otherwise, change "master" to a specific version. -version: ~ - -# We encourage you to name the index page as "index.adoc". If you absolutely have to use a different name, please reflect it here. You can ignore this field otherwise. -start_page: ROOT:index.adoc - -# This lists all the menu definitions of your component. -#nav: -#- modules/ROOT/nav.adoc diff --git a/mindshare/modules/ROOT/pages/index.adoc b/mindshare/modules/ROOT/pages/index.adoc deleted file mode 100644 index bf954e0..0000000 --- a/mindshare/modules/ROOT/pages/index.adoc +++ /dev/null @@ -1,51 +0,0 @@ -= Fedora Mindshare -:page-layout: without_menu - -Mindshare Teams are focused on helping our community grow both the number of users and contributors. The teams in Mindshare are each focused on a different aspect of this goal. - -xref:mindshare-committee:ROOT:index.adoc[**Fedora Mindshare Committee**] — The Mindshare Committee fosters communication amongst the Mindshare teams and helps facilitate Council strategy. - -== Mindshare Teams - -// Include individual team entries as follows: -// include::COMPONENT:MODULE:partial$FILENAME.adoc[] -// include::partial$team_render.adoc[] -// -// Or if it's a local file: -// include::partial$FILENAME.adoc[] -// include::partial$team_render.adoc[] - - -// Example 1: A team entry using data stored in a different space - -// The Template Team -include::mindshare:ROOT:partial$TEMPLATE_team_info.adoc[] -include::partial$team_render.adoc[] - - -// Example 2: A team entry using data stored in this repository (using the template) - -// The Template Team -include::partial$TEMPLATE_team_info.adoc[] -include::partial$team_render.adoc[] - - - -// Old entries: -* xref:commops:ROOT:index.adoc[**Fedora Community Operations (CommOps)**] — Community Operations (CommOps) provides tools, resources, and utilities for different sub-projects of Fedora to improve effective communication. - -* xref:fedora-docs:ROOT:index.adoc[**Fedora Documentation (Docs)**] — The group behind this very documentation site. Includes contributors' guidelines to Fedora Docs - -* xref:badges:ROOT:index.adoc[**Fedora Badges**] — The group behind Fedora Badges — a fun website built to recognize contributors to the Fedora Project, help new and existing Fedora contributors find different ways to get involved, and encourage the improvement of Fedora's infrastructure. - -* xref:fedora-magazine:ROOT:index.adoc[**Fedora Magazine**] — Guidelines around contributing to the Fedora Magazine. - -* xref:websites:ROOT:index.adoc[**Fedora Websites**] - Documentation covering maintenance and expansion of Fedora Project websites. - -* xref:fedora-join:ROOT:index.adoc[**Fedora Join SIG**] - The Fedora Join SIG aims to set up and maintain channels that let prospective contributors engage with the community. - -* xref:ask-fedora-sops:ROOT:index.adoc[**Ask Fedora SOPs**] - Standard operating procedures for the link:https://ask.fedoraproject.org/[Ask Fedora forums]. - -* xref:localization:ROOT:index.adoc[**Fedora Localization Project**] - The Fedora Localization Project. - -* xref:docs-l10n:ROOT:index.adoc[**Fedora Docs Localization Stats**] - Statistics about the Fedora documentation localization progress. diff --git a/mindshare/modules/ROOT/partials/TEMPLATE_team_info.adoc b/mindshare/modules/ROOT/partials/TEMPLATE_team_info.adoc deleted file mode 100644 index 377a230..0000000 --- a/mindshare/modules/ROOT/partials/TEMPLATE_team_info.adoc +++ /dev/null @@ -1,35 +0,0 @@ -// TEMPLATE - -// This is a data store of information about a Fedora team. - -// File like this would be stored either in the team's docs -// git repository, or if they don't have any (maybe they live on a wiki). -// then it can be stored in the council-docs repo next to the template. - -// Team name: -:team_name: Team Name - -// Team summary: -:team_summary: We serve as a template. - -// Team page URL: -:team_url: https://docs.fedoraproject.org/en-US/council/ - -// Team activity status. -// Choose from: Active, Inactive -:team_status: Active - -// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) -:team_asynch_communication: https://discussion.fedoraproject.org/tag/council - -// Preferred Synch (Matrix room, none, etc.) -:team_synch_communication: #council:fedoraproject.org - -// Issue tracker -:team_issue_tracker: https://pagure.io/Fedora-Council/tickets - -// Meetings -:team_meetings: https://fedoraproject.org/wiki/Council_Meetings - -// Any other information? -:team_other: Lorem ipsum diff --git a/mindshare/modules/ROOT/partials/team_render.adoc b/mindshare/modules/ROOT/partials/team_render.adoc deleted file mode 100644 index 40e29e7..0000000 --- a/mindshare/modules/ROOT/partials/team_render.adoc +++ /dev/null @@ -1 +0,0 @@ -* {team_url}[**{team_name}**] — {team_summary} \ No newline at end of file diff --git a/project/modules/ROOT/nav.adoc b/project/modules/ROOT/nav.adoc index a09c12c..4f80f41 100644 --- a/project/modules/ROOT/nav.adoc +++ b/project/modules/ROOT/nav.adoc @@ -2,6 +2,8 @@ * xref:upstream-first.adoc[Upstream First] * xref:leadership.adoc[Leadership] * xref:orgchart.adoc[High-Level Organization] +** xref:engineering::index.adoc[Engineering Teams ^[🡵\]^] +** xref:mindshare::index.adoc[Mindshare Teams ^[🡵\]^] * xref:brand.adoc[Brand] * xref:initiatives.adoc[Current Initiatives] * xref:communications.adoc[Project Communications] diff --git a/project/modules/ROOT/partials/TEMPLATE_team_info.adoc b/project/modules/ROOT/partials/TEMPLATE_team_info.adoc new file mode 100644 index 0000000..377a230 --- /dev/null +++ b/project/modules/ROOT/partials/TEMPLATE_team_info.adoc @@ -0,0 +1,35 @@ +// TEMPLATE + +// This is a data store of information about a Fedora team. + +// File like this would be stored either in the team's docs +// git repository, or if they don't have any (maybe they live on a wiki). +// then it can be stored in the council-docs repo next to the template. + +// Team name: +:team_name: Team Name + +// Team summary: +:team_summary: We serve as a template. + +// Team page URL: +:team_url: https://docs.fedoraproject.org/en-US/council/ + +// Team activity status. +// Choose from: Active, Inactive +:team_status: Active + +// Preferred Asynch communication channel (mailing list, discussion.fp.o, none, etc) +:team_asynch_communication: https://discussion.fedoraproject.org/tag/council + +// Preferred Synch (Matrix room, none, etc.) +:team_synch_communication: #council:fedoraproject.org + +// Issue tracker +:team_issue_tracker: https://pagure.io/Fedora-Council/tickets + +// Meetings +:team_meetings: https://fedoraproject.org/wiki/Council_Meetings + +// Any other information? +:team_other: Lorem ipsum diff --git a/site.yml b/site.yml index e52f639..1205b1f 100644 --- a/site.yml +++ b/site.yml @@ -9,12 +9,6 @@ content: - url: . branches: HEAD start_path: project - - url: . - branches: HEAD - start_path: engineering - - url: . - branches: HEAD - start_path: mindshare ui: bundle: url: https://gitlab.com/fedora/docs/docs-website/ui-bundle/-/jobs/artifacts/HEAD/raw/build/ui-bundle.zip?job=bundle-stable