Skip to content
Snippets Groups Projects

docs: Merge all documentation into a single one

Merged Antoine Lambert requested to merge anlambert/swh-docs:docs-single-instance into master
3 unresolved threads

These changes allow to build all SWH documentations (developmment, system administration and user) using a single sphinx-build command, meaning they are now merged into a single one with shared index of references.

Development documentation is now rooted to docs/devel, user one to docs/user and sysadmin one to docs/sysadm so a good amount of files were moved.

A couple of configuration files and makefiles were updated to reflect that change and the building / cleaning processes were made more reliable.

Calling make in root directory of swh-docs will execute the development build of the documentation in a tox environment while calling make in docs folder will use the current virtualenv.

It remains possible to build each documentation in a standalone way by calling make in their root directory.

Related to #4496 (closed)

Edited by Antoine Lambert

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
1 #!/usr/bin/env python3
2 # -*- coding: utf-8 -*-
3 #
1 # Copyright (C) 2017-2022 The Software Heritage developers
  • lgtm

    one remark for copyright range date inline.

    And one question regarding redirects:

    • are any installed?
    • or do we accept to break all links during that transition (for once with a disclaimer somewhere)?
  • Antoine R. Dumont approved this merge request

    approved this merge request

  • Antoine Lambert added 2 commits

    added 2 commits

    • 75869847 - 1 commit from branch swh/devel:master
    • eafc08b4 - docs: Merge all documentations into a single one

    Compare with previous version

  • Antoine Lambert changed the description

    changed the description

  • Antoine Lambert added 3 commits

    added 3 commits

    • 04b92104 - docs/index: Bump toctree level
    • ce573eaa - docs: Remove no longer needed intersphinx references
    • 5be5fbd9 - Bump years in license headers

    Compare with previous version

  • Antoine Lambert added 5 commits

    added 5 commits

    • b6a7097a - 1 commit from branch swh/devel:master
    • 736f4d44 - docs: Merge all documentations into a single one
    • a31c7425 - docs/index: Bump toctree level
    • b28f4381 - docs: Remove no longer needed intersphinx references
    • ac47a5bd - Bump years in license headers

    Compare with previous version

  • Antoine Lambert added 4 commits

    added 4 commits

    • 0e55968d - docs: Merge all documentations into a single one
    • bf010f1a - docs/index: Bump toctree level
    • da0c9469 - docs: Remove no longer needed intersphinx references
    • 64e03f5e - Bump years in license headers

    Compare with previous version

  • Antoine Lambert enabled an automatic merge when the pipeline for 64e03f5e succeeds

    enabled an automatic merge when the pipeline for 64e03f5e succeeds

  • Please register or sign in to reply
    Loading