Skip to content

Commit 382a297

Browse files
authored
Merge pull request #674 from bnavigator/fix-doc-escape
Fix doc escape
2 parents 20088d1 + 951606a commit 382a297

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

control/bdalg.py

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,9 @@
6262

6363

6464
def series(sys1, *sysn):
65-
"""Return the series connection (sysn \\* ... \\*) sys2 \\* sys1
65+
r"""series(sys1, sys2, [..., sysn])
66+
67+
Return the series connection (`sysn` \* ...\ \*) `sys2` \* `sys1`.
6668
6769
Parameters
6870
----------
@@ -107,8 +109,9 @@ def series(sys1, *sysn):
107109

108110

109111
def parallel(sys1, *sysn):
110-
"""
111-
Return the parallel connection sys1 + sys2 (+ ... + sysn)
112+
r"""parallel(sys1, sys2, [..., sysn])
113+
114+
Return the parallel connection `sys1` + `sys2` (+ ...\ + `sysn`).
112115
113116
Parameters
114117
----------
@@ -252,9 +255,9 @@ def feedback(sys1, sys2=1, sign=-1):
252255
return sys1.feedback(sys2, sign)
253256

254257
def append(*sys):
255-
"""append(sys1, sys2, ..., sysn)
258+
"""append(sys1, sys2, [..., sysn])
256259
257-
Group models by appending their inputs and outputs
260+
Group models by appending their inputs and outputs.
258261
259262
Forms an augmented system model, and appends the inputs and
260263
outputs together. The system type will be the type of the first

doc/control.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,16 +71,6 @@ Time domain simulation
7171
step_response
7272
phase_plot
7373

74-
Block diagram algebra
75-
=====================
76-
.. autosummary::
77-
:toctree: generated/
78-
79-
series
80-
parallel
81-
feedback
82-
negate
83-
8474
Control system analysis
8575
=======================
8676
.. autosummary::

0 commit comments

Comments
 (0)