diff --git a/content/en/docs/contribution_guidelines/_index.md b/content/en/docs/contribution_guidelines/_index.md index bdf7078..4f71818 100644 --- a/content/en/docs/contribution_guidelines/_index.md +++ b/content/en/docs/contribution_guidelines/_index.md @@ -3,79 +3,27 @@ title: "Contribution Guidelines" linkTitle: "Contribution Guidelines" weight: 10 description: > - How to contribute to the docs + How to contribute to the Federated Core documentation. --- {{% pageinfo %}} -These basic sample guidelines assume that your Docsy site is deployed using Netlify and your files are stored in GitHub. You can use the guidelines "as is" or adapt them with your own instructions: for example, other deployment options, information about your doc project's file structure, project-specific review guidelines, versioning guidelines, or any other information your users might find useful when updating your site. [Kubeflow](https://github.com/kubeflow/website/blob/master/README.md) has a great example. - -Don't forget to link to your own doc repo rather than our example site! Also make sure users can find these guidelines from your doc repo README: either add them there and link to them from this page, add them here and link to them from the README, or include them in both locations. +This documentation is create using Docsy and Hugo and then pushed to a Gitea repository on our Federated Core. A webhook in Gitea then pushes the public folder to Caddy where it is published to the world-wide-web. {{% /pageinfo %}} -We use [Hugo](https://gohugo.io/) to format and generate our website, the -[Docsy](https://github.com/google/docsy) theme for styling and site structure, -and [Netlify](https://www.netlify.com/) to manage the deployment of the site. +We use [Hugo](https://gohugo.io/) to format and generate our website, and publish it through [Gitea]() running on our Federated Core. This documentation is created used the [Docsy]() template. + Hugo is an open-source static site generator that provides us with templates, content organisation in a standard directory structure, and a website generation engine. You write the pages in Markdown (or HTML if you want), and Hugo wraps them up into a website. All submissions, including submissions by project members, require review. We -use GitHub pull requests for this purpose. Consult -[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more -information on using pull requests. +use Gitea pull requests for this purpose. -## Quick start with Netlify +### If you would like to contirbute -Here's a quick guide to updating the docs. It assumes you're familiar with the -GitHub workflow and you're happy to use the automated preview of your doc -updates: +Please send an email to support@federated.computer with your interest to contribute to the documentation. If we decide to collaborate, we are willing to compensate you for your contributions with free Federated services, merchandise, even BTC. Please get in touch. -1. Fork the [Goldydocs repo](https://github.com/google/docsy-example) on GitHub. -1. Make your changes and send a pull request (PR). -1. If you're not yet ready for a review, add "WIP" to the PR name to indicate - it's a work in progress. (**Don't** add the Hugo property - "draft = true" to the page front matter, because that prevents the - auto-deployment of the content preview described in the next point.) -1. Wait for the automated PR workflow to do some checks. When it's ready, - you should see a comment like this: **deploy/netlify — Deploy preview ready!** -1. Click **Details** to the right of "Deploy preview ready" to see a preview - of your updates. -1. Continue updating your doc and pushing your changes until you're happy with - the content. -1. When you're ready for a review, add a comment to the PR, and remove any - "WIP" markers. - -## Updating a single page - -If you've just spotted something you'd like to change while using the docs, Docsy has a shortcut for you: - -1. Click **Edit this page** in the top right hand corner of the page. -1. If you don't already have an up to date fork of the project repo, you are prompted to get one - click **Fork this repository and propose changes** or **Update your Fork** to get an up to date version of the project to edit. The appropriate page in your fork is displayed in edit mode. -1. Follow the rest of the [Quick start with Netlify](#quick-start-with-netlify) process above to make, preview, and propose your changes. - -## Previewing your changes locally - -If you want to run your own local Hugo server to preview your changes as you work: - -1. Follow the instructions in [Getting started](/docs/getting-started) to install Hugo and any other tools you need. You'll need at least **Hugo version 0.45** (we recommend using the most recent available version), and it must be the **extended** version, which supports SCSS. -1. Fork the [Goldydocs repo](https://github.com/google/docsy-example) repo into your own project, then create a local copy using `git clone`. Don’t forget to use `--recurse-submodules` or you won’t pull down some of the code you need to generate a working site. - - ``` - git clone --recurse-submodules --depth 1 https://github.com/google/docsy-example.git - ``` - -1. Run `hugo server` in the site root directory. By default your site will be available at http://localhost:1313/. Now that you're serving your site locally, Hugo will watch for changes to the content and automatically refresh your site. -1. Continue with the usual GitHub workflow to edit files, commit them, push the - changes up to your fork, and create a pull request. - -## Creating an issue - -If you've found a problem in the docs, but you're not sure how to fix it yourself, please create an issue in the [Goldydocs repo](https://github.com/google/docsy-example/issues). You can also create an issue about a specific page by clicking the **Create Issue** button in the top right hand corner of the page. - -## Useful resources +### Useful resources * [Docsy user guide](https://www.docsy.dev/docs/): All about Docsy, including how it manages navigation, look and feel, and multi-language support. * [Hugo documentation](https://gohugo.io/documentation/): Comprehensive reference for Hugo. -* [Github Hello World!](https://guides.github.com/activities/hello-world/): A basic introduction to GitHub concepts and workflow. - - diff --git a/content/en/docs/Other_Topics/_index.md b/content/en/docs/other_topics/_index.md similarity index 83% rename from content/en/docs/Other_Topics/_index.md rename to content/en/docs/other_topics/_index.md index 563151a..27a38e5 100644 --- a/content/en/docs/Other_Topics/_index.md +++ b/content/en/docs/other_topics/_index.md @@ -10,4 +10,3 @@ description: > This documentation is for users and administrators, not those wanting to install. {{% /pageinfo %}} -We will have other issues covered here, in time. diff --git a/content/en/docs/Other_Topics/migration.md b/content/en/docs/other_topics/migration.md similarity index 100% rename from content/en/docs/Other_Topics/migration.md rename to content/en/docs/other_topics/migration.md diff --git a/content/en/docs/Overview/_index.md b/content/en/docs/overview/_index.md similarity index 100% rename from content/en/docs/Overview/_index.md rename to content/en/docs/overview/_index.md diff --git a/public/docs/contribution_guidelines/index.html b/public/docs/contribution_guidelines/index.html index 0c1edb9..1710d7f 100644 --- a/public/docs/contribution_guidelines/index.html +++ b/public/docs/contribution_guidelines/index.html @@ -20,19 +20,19 @@
These basic sample guidelines assume that your Docsy site is deployed using Netlify and your files are stored in GitHub. You can use the guidelines “as is” or adapt them with your own instructions: for example, other deployment options, information about your doc project’s file structure, project-specific review guidelines, versioning guidelines, or any other information your users might find useful when updating your site. Kubeflow has a great example.
-Don’t forget to link to your own doc repo rather than our example site! Also make sure users can find these guidelines from your doc repo README: either add them there and link to them from this page, add them here and link to them from the README, or include them in both locations.
+This documentation is create using Docsy and Hugo and then pushed to a Gitea repository on our Federated Core. A webhook in Gitea then pushes the public folder to Caddy where it is published to the world-wide-web.
We use Hugo to format and generate our website, the -Docsy theme for styling and site structure, -and Netlify to manage the deployment of the site. -Hugo is an open-source static site generator that provides us with templates, +
We use Hugo to format and generate our website, and publish it through Gitea running on our Federated Core. This documentation is created used the Docsy template.
+Hugo is an open-source static site generator that provides us with templates, content organisation in a standard directory structure, and a website generation engine. You write the pages in Markdown (or HTML if you want), and Hugo wraps them up into a website.
All submissions, including submissions by project members, require review. We -use GitHub pull requests for this purpose. Consult -GitHub Help for more -information on using pull requests.
-Here’s a quick guide to updating the docs. It assumes you’re familiar with the -GitHub workflow and you’re happy to use the automated preview of your doc -updates:
-If you’ve just spotted something you’d like to change while using the docs, Docsy has a shortcut for you:
-If you want to run your own local Hugo server to preview your changes as you work:
-Follow the instructions in Getting started to install Hugo and any other tools you need. You’ll need at least Hugo version 0.45 (we recommend using the most recent available version), and it must be the extended version, which supports SCSS.
-Fork the Goldydocs repo repo into your own project, then create a local copy using git clone
. Don’t forget to use --recurse-submodules
or you won’t pull down some of the code you need to generate a working site.
git clone --recurse-submodules --depth 1 https://github.com/google/docsy-example.git
-
Run hugo server
in the site root directory. By default your site will be available at http://localhost:1313/. Now that you’re serving your site locally, Hugo will watch for changes to the content and automatically refresh your site.
Continue with the usual GitHub workflow to edit files, commit them, push the -changes up to your fork, and create a pull request.
-If you’ve found a problem in the docs, but you’re not sure how to fix it yourself, please create an issue in the Goldydocs repo. You can also create an issue about a specific page by clicking the Create Issue button in the top right hand corner of the page.
-Please send an email to support@federated.computer with your interest to contribute to the documentation. If we decide to collaborate, we are willing to compensate you for your contributions with free Federated services, merchandise, even BTC. Please get in touch.
+How to contribute to the docs
+How to contribute to the Federated Core documentation.
We will have other issues covered here, in time.