Fix #107265: Compositor: output node remove note that z-depth can be saved #104457
8
Makefile
8
Makefile
@ -23,9 +23,10 @@ Checking
|
||||
- check_syntax to check the syntax of all .rst files.
|
||||
- check_spelling to check spelling for text in RST files.
|
||||
|
||||
Python Scripts
|
||||
--------------
|
||||
Utilities
|
||||
---------
|
||||
|
||||
- update to update the repository to the most recent version.
|
||||
- format_py to auto-format Python scripts.
|
||||
|
||||
endef
|
||||
@ -123,6 +124,9 @@ report_po_progress:
|
||||
@python3 tools_report/report_translation_progress.py --quiet \
|
||||
`find locale/ -maxdepth 1 -mindepth 1 -type d -not -iwholename '*.git*' -printf 'locale/%f\n' | sort`
|
||||
|
||||
update:
|
||||
@git pull --rebase
|
||||
|
||||
format_py:
|
||||
@autopep8 --in-place --recursive .
|
||||
|
||||
|
9
make.bat
9
make.bat
@ -63,6 +63,11 @@ if "%1" == "help" (
|
||||
echo - check_structure to check the structure of all .rst files
|
||||
echo - check_syntax to check the syntax of all .rst files
|
||||
echo - check_spelling to check spelling for text in RST files
|
||||
echo.
|
||||
echo Utilities
|
||||
echo ---------
|
||||
echo.
|
||||
echo - update to update the repository to the most recent version.
|
||||
goto EOF
|
||||
)
|
||||
|
||||
@ -109,6 +114,10 @@ if "%1" == "check_structure" (
|
||||
python tools_rst\rst_check_images.py
|
||||
goto EOF
|
||||
|
||||
if "%1" == "update" (
|
||||
git pull --rebase
|
||||
goto EOF
|
||||
|
||||
) else (
|
||||
%SPHINXBUILD% -M %1 "%SOURCEDIR%" "%BUILDDIR%" %SPHINXOPTS% %O%
|
||||
goto EOF
|
||||
|
@ -18,7 +18,7 @@ Update
|
||||
|
||||
Firstly, make sure that your local copy of the manual is up to date with the online repository using::
|
||||
|
||||
git pull --rebase
|
||||
make update
|
||||
|
||||
|
||||
Writing
|
||||
|
@ -20,7 +20,7 @@ If you leave out ``-m "message"``, you will be prompted to type the message in a
|
||||
You should make sure you are always on the latest revision before committing.
|
||||
You may not be able to commit directly if there are conflicting changes in the latest revision.
|
||||
|
||||
To avoid this run ``git pull --rebase`` before committing.
|
||||
To avoid this update your local repository before committing (run ``make update``).
|
||||
|
||||
.. seealso::
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user