Merge pull request #695 from miroslavfikar/documentation_fix · python-control/python-control@e8db508

Original file line numberDiff line numberDiff line change

@@ -1524,14 +1524,14 @@ def ss2tf(*args, **kwargs):

15241524

The function accepts either 1 or 4 parameters:

15251525
15261526

``ss2tf(sys)``

1527-

Convert a linear system into space system form. Always creates a

1528-

new system, even if sys is already a StateSpace object.

1527+

Convert a linear system from state space into transfer function form. Always creates a

1528+

new system.

15291529
15301530

``ss2tf(A, B, C, D)``

1531-

Create a state space system from the matrices of its state and

1531+

Create a transfer function system from the matrices of its state and

15321532

output equations.

15331533
1534-

For details see: :func:`ss`

1534+

For details see: :func:`tf`

15351535
15361536

Parameters

15371537

----------