Skip to content

Commit bddd049

Browse files
authored
Merge branch '3.9' into backport-2bd9f9b-3.9
2 parents 4ac4704 + fe6c43e commit bddd049

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.github/workflows/doc.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@ jobs:
3636
- name: 'Build documentation'
3737
run: xvfb-run make -C Doc/ PYTHON=../python SPHINXOPTS="-q -W -j4" doctest suspicious html
3838
- name: 'Upload'
39-
uses: actions/upload-artifact@v3
39+
uses: actions/upload-artifact@v4
4040
with:
4141
name: doc-html
4242
path: Doc/build/html
43+
include-hidden-files: true
44+
overwrite: true

.readthedocs.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# clicking on the docs preview link on a PR will result in a 404.
44
version: 2
55
formats: []
6+
sphinx:
7+
configuration: Doc/conf.py
68
build:
79
os: "ubuntu-22.04"
810
tools:

Doc/tutorial/classes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ Now what can we do with instance objects? The only operations understood by
325325
instance objects are attribute references. There are two kinds of valid
326326
attribute names: data attributes and methods.
327327

328-
*data attributes* correspond to "instance variables" in Smalltalk, and to "data
328+
*Data attributes* correspond to "instance variables" in Smalltalk, and to "data
329329
members" in C++. Data attributes need not be declared; like local variables,
330330
they spring into existence when they are first assigned to. For example, if
331331
``x`` is the instance of :class:`MyClass` created above, the following piece of

0 commit comments

Comments
 (0)