Skip to content

Commit ee975e3

Browse files
committed
Remove sphinx-substitution-extensions requirement as no more supported
1 parent ddc2ba3 commit ee975e3

File tree

5 files changed

+2
-19
lines changed

5 files changed

+2
-19
lines changed

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,5 @@ sphinx
22
docutils
33
sphinx-rtd-theme
44
sphinx-prompt
5-
sphinx-substitution-extensions
65
git+https://github.com/brownsarahm/sphinxcontrib-mermaid@cdnupdate
76
sphinxcontrib-youtube

source/conf.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,15 @@
2424
# built documents.
2525
#
2626
# The short X.Y version.
27-
version = u'1.10'
27+
version = u'1.11'
2828
# The full version, including alpha/beta/rc tags.
29-
release = u'1.10'
29+
release = u'1.11'
3030

3131
project = 'GLPI Agent'
3232
thisyear = datetime.datetime.now().year
3333
copyright = u'2016-%s, GLPI Project, Teclib\'' % thisyear
3434
author = u'GLPI Project, Teclib\''
3535

36-
rst_prolog = """
37-
.. |version| replace:: %s
38-
""" % version
39-
4036
# -- General configuration ---------------------------------------------------
4137

4238
# Add any Sphinx extension module names here, as strings. They can be
@@ -45,7 +41,6 @@
4541
extensions = [
4642
'sphinx_rtd_theme',
4743
'sphinx-prompt',
48-
'sphinx_substitution_extensions',
4944
'sphinx.ext.todo',
5045
'sphinx.ext.ifconfig',
5146
'sphinxcontrib.mermaid',

source/installation/index.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ The `Snapcraft`_ **Snap** package integrates its native, although reduced but re
203203
If your system support **Snap**, you can simply install the agent with the ``snap`` command after getting the **Snap** package from `our releases page <https://github.com/glpi-project/glpi-agent/releases>`_ or the `nightly build page <https://nightly.glpi-project.org/glpi-agent>`_. Then, you just have to run:
204204

205205
.. prompt:: bash
206-
:substitutions:
207206

208207
snap install --classic --dangerous GLPI-Agent-|version|_amd64.snap
209208
@@ -249,14 +248,12 @@ On supported distros (**DEB** & **RPM** based), the installer will also eventual
249248
The installer is a simple perl script. It supports various options to configure the agent during installation. If no options are specified, the default is for the installer to configure glpi-agent to not scan user home directories or profiles, to run inventory modules with a 30 minute timeout, to allow HTTP requests to port 62354 only from the GLPI server, to setup the glpi-agent as a service and to install only the Computer Inventory and Remote Inventory tasks. You can check all supported options by running:
250249

251250
.. prompt:: bash
252-
:substitutions:
253251

254252
perl glpi-agent-|version|-linux-installer.pl --help
255253

256254
or if you use the installer embedding **snap** package:
257255

258256
.. prompt:: bash
259-
:substitutions:
260257

261258
perl glpi-agent-|version|-with-snap-linux-installer.pl --help
262259

@@ -284,7 +281,6 @@ From sources
284281
First, you need to extract the source and change the current directory.
285282

286283
.. prompt:: bash
287-
:substitutions:
288284

289285
tar xfz GLPI-Agent-|version|.tar.gz
290286
cd GLPI-Agent-|version|
@@ -349,7 +345,6 @@ Offline installations
349345
First grab the tarball from the website and extract it:
350346

351347
.. prompt:: bash
352-
:substitutions:
353348

354349
tar xzf GLPI-Agent-|version|.tar.gz
355350
cd GLPI-Agent-|version|

source/installation/linux-appimage.rst

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ It has the advantage to work on any linux supporting AppImage format (most linux
77
To install the agent, just run:
88

99
.. prompt:: bash
10-
:substitutions:
1110

1211
chmod +x glpi-agent-|version|-x86_64.AppImage
1312
sudo ./glpi-agent-|version|-x86_64.AppImage --install --server <URL>
@@ -31,7 +30,6 @@ you still can try a :ref:`manual install <manual-install>`.
3130
To upgrade the agent if you still installed glpi-agent linux appimage, just run:
3231

3332
.. prompt:: bash
34-
:substitutions:
3533

3634
chmod +x glpi-agent-|version|-x86_64.AppImage
3735
sudo ./glpi-agent-|version|-x86_64.AppImage --upgrade
@@ -58,7 +56,6 @@ Installer parameters
5856
You can retrieve all available parameters running:
5957

6058
.. prompt:: bash
61-
:substitutions:
6259

6360
./glpi-agent-|version|-x86_64.AppImage --help
6461

@@ -285,7 +282,6 @@ you still can install GLPI Agent manually by following these steps:
285282
* Extract AppImage content:
286283

287284
.. prompt:: bash
288-
:substitutions:
289285

290286
./glpi-agent-|version|-x86_64.AppImage --appimage-extract
291287

source/installation/windows-command-line.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ Windows installer
44
By default, the installer will bring you to the graphical user interface unless you use the `/i /quiet` options, calling it from command line.
55

66
.. prompt:: batch
7-
:substitutions:
87

98
GLPI-Agent-|version|-x64.msi /quiet SERVER=<URL>
109

1110
or:
1211

1312
.. prompt:: batch
14-
:substitutions:
1513

1614
msiexec /i GLPI-Agent-|version|-x64.msi /quiet SERVER=<URL>
1715

0 commit comments

Comments
 (0)