Darren/dpaste
1
0
Fork 0
mirror of https://github.com/DarrenOfficial/dpaste.git synced 2024-11-15 08:02:54 +11:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into i18n

Browse source 
Conflicts:
	dpaste/forms.py
This commit is contained in:
Martin Mahner 2014-10-25 12:14:36 +02:00
commit 40d044e424
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/conf.py
View file

@ -95,7 +95,7 @@ pygments_style = 'sphinx'
# -- Options for HTML output ----------------------------------------------
if not os.environ.get('READTHEDOCS', None) == 'True':
if os.environ.get('READTHEDOCS', None) == 'True':
import sphinx_rtd_theme
html_theme = "sphinx_rtd_theme"
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]

2
docs/settings.rst
View file

@ -16,7 +16,7 @@ behavior without touching the code:
``DPASTE_SLUG_CHOICES``
String. A string of characters which are used to create the random slug.
Default: ``abcdefghijkmnopqrstuvwwxyzABCDEFGHIJKLOMNOPQRSTUVWXYZ1234567890``
Default: ``abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNOPQRSTUVWXYZ1234567890``
``DPASTE_LEXER_DEFAULT``
String. The lexer key that is pre-selected in the dropdown. Note that