Skip to content

Commit

Permalink
Merge branch 'main' into sgmoore/add_core24_support
Browse files Browse the repository at this point in the history
  • Loading branch information
ScarlettGatelyMoore authored Nov 18, 2024
2 parents 6e27844 + bd5e8c0 commit 63af446
Show file tree
Hide file tree
Showing 9 changed files with 999 additions and 320 deletions.
5 changes: 2 additions & 3 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ build:
- libapt-pkg-dev
jobs:
post_checkout:
- git fetch --unshallow || true # See https://docs.readthedocs.io/en/latest/build-customization.html#unshallow-git-clone
- git fetch --tags --depth 1 # Also fetch tags
- git describe # Useful for debugging
- git fetch --tags --unshallow # Also fetch tags
- git describe # Make sure we get a proper version

# Build documentation in the docs/ directory with Sphinx
sphinx:
Expand Down
66 changes: 0 additions & 66 deletions docs/Makefile

This file was deleted.

1 change: 1 addition & 0 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
html_context = {
"product_page": "github.com/canonical/snapcraft",
"github_url": "https://github.com/canonical/snapcraft",
"display_contributors": False,
}

extensions = [
Expand Down
30 changes: 10 additions & 20 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,16 @@ Snapcraft
reference/index
explanation/index

.. grid:: 1 1 2 2

.. grid-item-card:: :ref:`Tutorial <tutorial>`

**Get started** with a hands-on introduction to Snapcraft

.. grid-item-card:: :ref:`How-to guides <howto>`

**Step-by-step guides** covering key operations and common tasks

.. grid:: 1 1 2 2
:reverse:

.. grid-item-card:: :ref:`Reference <reference>`

**Technical information** about Snapcraft

.. grid-item-card:: :ref:`Explanation <explanation>`

**Discussion and clarification** of key topics
.. list-table::

* - | :ref:`Tutorial <tutorial>`
| **Get started** with a hands-on introduction to Snapcraft
- | :ref:`How-to guides <howto>`
| **Step-by-step guides** covering key operations and common tasks
* - | :ref:`Reference <reference>`
| **Technical information** about Snapcraft
- | :ref:`Explanation <explanation>`
| **Discussion and clarification** of key topics
Project and community
=====================
Expand Down
Loading

0 comments on commit 63af446

Please sign in to comment.