Merged trunk r18541 through r18545 into geps023.

svn: r18546
This commit is contained in:
Tim G L Lyons 2011-12-03 15:06:12 +00:00
commit effaf60b24
2 changed files with 20 additions and 20 deletions

View File

@ -131,15 +131,15 @@ class ArgParser(object):
Possible: Possible:
1/ FAMTREE : Just the family tree (name or database dir) 1/ FAMTREE : Just the family tree (name or database dir)
2/ -O, --open=FAMTREE, Open of a family tree 2/ -O, --open=FAMTREE, Open of a family tree
3/ -i, --import=FILE, Import a family tree of any format understood by an 3/ -i, --import=FILE, Import a family tree of any format understood
importer, optionally provide- f to indicate format by an importer, optionally provide -f to indicate format
4/ -e, --export=FILE, export a family tree in required format, optionally 4/ -e, --export=FILE, export a family tree in required format,
provide -f to indicate format optionally provide -f to indicate format
5/ -f, --format=FORMAT : format after a -i or -e option 5/ -f, --format=FORMAT : format after a -i or -e option
6/ -a, --action: An action (possible: 'report', 'tool') 6/ -a, --action: An action (possible: 'report', 'tool')
7/ -p, --options=OPTIONS_STRING : specify options 7/ -p, --options=OPTIONS_STRING : specify options
8/ -u, --force-unlock: A locked database can be unlocked by giving this 8/ -u, --force-unlock: A locked database can be unlocked by giving
argument when opening it this argument when opening it
If the filename (no flags) is specified, the interactive session is If the filename (no flags) is specified, the interactive session is
launched using data from filename. launched using data from filename.
@ -191,18 +191,18 @@ class ArgParser(object):
Possible: Possible:
1/ Just the family tree (name or database dir) 1/ Just the family tree (name or database dir)
2/ -O, --open: Open of a family tree 2/ -O, --open: Open of a family tree
3/ -i, --import: Import a family tree of any format understood by an importer, 3/ -i, --import: Import a family tree of any format understood by
optionally provide -f to indicate format an importer, optionally provide -f to indicate format
4/ -e, --export: export a family tree in required format, optionally provide 4/ -e, --export: export a family tree in required format, optionally
-f to indicate format provide -f to indicate format
5/ -f, --format=FORMAT : format after a -i or -e option 5/ -f, --format=FORMAT : format after a -i or -e option
6/ -a, --action: An action (possible: 'report', 'tool') 6/ -a, --action: An action (possible: 'report', 'tool')
7/ -p, --options=OPTIONS_STRING : specify options 7/ -p, --options=OPTIONS_STRING : specify options
8/ -u, --force-unlock: A locked database can be unlocked by giving this 8/ -u, --force-unlock: A locked database can be unlocked by giving
argument when opening it this argument when opening it
9/ -s --show : Show config settings 9/ -s --show : Show config settings
10/ -c --config=config.setting:value : Set config.setting and start Gramps 10/ -c --config=config.setting:value : Set config.setting and start
without :value, the actual config.setting is shown Gramps without :value, the actual config.setting is shown
""" """
try: try: