mirrors/xonsh
1
0
Fork 0
mirror of https://github.com/xonsh/xonsh.git synced 2025-03-04 08:24:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into patch-2

Browse source
This commit is contained in:
Anthony Scopatz 2019-08-07 10:39:00 -04:00 • committed by GitHub
commit 92487fe1eb
Failed to generate hash of commit
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xonsh/environ.py
View file

@ -904,7 +904,7 @@ def DEFAULT_DOCS():
"for confirmation."
),
"COMPLETION_IN_THREAD": VarDocs(
"When generating the completions takes a lot of time, "
"When generating the completions takes time, "
"it’s better to do this in a background thread. "
"When this is True, background threads is used for completion."
),
@ -1355,8 +1355,8 @@ def DEFAULT_DOCS():
"Logging to a file is not enabled by default."
),
"XONSH_DATETIME_FORMAT": VarDocs(
"The format that is used for ``datetime.strptime()`` in various places"
"i.e the history timestamp option"
"The format that is used for ``datetime.strptime()`` in various places, "
"i.e the history timestamp option."
),
}