Skip to content

Commit

Permalink
Merge pull request #52 from Hyuntae-91/master
Browse files Browse the repository at this point in the history
Change document files to the latest version.
  • Loading branch information
techbless committed Dec 20, 2018
2 parents c75c6bc + 6ee5183 commit 42393fd
Show file tree
Hide file tree
Showing 15 changed files with 2,220 additions and 1,450 deletions.
511 changes: 511 additions & 0 deletions 050-breaking-changes.rst

Large diffs are not rendered by default.

586 changes: 155 additions & 431 deletions assembly.rst

Large diffs are not rendered by default.

29 changes: 15 additions & 14 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,13 @@
# documentation root, use os.path.abspath to make it absolute, like shown here.

def setup(sphinx):
sys.path.insert(0, os.path.abspath('./utils'))
from SolidityLexer import SolidityLexer
thisdir = os.path.dirname(os.path.realpath(__file__))
sys.path.insert(0, thisdir + '/utils')
from pygments_lexer_solidity import SolidityLexer
sphinx.add_lexer('Solidity', SolidityLexer())

sphinx.add_stylesheet('css/custom.css')

# -- General configuration ------------------------------------------------

# If your documentation needs a minimal Sphinx version, state it here.
Expand All @@ -50,23 +53,21 @@ def setup(sphinx):

# General information about the project.
project = 'Solidity'
copyright = '2016-2018, Ethereum, Solidity Korea'
copyright = '2016-2018, Ethereum'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
# with open('../CMakeLists.txt', 'r') as f:
# version = re.search('PROJECT_VERSION "([^"]+)"', f.read()).group(1)
with open('../CMakeLists.txt', 'r') as f:
version = re.search('PROJECT_VERSION "([^"]+)"', f.read()).group(1)
# The full version, including alpha/beta/rc tags.
# if os.path.isfile('../prerelease.txt') != True or os.path.getsize('../prerelease.txt') == 0:
# release = version
# else:
# # This is a prerelease version
# release = version + '-develop'
version = '0.4.20'
release = version
if os.path.isfile('../prerelease.txt') != True or os.path.getsize('../prerelease.txt') == 0:
release = version
else:
# This is a prerelease version
release = version + '-develop'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -113,7 +114,7 @@ def setup(sphinx):

# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
html_theme = 'default'
html_theme = 'sphinx_rtd_theme'

# Theme options are theme-specific and customize the look and feel of a theme
# further. For a list of options available for each theme, see the
Expand Down Expand Up @@ -142,7 +143,7 @@ def setup(sphinx):
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = []
html_static_path = ['_static']

# Add any extra paths that contain custom files (such as robots.txt or
# .htaccess) here, relative to this directory. These files are copied
Expand Down

0 comments on commit 42393fd

Please sign in to comment.