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

Migrate the Documentation to Antora #6785

Merged
merged 34 commits into from Feb 13, 2019
Merged

Migrate the Documentation to Antora #6785

merged 34 commits into from Feb 13, 2019

Conversation

settermjd
Copy link
Contributor

No description provided.

@dschmidt
Copy link
Member

Is the doc cmake target simply gone now or do i simply don't see newly added CMake code?

@tboerger
Copy link
Contributor

The docs are getting imported into the main docs and built there. The client docs don't need to be built standalone anymore with antora.

@tboerger
Copy link
Contributor

Looks like it got to be dropped from the root cmake file?

@dschmidt
Copy link
Member

@tboerger I'm pretty sure @dragotin will contradict. Docs are packaged with distribution packages.

@dragotin
Copy link
Contributor

Yes, the client docs should be remain in the client source so that it can go into the rpm/deb. What is wrong with the current way of documenting?

@tboerger
Copy link
Contributor

The current sphinx documentation will be replaced by antora docs.

@dragotin
Copy link
Contributor

Any reason for that? How about putting energy into the contents, rather than the framework?

@tboerger
Copy link
Contributor

That's not my decision, even if I welcome this decision because the setup up Antora is much simpler than this whole sphinx stack. Besides that I personally also prefer ascidoc over rst.

@michaelstingl
Copy link
Contributor

Can't distros not use the docs built from adoc? @dschmidt @dragotin what format is needed?

@tboerger
Copy link
Contributor

I guess we need some PDF shipped with the client packages. And with the latest tooling of @settermjd we should be able to build a PDF "book".

@dragotin
Copy link
Contributor

In openSUSE there is no antora yet. That means I would have trouble building the docs, other distros probably similar. Sphinx is a well know and wide spread technology which everybody has.

Shipping a PDF: That is the second best option. I am still dreaming of an openSUSE branded ownCloud client, and that would include the docs. Hardly possible with PDF.

I am still trying to understand why you wanna do the change, what is the real benefit of antora?

@dschmidt
Copy link
Member

dschmidt commented Sep 28, 2018

@michaelstingl @tboerger @settermjd I don't want to judge over the choice of Antora. If it's good it will find it's way into distributions. I'm more worried that the "command line API" to generate them has changed and packagers now need to learn how to use Antora (while they didnt need to know sphinx, just cmake)
In conclusion: please readd the cmake target with a sane default invocation so make doc still works.
And possibly document in the readme how to find more info on the docs (Maybe just a link to https://github.com/owncloud/docs/blob/master/README.md)

P.S. asciidoc is pretty readable without generating html or pdf from it

@settermjd settermjd force-pushed the master-antora branch 3 times, most recently from fa85734 to 6e62cf7 Compare September 28, 2018 10:11
@settermjd
Copy link
Contributor Author

@dschmidt, thanks for your most recent feedback. It could be possible (likely is) to have the client docs both included in the rest of the documentation, as well as be able to be built standalone. I have to check the Antora docs again. If so, then I'll get a CMake target back in to build them, using the target name.

In the main docs repo, I've assembed a basic set of information around AsciiDoc and Antora, along with some of the motivations for making the change (I think).

@dschmidt
Copy link
Member

@settermjd Yep, as I said just a link to that repo in the client's README would be very handy already.

@settermjd
Copy link
Contributor Author

OK, I'll get it done, @dschmidt.

@settermjd
Copy link
Contributor Author

@dschmidt, I've added a new documentation section to the readme in 5a0c042. It's not much, but it's a start.

settermjd added a commit that referenced this pull request Sep 28, 2018
It's come up discussion around the migration to Antora, that the client
docs should be able to be built standalone, and not just as a part of
the larger documentation set. By adding an Antora Playbook file
(site.yml), the client docs can be built both standalone and as part of
the larger ownCloud documentation site.

See #6785 (comment)
settermjd added a commit that referenced this pull request Sep 28, 2018
It's come up discussion around the migration to Antora, that the client
docs should be able to be built standalone, and not just as a part of
the larger documentation set. By adding an Antora Playbook file
(site.yml), the client docs can be built both standalone and as part of
the larger ownCloud documentation site.

See #6785 (comment)
@dschmidt
Copy link
Member

I'd argue it's not so relevant what was used before only the current state. We will rewrite it anyway when the CMake target lands .. so for now this is ok to me 👍

@@ -61,6 +61,15 @@ Past maintainers:
* Daniel Molkentin <daniel@molkentin.de>
* Andreas Schneider <asn@cryptomilk.org>

## Building the Documentation

The documentation has been migrated from Sphinx-Doc to [Antora](https://docs.antora.org/), which is based on [the AsciiDoc format](https://github.com/owncloud/docs/blob/master/docs/getting-started.md).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would reference via link else you have to maintain two sides.
Like:
Please see the README.md in https://github.com/owncloud/docs for more information

@mmattel
Copy link
Contributor

mmattel commented Oct 9, 2018

@tboerger @settermjd

I highly propose to move from ROOT to eg desktop_client
docs/modules/ROOT/pages --> docs/modules/desktop_client/pages
We just have created in the docs repro administration_manual and moved the former contents of ROOT there and added new content with a general description into ROOT.

Bonus:
It is clear what is meant and where to find.
Harmonisation to the docs repro.
Whenever there is the wish to move the documentation from this repro to docs repro...

settermjd and others added 22 commits February 12, 2019 20:30
While not strictly necessary, the rename makes it that much clearer for
contributors to know what the file is for and whether it's the correct
one to edit. It also better organised the "advanced usage" files, so
that the file structure is that much more meaningful as well.  So, a
little bit of work now, to save time later.
As the documentation's using Antora instead of Sphinx-Doc, it's
essential to work to take users along on the journey with us. So by
documenting the change in the readme, and by providing links to further
reading, I hope that they'll be amenable to the change.
After re-reading the relevant section of the Antora documentation, I
believe that my previous understanding was incorrect as to how
navigation files are built. Consequently I used too much indentation and
included an unnecessary header, that was duplicating the name draw from
the antora.yml (the component descriptor file).
It's come up discussion around the migration to Antora, that the client
docs should be able to be built standalone, and not just as a part of
the larger documentation set. By adding an Antora Playbook file
(site.yml), the client docs can be built both standalone and as part of
the larger ownCloud documentation site.

See #6785 (comment)
This commit adds two Antora Playbook files, so that the docs can be
built, stand-alone, from the remote repository and from the local
working copy. It also documents how to build the docs locally.
I'm not sure why I added the attribute previously, in
0afd511, but it's not necessary, and
has caused some confusion. Given that, this commit's removing it.
You can even pass -Dnpm=yarn to use yarn instead of npm.
voroyam and others added 3 commits February 12, 2019 21:32
Doc for explaining how to remove remnants of the client on windows.
@dschmidt
Copy link
Member

The build failure seems unrelated to this branch (would be really surprising if documentation changes triggered a failure in code tests). So I'd say: :shipit:

@tboerger tboerger merged commit 0ef8500 into master Feb 13, 2019
@delete-merged-branch delete-merged-branch bot deleted the master-antora branch February 13, 2019 09:04
@dschmidt
Copy link
Member

🎉 🎉 🎉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants