Visitar URL original
Merge branch 'QA_5_2' · phpmyadmin/phpmyadmin@f9a622c · GitHub
Skip to content

Commit f9a622c

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: William Desportes <williamdes@wdes.fr>
2 parents bbfa40b + c16304a commit f9a622c

5 files changed

Lines changed: 4 additions & 7 deletions

File tree

‎docs/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BUILDDIR = .
99

1010
# User-friendly check for sphinx-build
1111
ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
12-
$(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 http://sphinx-doc.org/)
12+
$(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/)
1313
endif
1414

1515
# Internal variables.

‎docs/credits.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ Credits, in chronological order
178178
* Maxime Delorme <delorme.maxime\_at\_free.fr>
179179

180180
* :term:`PDF` schema output, thanks also to
181-
Olivier Plathey for the "FPDF" library (see <http://www.fpdf.org/>), Steven
181+
Olivier Plathey for the "FPDF" library (see <https://www.fpdf.org/>), Steven
182182
Wittens for the "UFPDF" library and
183183
Nicola Asuni for the "TCPDF" library (see <https://tcpdf.org/>).
184184

‎docs/make.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ if errorlevel 9009 (
5656
echo.may add the Sphinx directory to PATH.
5757
echo.
5858
echo.If you don't have Sphinx installed, grab it from
59-
echo.http://sphinx-doc.org/
59+
echo.https://www.sphinx-doc.org/
6060
exit /b 1
6161
)
6262

‎src/ResponseRenderer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class ResponseRenderer
5252
protected bool $isSuccess = true;
5353

5454
/**
55-
* @see http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
55+
* @see https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
5656
*
5757
* @var array<int, string>
5858
*/

‎src/Utils/UserAgentParser.php‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99

1010
/**
1111
* Determines browser and version of the user
12-
* Based on a phpBuilder article:
13-
*
14-
* @see http://www.phpbuilder.net/columns/tim20000821.php
1512
*/
1613
class UserAgentParser
1714
{

0 commit comments

Comments
 (0)