Merge branch 'docstring-polishing' into 'development'
increasing consistency See merge request damask/DAMASK!616
This commit is contained in:
commit
31fe894c78
|
@ -120,7 +120,7 @@ class Config(dict):
|
|||
"""
|
||||
Return self|=other.
|
||||
|
||||
Update configuration with contents of other.
|
||||
Update configuration with contents of other (in-place).
|
||||
|
||||
"""
|
||||
return self.__or__(other)
|
||||
|
|
|
@ -246,11 +246,13 @@ class Orientation(Rotation,Crystal):
|
|||
def __mul__(self: MyType,
|
||||
other: Union[Rotation, 'Orientation']) -> MyType:
|
||||
"""
|
||||
Compose this orientation with other.
|
||||
Return self*other.
|
||||
|
||||
Compose with other.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
other : Rotation or Orientation
|
||||
other : Rotation or Orientation, shape (self.shape)
|
||||
Object for composition.
|
||||
|
||||
Returns
|
||||
|
|
Loading…
Reference in New Issue