Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SQUASH ME - make ant gen-doc work again (in a preliminary way). update README.md too #19

Open
wants to merge 4 commits into
base: cassandra-3.11
Choose a base branch
from

Conversation

michaelsembwever
Copy link

polandll and others added 3 commits December 19, 2021 00:48
This commit sets up a new documentation structure and format:

* The directory struture changes from a Sphinx project to an Antora module layout.
* The formatting of the content changes from reStructuredText to AsciiDoc.

The documentation must now be built and published with Antora.

This change was done to make maintaining versioning documentation easier. As
Antora is designed to generate versioned documentation.

The old directory structure was:

<ROOT>
  - doc/
    - cql3/
      - CQL.css
      - CQL.textile
    - source/
      - _static/
      - _templates/
      - _theme/
      - _util/
      - <other directory sections>/
      - conf.py
      - index.rst
      - <other *.rst pages>
    - make.bat
    - Makefile
    - README.md
    - SASI.md
    - <*.spec files>
    - <generation scripts>

The new directory structure organises the documentation into modules:

<ROOT>
  - doc/
    - cql3
    - modules/
      - cassandra/
        - assets/
        - examples/
        - pages/
        - partials/
        - nav.adoc
      - ROOT/
        - pages/
        - nav.adoc
    - scripts/
    - antora.yaml
    - README.md
    - SASI.md

Patch by Lorina Poland; reviewed by Michael Semb Wever and Anthony Grasso for CASSANDRA-16763
* Changed document file location
* Added BNF content
* Moved *.spec files back to their original location
* Removed Makefile and legacy documentation tooling
* Removed generate Cassandra configuration documentation file
    - doc/modules/cassandra/pages/configuration/cass_yaml_file.adoc
* Removed all generated nodetool command (.txt) and documentation (*.adoc) files
    - doc/modules/cassandra/examples/TEXT/NODETOOL/*.txt
    - doc/modules/cassandra/pages/tools/nodetool/*.adoc
    - doc/modules/cassandra/pages/tools/nodetool/nodetool.txt
* Removed legacy .rst -> .adoc conversion script
    - doc/modules/cassandra/pages/tools/nodetool/convert.sh

Patch by Anthony Grasso; reviewed by Michael Semb Wever for CASSANDRA-16763

Co-authored-by: polandll <[email protected]>
* Added documentation files to RAT exclude list:
    - doc/antora.yaml
    - doc/modules/*
* Added generated doc files to .gitignore:
    - doc/modules/cassandra/pages/configuration/cass_yaml_file.adoc
    - doc/modules/cassandra/pages/tools/nodetool/
    - doc/modules/cassandra/examples/TEXT/NODETOOL/

Patch by Anthony Grasso; reviewed by Michael Semb Wever for CASSANDRA-16763
…ate README.md too.

doc/cql3/CQL.css needs to be restored too (used in debian packaging)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants