Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ include:

build:website:
extends: .website
script:
- git clone https://gitlab.com/${CI_PROJECT_PATH%%/*}/qubesos.github.io ~/qubesos.github.io -b test
- ~/qubesos.github.io/_utils/gitlabci.sh
Comment on lines +7 to +9
Copy link
Contributor

Choose a reason for hiding this comment

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

I can't say whether this is right or wrong. I'm not an expert here. To be reviewed by someone else.

3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "_posts"]
path = _posts
url = https://github.com/QubesOS/qubes-posts
[submodule "_doc"]
path = _doc
url = https://github.com/QubesOS/qubes-doc
[submodule "_hcl"]
path = _hcl
url = https://github.com/QubesOS/qubes-hcl
20 changes: 10 additions & 10 deletions _data/architecture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,25 @@
icon: fa-book
sub-pages:
- title: Introduction
url: /doc/#introduction
url: https://doc.qubes-os.org/en/latest/index.html#introduction
- title: Choosing hardware
url: /doc/#choosing-your-hardware
url: https://doc.qubes-os.org/en/latest/index.html#choosing-your-hardware
- title: Installing and upgrading
url: /doc/#downloading-installing-and-upgrading-qubes
url: https://doc.qubes-os.org/en/latest/index.html#downloading-installing-and-upgrading-qubes
- title: How-to guides
url: /doc/#how-to-guides
url: https://doc.qubes-os.org/en/latest/index.html#how-to-guides
- title: Templates
url: /doc/#templates
url: https://doc.qubes-os.org/en/latest/index.html#templates
- title: Troubleshooting
url: /doc/#troubleshooting
url: https://doc.qubes-os.org/en/latest/index.html#troubleshooting
- title: Security in Qubes
url: /doc/#security-in-qubes
url: https://doc.qubes-os.org/en/latest/index.html#security-in-qubes
- title: Project security
url: /doc/#project-security
url: https://doc.qubes-os.org/en/latest/index.html#project-security
- title: Developer docs
url: /doc/#developer-documentation
url: https://doc.qubes-os.org/en/latest/index.html#developer-documentation
- title: External docs
url: /doc/#external-documentation
url: https://doc.qubes-os.org/en/latest/index.html#external-documentation
Comment on lines +62 to +80
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure, whether modifying these links is necessary. There is a redirect for /doc/ in this PR. Is it to get the fragments/anchors working? I didn't manage it to generate the website on this branch.

Copy link
Member Author

Choose a reason for hiding this comment

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

Unfortunately it is necessary. The /doc/ redirect discards the section (the part after #), so it would point at the top of index, not specific place. I don't think it's technically possible to do a redirect that preserves the section anchor.
Applies to all other places like this.


- title: News
url: /news/
Expand Down
2 changes: 1 addition & 1 deletion _data/downloads-page.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
- column: Location
- column: URL
links:
- url: /downloads/mirrors/#instructions-for-mirror-operators
- url: https://doc.qubes-os.org/en/latest/user/downloading-installing-upgrading/download-mirrors.html#instructions-for-mirror-operators
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

text: How to contribute a download mirror
4 changes: 2 additions & 2 deletions _data/hcl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
- url: '#hardware-motherboards'
text: Motherboards
id: 3
- url: /doc/how-to-use-the-hcl/#generating-and-submitting-new-reports
- url: https://doc.qubes-os.org/en/latest/user/hardware/how-to-use-the-hcl.html#generating-and-submitting-new-reports
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

text: Add your device
id: 4

Expand All @@ -20,7 +20,7 @@
- url: /doc/how-to-use-the-hcl/
text: What is the hardware compatibility list (HCL)?
id: 1
- url: /doc/how-to-use-the-hcl/#generating-and-submitting-new-reports
- url: https://doc.qubes-os.org/en/latest/user/hardware/how-to-use-the-hcl.html#generating-and-submitting-new-reports
Copy link
Contributor

Choose a reason for hiding this comment

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

Same here.

text: How do I submit a report?
id: 2
- url: /doc/system-requirements/
Expand Down
1 change: 0 additions & 1 deletion _doc
Submodule _doc deleted from e3db13
6 changes: 6 additions & 0 deletions _doc/.gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include:
- project: 'QubesOS/qubes-continuous-integration'
file: '/gitlab-website.yml'

build:doc:
extends: .website
Comment on lines +1 to +6
Copy link
Contributor

Choose a reason for hiding this comment

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

I can't say whether this is right or wrong. I'm not an expert here. To be reviewed by someone else.

18 changes: 18 additions & 0 deletions _doc/.travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: ruby
dist: bionic
rvm:
- 2.5
install: git clone https://github.com/${TRAVIS_REPO_SLUG%%/*}/qubesos.github.io ~/qubesos.github.io
script: ~/qubesos.github.io/_utils/travis.sh
addons:
apt:
packages:
- hunspell
- pandoc
- jq
notifications:
email:
recipients:
- [email protected]
on_success: never
on_failure: always
Comment on lines +1 to +18
Copy link
Contributor

Choose a reason for hiding this comment

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

I can't say whether this is right or wrong. I'm not an expert here. To be reviewed by someone else.

12 changes: 12 additions & 0 deletions _doc/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Contributing to `qubes-doc`
Copy link

Choose a reason for hiding this comment

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

The content will be updated later as well as contributing.md in the root dir


Thank you for your interest in contributing to `qubes-doc`, the Qubes OS
Project's dedicated documentation repository! Please see [how to edit the
documentation](https://www.qubes-os.org/doc/how-to-edit-the-documentation/) for
detailed contribution instructions.

In addition, please take a moment to read our [documentation style
guide](https://www.qubes-os.org/doc/documentation-style-guide/) before
contributing. These guidelines are important to maintaining high standards of
quality, and following them will increase the likelihood that your contribution
will be accepted.
11 changes: 11 additions & 0 deletions _doc/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Qubes OS Documentation

Copy link

Choose a reason for hiding this comment

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

The content will be updated later as well as README.md in root dir

Canonical URL: https://www.qubes-os.org/doc/

All [Qubes OS Project](https://github.com/QubesOS) documentation pages are
stored as plain text files in this dedicated repository. By cloning and
regularly pulling from this repo, users can maintain their own up-to-date
offline copy of all Qubes documentation rather than relying solely on the Web.

To contribute, please see [how to edit the
documentation](https://www.qubes-os.org/doc/how-to-edit-the-documentation/).
1 change: 1 addition & 0 deletions _doc/_dev/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
_build
177 changes: 177 additions & 0 deletions _doc/_dev/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,177 @@
# Makefile for Sphinx documentation
Copy link
Contributor

Choose a reason for hiding this comment

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

I can't say whether this whole file is right or wrong. I'm not an expert here. To be reviewed by someone else.

#

# You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = _build

# User-friendly check for sphinx-build
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from https://www.sphinx-doc.org/)
endif

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
# the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext

help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " html to make standalone HTML files"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " singlehtml to make a single large HTML file"
@echo " pickle to make pickle files"
@echo " json to make JSON files"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " qthelp to make HTML files and a qthelp project"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
@echo " info to make Texinfo files and run them through makeinfo"
@echo " gettext to make PO message catalogs"
@echo " changes to make an overview of all changed/added/deprecated items"
@echo " xml to make Docutils-native XML files"
@echo " pseudoxml to make pseudoxml-XML files for display purposes"
@echo " linkcheck to check all external links for integrity"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"

clean:
rm -rf $(BUILDDIR)/*

html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."

dirhtml:
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."

singlehtml:
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
@echo
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."

pickle:
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
@echo
@echo "Build finished; now you can process the pickle files."

json:
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
@echo
@echo "Build finished; now you can process the JSON files."

htmlhelp:
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in $(BUILDDIR)/htmlhelp."

qthelp:
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/QubesOSDeveloper.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/QubesOSDeveloper.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/QubesOSDeveloper"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/QubesOSDeveloper"
@echo "# devhelp"

epub:
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
@echo
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."

latex:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
@echo "Run \`make' in that directory to run these through (pdf)latex" \
"(use \`make latexpdf' here to do that automatically)."

latexpdf:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through pdflatex..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

text:
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
@echo
@echo "Build finished. The text files are in $(BUILDDIR)/text."

man:
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
@echo
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."

texinfo:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
@echo "Run \`make' in that directory to run these through makeinfo" \
"(use \`make info' here to do that automatically)."

info:
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
@echo "Running Texinfo files through makeinfo..."
make -C $(BUILDDIR)/texinfo info
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."

gettext:
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
@echo
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."

changes:
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
@echo
@echo "The overview file is in $(BUILDDIR)/changes."

linkcheck:
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in $(BUILDDIR)/linkcheck/output.txt."

doctest:
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
@echo "Testing of doctests in the sources finished, look at the " \
"results in $(BUILDDIR)/doctest/output.txt."

xml:
$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
@echo
@echo "Build finished. The XML files are in $(BUILDDIR)/xml."

pseudoxml:
$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
@echo
@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
Empty file added _doc/_dev/_static/.gitignore
Empty file.
Empty file added _doc/_dev/_templates/.gitignore
Empty file.
Loading