Skip to content

Commit 9680e59

Browse files
committed
:octocat:
1 parent 2c870d5 commit 9680e59

File tree

3 files changed

+46
-21
lines changed

3 files changed

+46
-21
lines changed

docs/Readme.md

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,21 @@
11
# Documentation
22

3-
## Sources
4-
5-
The markdown sources for the [Read the Docs online manual](https://php-qrcode.readthedocs.io) can of course be browsed on GitHub too!
6-
7-
8-
### Usage
9-
- [Overview](./Usage-Overview.md)
10-
- [Installation](./Usage-Installation.md)
11-
- [Quickstart](./Usage-Quickstart.md)
12-
- [Advanced usage](./Usage-Advanced-usage.md)
13-
14-
### Appendix
15-
- [License](./Appendix-License.rst)
16-
173
## Auto generated documentation
184

195
### User manual via Sphinx
206

21-
[![Documentation Status](https://readthedocs.org/projects/php-qrcode/badge/?version=latest)](https://php-qrcode.readthedocs.io/en/latest/?badge=latest)
7+
[![Documentation Status](https://readthedocs.org/projects/php-qrcode/badge/?version=main)](https://php-qrcode.readthedocs.io/en/main/?badge=main)
228

239
The user manual can be auto generated with [Sphinx](https://www.sphinx-doc.org) from the markdown sources contained in this directory, in order to upload it to [Read the Docs](https://readthedocs.org).
24-
The online documentation can be found at [php-qrcode.readthedocs.io](https://php-qrcode.readthedocs.io) ([project page](https://readthedocs.org/projects/php-qrcode/))
10+
The online documentation can be found at [php-qrcode.readthedocs.io](https://php-qrcode.readthedocs.io/en/main/) ([project page](https://readthedocs.org/projects/php-qrcode/)), a local copy is built during CI and stored in the [`readthedocs` branch](https://github.com/chillerlan/php-qrcode/tree/readthedocs).
2511

2612

2713
#### Run Sphinx locally
2814

2915
Requirements:
3016

3117
- [Python](https://www.python.org/downloads/) >= v3.10
32-
- [Sphinx](https://www.sphinx-doc.org/en/master/usage/installation.html) >= v7.0
18+
- [Sphinx](https://www.sphinx-doc.org/en/master/usage/installation.html) >= v6.0
3319
- [Sphinx RTD theme](https://pypi.org/project/sphinx-rtd-theme/) >= 1.2
3420
- [MyST Parser](https://myst-parser.readthedocs.io/en/latest/intro.html) >= 2.0 (see [Sphinx Markdown configuration](https://www.sphinx-doc.org/en/master/usage/markdown.html#markdown))
3521

@@ -43,13 +29,15 @@ Requirements:
4329

4430

4531
### API docs via phpDocumentor
32+
4633
[![pages-build-deployment](https://github.com/chillerlan/php-qrcode/actions/workflows/pages/pages-build-deployment/badge.svg?branch=gh-pages)](https://github.com/chillerlan/php-qrcode/actions/workflows/pages/pages-build-deployment)
4734

4835
The API documentation can be auto generated with [phpDocumentor](https://www.phpdoc.org/).
49-
There is an [online version available](https://chillerlan.github.io/php-qrcode/) via the [gh-pages branch](https://github.com/chillerlan/php-qrcode/tree/gh-pages) that is [automatically deployed](https://github.com/chillerlan/php-qrcode/deployments) on each push to main.
36+
There is an [online version available](https://chillerlan.github.io/php-qrcode/) via the [`gh-pages` branch](https://github.com/chillerlan/php-qrcode/tree/gh-pages) that is [automatically deployed](https://github.com/chillerlan/php-qrcode/deployments) on each push to main.
5037

5138

5239
#### Run phpDocumentor locally
40+
5341
If you'd like to create local docs, please follow these steps:
5442

5543
- [download phpDocumentor](https://github.com/phpDocumentor/phpDocumentor/releases) v3+ as .phar archive
@@ -60,6 +48,40 @@ If you'd like to create local docs, please follow these steps:
6048
- profit!
6149

6250

51+
## Sources
52+
53+
The markdown sources for the [Read the Docs online manual](https://php-qrcode.readthedocs.io) can of course be browsed on GitHub too!
54+
55+
56+
### Usage
57+
- [Overview](./Usage-Overview.md)
58+
- [Installation](./Usage-Installation.md)
59+
- [Quickstart](./Usage-Quickstart.md)
60+
- [Advanced usage](./Usage-Advanced-usage.md)
61+
62+
63+
### Customizing output
64+
- [Module values](./Customizing-Module-Values.md)
65+
- [Custom output interface](./Customizing-Custom-output-interface.md)
66+
- [QROutputAbstract](./Customizing-QROutputAbstract.md)
67+
68+
69+
### Examples
70+
- [Built-in Output Interfaces](./Examples-Built-in.md)
71+
72+
73+
### Public API
74+
- [`QRCode`](./API-QRCode.md)
75+
- [`QROptions`](./API-QROptions.md)
76+
- [`QROutputInterface`](./API-QROutputInterface.md)
77+
- [`QRMatrix`](./API-QRMatrix.md)
78+
79+
80+
### Appendix
81+
- [Glossary](./Appendix-Glossary.md)
82+
- [License](./Appendix-License.rst)
83+
84+
6385
## License
6486

6587
The documentation is licensed under the [Creative Commons Attribution 4.0 International (CC BY 4.0) License](https://creativecommons.org/licenses/by/4.0/).

docs/conf.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
from subprocess import Popen, PIPE
1616

1717
def get_version():
18-
if os.environ.get('READTHEDOCS') == 'True':
18+
if os.environ.get('READTHEDOCS') == True:
1919
return os.environ.get('READTHEDOCS_VERSION')
2020

21+
if os.environ.get('GITHUB_ACTIONS') == True:
22+
return os.environ.get('GITHUB_REF_NAME')
23+
2124
grep = 'git branch | findstr \*' if platform.system() == 'Windows' else 'git branch | grep \*'
2225
pipe = Popen(grep, stdout=PIPE, shell=True, universal_newlines=True)
2326
version = pipe.stdout.read()
@@ -65,7 +68,7 @@ def get_version():
6568
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
6669

6770
# If your documentation needs a minimal Sphinx version, state it here.
68-
needs_sphinx = '5.3.0'
71+
needs_sphinx = '6.0.0'
6972

7073
# Add any Sphinx extension module names here, as strings. They can be
7174
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom

docs/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PHP-QRCode Manual
55
=================
66

7-
Edition for ``chillerlan/php-qrcode`` [|version|]. Updated on |today|.
7+
Edition for `chillerlan/php-qrcode <https://github.com/chillerlan/php-qrcode/>`__ [|version|]. Updated on |today|.
88

99
This work is licensed under the Creative Commons Attribution 4.0 International (CC BY 4.0) License.
1010

0 commit comments

Comments
 (0)