Skip to content
Permalink
Browse files

changed versions, fixed docs for macosx

  • Loading branch information
cvogt committed May 4, 2013
1 parent cb54757 commit 2906a8870d14e0e5c3e56bb53d29ac92ca485819
Showing with 7 additions and 8 deletions.
  1. +2 −2 build.sbt
  2. +5 −6 src/sphinx/conf.py
@@ -1,6 +1,6 @@
version in ThisBuild := "1.0.1-SNAPSHOT"
version in ThisBuild := "1.0.1-RC1"

scalaVersion in ThisBuild := "2.10.0"
scalaVersion in ThisBuild := "2.10.1"

//scalaBinaryVersion in ThisBuild := "2.10.0"

@@ -33,16 +33,16 @@

# General information about the project.
project = u'Slick'
copyright = u'2011-2012 Typesafe, Inc.'
copyright = u'2011-2013 Typesafe, Inc.'

# 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.
version = '1.0.0'
version = '1.0.1-RC1'
# The full version, including alpha/beta/rc tags.
release = '1.0.0'
release = '1.0.1-RC1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
@@ -206,7 +206,7 @@
epub_title = u"Slick"
epub_author = u'Slick Team'
epub_publisher = u'Typesafe, Inc.'
epub_copyright = u'2011-2012 Typesafe, Inc.'
epub_copyright = u'2011-2013 Typesafe, Inc.'

# The language of the text. It defaults to the language option
# or en if the language is not set.
@@ -260,10 +260,9 @@
}

rst_epilog = '''
.. include:: %(links)s
.. include:: /links.txt
.. _Slick Examples: https://github.com/slick/slick-examples/tree/%(examples-version)s
.. _Slick TestKit Example: https://github.com/slick/slick-testkit-example/tree/%(examples-version)s
''' % {
'links': os.path.abspath('links.txt'),
'examples-version': slick_examples_version
}

0 comments on commit 2906a88

Please sign in to comment.
You can’t perform that action at this time.