Skip to content

Commit 530fe36

Browse files
committed
Fix small typos in doc/conventions.rst
1 parent 565442f commit 530fe36

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

doc/conventions.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ LTI system representation
1616

1717
Linear time invariant (LTI) systems are represented in python-control in
1818
state space, transfer function, or frequency response data (FRD) form. Most
19-
functions in the toolbox will operate on any of these data types and
20-
functions for converting between compatible types is provided.
19+
functions in the toolbox will operate on any of these data types, and
20+
functions for converting between compatible types are provided.
2121

2222
State space systems
2323
-------------------
@@ -152,7 +152,7 @@ in the next section).
152152

153153
The :func:`forced_response` system is the most general and allows by
154154
the zero initial state response to be simulated as well as the
155-
response from a non-zero intial condition.
155+
response from a non-zero initial condition.
156156

157157
In addition the :func:`input_output_response` function, which handles
158158
simulation of nonlinear systems and interconnected systems, can be

0 commit comments

Comments
 (0)