diff options
| author | DasIch <dasdasich@gmail.com> | 2010-08-10 12:27:51 +0200 |
|---|---|---|
| committer | DasIch <dasdasich@gmail.com> | 2010-08-10 12:27:51 +0200 |
| commit | e450538b01c507344ab132c48dfd5da9abda7359 (patch) | |
| tree | e8cd401413d6800703531028742fad18fcde83fe /tests/root | |
| parent | 5b3789fc4506d4bb05365ef8195cd1bbf2f1cae3 (diff) | |
| parent | 5cbf0496bebbb9d0e941d8611d659a75ecf3ef66 (diff) | |
| download | sphinx-e450538b01c507344ab132c48dfd5da9abda7359.tar.gz | |
Automated merge with ssh://bitbucket.org/birkenfeld/sphinx
Diffstat (limited to 'tests/root')
| -rw-r--r-- | tests/root/objects.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/root/objects.txt b/tests/root/objects.txt index 334827de..e62f6d96 100644 --- a/tests/root/objects.txt +++ b/tests/root/objects.txt @@ -41,6 +41,10 @@ Testing object descriptions .. function:: func_without_module2() -> annotation +.. object:: long(parameter, \ + list) + another one + .. class:: TimeInt :param moo: |test| @@ -62,6 +66,8 @@ Testing object descriptions :ivar int hour: like *hour* :ivar minute: like *minute* :vartype minute: int + :param hour: Duplicate param. Should not lead to crashes. + :type hour: Duplicate type. C items |