diff options
| author | shimizukawa <shimizukawa@gmail.com> | 2016-02-29 23:19:13 +0900 |
|---|---|---|
| committer | shimizukawa <shimizukawa@gmail.com> | 2016-02-29 23:19:13 +0900 |
| commit | 283bf42ea7a6c637f38073b83f4cdeab5a629820 (patch) | |
| tree | 61cb705837ef51b087534b9236d9bdde1178b192 /sphinx/quickstart.py | |
| parent | 5eee89024159cf66a0eaa095dd92429ee0e26cd9 (diff) | |
| parent | 8ab5cdca2bf4b2c0e9ba5c129e9eeca522ef21d4 (diff) | |
| download | sphinx-git-283bf42ea7a6c637f38073b83f4cdeab5a629820.tar.gz | |
Merge with 'stable'
Conflicts:
CHANGES
sphinx/__init__.py
sphinx/io.py
Diffstat (limited to 'sphinx/quickstart.py')
| -rw-r--r-- | sphinx/quickstart.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/quickstart.py b/sphinx/quickstart.py index e3f226e19..e9564b0dd 100644 --- a/sphinx/quickstart.py +++ b/sphinx/quickstart.py @@ -203,8 +203,8 @@ html_theme = 'alabaster' # of the sidebar. #html_logo = None -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 +# The name of an image file (relative to this directory) to use as a favicon of +# the docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 # pixels large. #html_favicon = None |