Adjusted the repo as migrated from pagure to the new specialized content.

README.md

@@ -1,24 +1,89 @@
-# Fedora-server repository
+# Fedora Server Edition User Documentation
 
-This repository is used by [Server working group]( http://fedoraproject.org/wiki/Server).
+This repository contains the sources for the Fedora Server Documentation.
 
-### It currently contains:
+## Contributing to this documentation
 
-* Docs directory for documentation.
-* Tickets (issues) for the Server group.
+Steps to do to contribute to the documentation:
 
-### Basic instructions on how to contribute to this repository
+Fork this repository, so you are not pushing updates directly into the main branch.
 
-[Git for docs writers](https://docs.fedoraproject.org/en-US/fedora-docs/contributing-docs/contributions-quick-repo/) 
+Start adding the actual ASCIIDoc content. While writing, make sure your new source files are included in the nav.adoc configuration file of the module you are using (./modules/ROOT/ ). 
+Also make sure to use local preview often to check your markup.
 
-Note: Replace master with main on all occations on above document: 
+Once you finish, commit your changes and push them to your fork.
 
-* For example: instead of
-`git checkout master` use `git checkout main`
+Use forge to make a pull request from your fork to the repository’s main branch.
 
-### Previewing docs:
+Someone will see your pull request and either merge it, or provide feedback if there is something you should change. Work with the people commenting to make sure your contributions are up to standards.
 
-To build and preview docs, run:
+## The overall documentation structure
+
+```
+|-- README.md
+|-- antora.yml ....................... 1.
+|-- docsbuilder.sh ................... 2.
+|-- LICENSE  ......................... 3.
+|-- nginx.conf ....................... 4.
+|-- site.yml ......................... 5.
+`-- modules
+    `-- ROOT/ ........................ 6.
+        |-- assets
+        |   |-- attachments/ ......... 7.
+        |   `-- images/ .............. 8.
+        |-- nav.adoc ................. 9.
+        |-- pages ................... 10.
+        |   |-- index.adoc
+        |   |-- administration/
+        |   |   |-- index.adoc
+        |   |   `-- ......adoc
+        |   |-- containerization/
+        |   |   |-- index.adoc
+        |   |   `-- ......adoc
+        |   |-- installation/
+        |   |   |-- index.adoc
+        |   |   `-- ......adoc
+        |   |-- services/
+        |   |   |-- index.adoc
+        |   |   `-- ......adoc
+        |   |-- tutorials/
+        |   |   |-- index.adoc
+        |   |   `-- ......adoc
+        |   `-- somedir/
+        |       |-- index.adoc
+        |       `-- ......adoc
+        |
+        `-- partials/ .................11.
+
+```
+1. Metadata definition.
+2. A script that does a local build. It shows a preview of the site in a web browser on localhost:8080 by running a local web server. Uses podman/docker.
+3. Licence information for the documentation.
+4. Configuration for the local web server mentioned above.
+5. A definition file for the build script.
+6. A "root module of this documentation component". Please read below for an explanation.
+7. Directory containing **attachments** to be used on any page.
+8. Directory containing **Iiages** to be used on any page.
+9. **Menu definition.** Also defines the hierarchy of all the pages.
+10. **Pages with the actual content.** They are organised into subdirectories for specific area of information.
+11. Snippets of adoc files reusable in various documentations, organised into subdirectories for specific area of information.
+
+## Components and Modules
+
+Antora introduces two new terms:
+
+* **Component** — Simply put, a component is a part of the documentation website with its own menu. Components can also be versioned. In the Fedora Docs, we use separate components for user documentation, the Fedora Project, Fedora council, Mindshare, FESCO, but also for subprojects such as CommOps or Modulartity.
+* **Module** — A component can be broken down into multiple modules. Modules still share a single menu on the site, but their sources can be stored in different git repositories, even owned by different groups. The default module is called "ROOT" (that's what is in this example). If you don't want to use multiple modules, only use "ROOT". But to define more modules, simply duplicate the "ROOT" directory and name it anything you want. You can store modules in one or more git repositories.
+
+## Local preview
+
+This repo includes a script to build and preview the contents of this repository.
+
+**NOTE**: Please note that if you reference pages from other repositories, such links will be broken in this local preview as it only builds this repository. If you want to rebuild the whole Fedora Docs site, please see [the Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o/) for instructions.
+
+The script works on Fedora (using Podman) and macOS (using Docker).
+
+To build and preview the site, run:
 
 ```
 $ ./docsbuilder.sh
@@ -26,6 +91,65 @@ $ ./docsbuilder.sh
 
 The result will be available at http://localhost:8080
 
+### Installing Podman on Fedora
 
+Newer Fedora Workstations comes with Podman preinstalled by default — if you do not have it, you need to install it using the following command:
 
+```
+$ sudo dnf install podman
+```
 
+### Preview as a part of the whole Fedora Docs site
+
+You can also build the whole Fedora Docs site locally to see your changes in the whole context.
+This is especially useful for checking if your `xref` links work properly.
+
+To do this, you need to clone the main [Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o), modify the `site.yml` file to reference a repo with your changes, and build it.
+Steps:
+
+Clone the main repository and cd into it:
+
+```
+$ git clone https://pagure.io/fedora-docs/docs-fp-o.git
+$ cd docs-fp-o
+```
+
+Find a reference to the repository you're changing in the `site.yml` file, and change it so it points to your change.
+So for example, if I made a modification to the Modularity docs, I would find:
+
+```
+...
+   - url: https://pagure.io/fedora-docs/modularity.git
+     branches:
+       - master
+...
+```
+
+And replaced it with a pointer to my fork:
+```
+...
+   - url: https://pagure.io/forks/asamalik/fedora-docs/modularity.git
+     branches:
+       - master
+...
+```
+
+I could also point to a local repository, using `HEAD` as a branch to preview the what's changed without the need of making a commit.
+
+**Note:** I would need to move the repository under the `docs-fp-o` directory, because the builder won't see anything above.
+So I would need to create a `repositories` directory in `docs-fp-o` and copy my repository into it.
+
+```
+...
+   - url: ./repositories/modularity
+     branches:
+       - HEAD
+...
+```
+
+To build the whole site, I would run the following in the `docs-fp-o` directory.
+
+```
+$ ./docsbuilder.sh
+```
+For more information see [Git for docs writers](https://docs.fedoraproject.org/en-US/fedora-docs/contributing-docs/contributions-quick-repo/)

antora.yml

@@ -5,12 +5,12 @@
 name: fedora-server
 
 # Title will be visible on the page.
-title: Fedora Server Documentation
+title: Fedora Server User Documentation
 
 # 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: master
+version: main
 
 # 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

docs/README.md

@@ -1,140 +0,0 @@
-# Fedora Server Documentation
-
-This directory contains the sources for the Fedora Server Documentation.
-
-## Contributing to this documentation
-
-Steps to do to contribute to the documentation:
-
-Fork this repository, so you are not pushing updates directly into the main branch.
-
-Start adding the actual ASCIIDoc content. While writing, make sure your new source files are included in the nav.adoc configuration file of the module you are using (./modules/ROOT/ ). 
-Also make sure to use local preview often to check your markup.
-
-Once you finish, commit your changes and push them to your fork.
-
-Use Pagure to make a pull request from your fork to the repository’s main branch.
-
-Someone will see your pull request and either merge it, or provide feedback if there is something you should change. Work with the people commenting to make sure your contributions are up to standards.
-
-## This step needs to be done only once when first version of the site is finished.
-Your new content will need to be published for the first time, and at the moment this does not happen automatically. Send an e-mail to the docs mailing list asking for your content to be published.
-
-The information below is on contributing to this repository (Taken from https://pagure.io/fedora-docs/template)
-
-## Structure
-
-```
-|-- README.md
-|-- antora.yml ....................... 1.
-|-- build.sh ......................... 2.
-|-- preview.sh ....................... 3.
-|-- site.yml ......................... 4.
-`-- modules
-    `-- ROOT ......................... 5.
-        |-- assets
-        |   `-- images ............... 6.
-        |       `-- pizza.png
-        |-- nav.adoc ................. 7.
-        `-- pages .................... 8.
-            |-- architecture.adoc
-            |-- community.adoc
-            |-- faq.adoc
-            |-- index.adoc
-            |-- pizza-dough.adoc
-            `-- pizza-oven.adoc
-```
-
-1. Metadata definition.
-2. A script that does a local build. Uses podman/docker.
-3. A script that shows a preview of the site in a web browser by running a local web server. Uses podman/docker.
-4. A definition file for the build script.
-5. A "root module of this documentation component". Please read below for an explanation.
-6. **Images** to be used on any page.
-7. **Menu definition.** Also defines the hierarchy of all the pages.
-8. **Pages with the actual content.** They can be also organised into subdirectories if desired.
-
-## Components and Modules
-
-Antora introduces two new terms:
-
-* **Component** — Simply put, a component is a part of the documentation website with its own menu. Components can also be versioned. In the Fedora Docs, we use separate components for user documentation, the Fedora Project, Fedora council, Mindshare, FESCO, but also for subprojects such as CommOps or Modulartity.
-* **Module** — A component can be broken down into multiple modules. Modules still share a single menu on the site, but their sources can be stored in different git repositories, even owned by different groups. The default module is called "ROOT" (that's what is in this example). If you don't want to use multiple modules, only use "ROOT". But to define more modules, simply duplicate the "ROOT" directory and name it anything you want. You can store modules in one or more git repositories.
-
-## Local preview
-
-This repo includes scripts to build and preview the contents of this repository.
-
-**NOTE**: Please note that if you reference pages from other repositories, such links will be broken in this local preview as it only builds this repository. If you want to rebuild the whole Fedora Docs site, please see [the Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o/) for instructions.
-
-Both scripts work on Fedora (using Podman) and macOS (using Docker).
-
-To build and preview the site, run:
-
-```
-$ ./build.sh && ./preview.sh
-```
-
-The result will be available at http://localhost:8080
-
-### Installing Podman on Fedora
-
-Newer Fedora Workstations comes with Podman preinstalled by default — if you do not have it, you need to install it using the following command:
-
-```
-$ sudo dnf install podman
-```
-
-### Preview as a part of the whole Fedora Docs site
-
-You can also build the whole Fedora Docs site locally to see your changes in the whole context.
-This is especially useful for checking if your `xref` links work properly.
-
-To do this, you need to clone the main [Fedora Docs build repository](https://pagure.io/fedora-docs/docs-fp-o), modify the `site.yml` file to reference a repo with your changes, and build it.
-Steps:
-
-Clone the main repository and cd into it:
-
-```
-$ git clone https://pagure.io/fedora-docs/docs-fp-o.git
-$ cd docs-fp-o
-```
-
-Find a reference to the repository you're changing in the `site.yml` file, and change it so it points to your change.
-So for example, if I made a modification to the Modularity docs, I would find:
-
-```
-...
-   - url: https://pagure.io/fedora-docs/modularity.git
-     branches:
-       - master
-...
-```
-
-And replaced it with a pointer to my fork:
-```
-...
-   - url: https://pagure.io/forks/asamalik/fedora-docs/modularity.git
-     branches:
-       - master
-...
-```
-
-I could also point to a local repository, using `HEAD` as a branch to preview the what's changed without the need of making a commit.
-
-**Note:** I would need to move the repository under the `docs-fp-o` directory, because the builder won't see anything above.
-So I would need to create a `repositories` directory in `docs-fp-o` and copy my repository into it.
-
-```
-...
-   - url: ./repositories/modularity
-     branches:
-       - HEAD
-...
-```
-
-To build the whole site, I would run the following in the `docs-fp-o` directory.
-
-```
-$ ./build.sh && ./preview.sh
-```

fedora-ansible/README.md

@@ -1,3 +0,0 @@
-# fedora-ansible
-
-This directory contains Ansible scripts and documentation for Fedora Server Edition supported services.  

fedora-ansible/docs/README.md

@@ -1,3 +0,0 @@
-# fedora-ansible/docs
-
-This directory contains documentation about Ansible for Fedora Server Edition supported services.  

fedora-ansible/files/README.md

@@ -1,3 +0,0 @@
-# fedora-ansible/files
-
-This directory contains files for Fedora Server Edition supported services.  

fedora-ansible/roles/README.md

@@ -1,3 +0,0 @@
-# fedora-ansible/roles
-
-This directory contains Ansible roles for Fedora Server Edition supported services.