Switched to using sbt-site to publish changes.

scala-ide · Oct 29, 2012 · ac8fa2a · ac8fa2a
1 parent 122a64e
commit ac8fa2a
Show file tree

Hide file tree

Showing 202 changed files with 25 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -0,0 +1,7 @@
+site.settings
+
+ghpages.settings
+
+site.sphinxSupport()
+
+git.remoteRepo := "git@github.com:scala-ide/docs.git"
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -0,0 +1,9 @@
+resolvers += Resolver.url("sbt-plugin-releases", new URL("http://scalasbt.artifactoryonline.com/scalasbt/sbt-plugin-releases/"))(Resolver.ivyStylePatterns)
+
+resolvers += "sonatype-releases" at "https://oss.sonatype.org/service/local/repositories/releases/content/"
+
+resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven"
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.6.0")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.0")
diff --git a/Makefile → src/sphinx/Makefile b/Makefile → src/sphinx/Makefile
diff --git a/TODO.rst → src/sphinx/TODO.rst b/TODO.rst → src/sphinx/TODO.rst
diff --git a/_static/favicon.ico → src/sphinx/_static/favicon.ico b/_static/favicon.ico → src/sphinx/_static/favicon.ico
diff --git a/changelog.rst → src/sphinx/changelog.rst b/changelog.rst → src/sphinx/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 ------------------------------
 
 M2 (released: 2012-09-13)
-...............
+.........................
 
 * Add semantic highlighting for object members in type params - `#1001209`_
 * Added semantic highlighting in context bounds, tuple/function literals, structural types, path-dependent types, `etc`_

diff --git a/conf.py → src/sphinx/conf.py b/conf.py → src/sphinx/conf.py
diff --git a/contribute.rst.inc → src/sphinx/contribute.rst.inc b/contribute.rst.inc → src/sphinx/contribute.rst.inc
diff --git a/dev/appendix/appendix.rst → src/sphinx/dev/appendix/appendix.rst b/dev/appendix/appendix.rst → src/sphinx/dev/appendix/appendix.rst
diff --git a/dev/appendix/git-github.rst → src/sphinx/dev/appendix/git-github.rst b/dev/appendix/git-github.rst → src/sphinx/dev/appendix/git-github.rst
diff --git a/dev/appendix/resources.rst → src/sphinx/dev/appendix/resources.rst b/dev/appendix/resources.rst → src/sphinx/dev/appendix/resources.rst
diff --git a/...endix/scala-compiler-dev-with-eclipse.rst → ...endix/scala-compiler-dev-with-eclipse.rst b/...endix/scala-compiler-dev-with-eclipse.rst → ...endix/scala-compiler-dev-with-eclipse.rst
diff --git a/dev/appendix/what-to-work-on.rst → src/sphinx/dev/appendix/what-to-work-on.rst b/dev/appendix/what-to-work-on.rst → src/sphinx/dev/appendix/what-to-work-on.rst
diff --git a/dev/architecture/architecture.rst → src/sphinx/dev/architecture/architecture.rst b/dev/architecture/architecture.rst → src/sphinx/dev/architecture/architecture.rst
diff --git a/dev/building/building.rst → src/sphinx/dev/building/building.rst b/dev/building/building.rst → src/sphinx/dev/building/building.rst
diff --git a/dev/code/code.rst → src/sphinx/dev/code/code.rst b/dev/code/code.rst → src/sphinx/dev/code/code.rst
diff --git a/dev/index.rst → src/sphinx/dev/index.rst b/dev/index.rst → src/sphinx/dev/index.rst
diff --git a/...-organization/repository-organization.rst → ...-organization/repository-organization.rst b/...-organization/repository-organization.rst → ...-organization/repository-organization.rst
diff --git a/dev/roadmap.rst → src/sphinx/dev/roadmap.rst b/dev/roadmap.rst → src/sphinx/dev/roadmap.rst
@@ -67,16 +67,17 @@ __ http://scala-ide.org/docs/helium/features/source-generators/index.html
 __ http://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1001018
 __ http://scala-ide.org/download/ecosystem.html
 
+**Milestone 3** - December 2012
+
+* Hardening the Scala debugger |progress|
+
 **Helium release**
 
 * Eclipse Juno (4.2) support - *Eric Molitor* - `#1000988`__ |progress|
-* Full support for Find References - *Typesafe team* - `#1000868`__
-* Improve dependency tracking - *Typesafe team* - `#1000869`__
+* Performance improvements in the editor (`#1001156`__)
 
 __ http://www.assembla.com/spaces/scala-ide/tickets/1000988
-__ http://www.assembla.com/spaces/scala-ide/tickets/1000868
-__ http://www.assembla.com/spaces/scala-ide/tickets/1000869
-
+__ https://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1001156
 
 **Not aligned**
 
@@ -95,6 +96,7 @@ __ https://github.com/kaptoxic/scala-ide-insynth-integration/
 Lithium (next major release)
 -------------------------------
 
+* Full support for Find References - *Typesafe team* - `#1000868`__
 * Create an abstraction layer with the Scala compiler - *Typesafe team* - `#1000861`__, `#1000862`__
 * Use the Scala model for the Outline view - *Typesafe team* - `#1000863`__
 * Create a real Scala Editor (with all completion, indentation, formatting, ... support) - *Typesafe team* - `#1000860`__
@@ -103,6 +105,7 @@ Lithium (next major release)
 * Add support Call Hierarchy - *Typesafe team* - `#1000872`__
 * Finalize the API in Scala IDE - *Typesafe team* - `#1000873`__
 
+__ http://www.assembla.com/spaces/scala-ide/tickets/1000868
 __ http://www.assembla.com/spaces/scala-ide/tickets/1000861
 __ http://www.assembla.com/spaces/scala-ide/tickets/1000862
 __ http://www.assembla.com/spaces/scala-ide/tickets/1000863

diff --git a/dev/setup/images/order-export.png → src/sphinx/dev/setup/images/order-export.png b/dev/setup/images/order-export.png → src/sphinx/dev/setup/images/order-export.png
diff --git a/dev/setup/images/sbt-full-jars.png → ...sphinx/dev/setup/images/sbt-full-jars.png b/dev/setup/images/sbt-full-jars.png → ...sphinx/dev/setup/images/sbt-full-jars.png
diff --git a/dev/setup/setup.rst → src/sphinx/dev/setup/setup.rst b/dev/setup/setup.rst → src/sphinx/dev/setup/setup.rst
diff --git a/dev/testing/eclipse-tests.rst → src/sphinx/dev/testing/eclipse-tests.rst b/dev/testing/eclipse-tests.rst → src/sphinx/dev/testing/eclipse-tests.rst
diff --git a/dev/testing/presentation-compiler-tests.rst → ...v/testing/presentation-compiler-tests.rst b/dev/testing/presentation-compiler-tests.rst → ...v/testing/presentation-compiler-tests.rst
diff --git a/dev/testing/testing.rst → src/sphinx/dev/testing/testing.rst b/dev/testing/testing.rst → src/sphinx/dev/testing/testing.rst
diff --git a/dev/workflow/workflow.rst → src/sphinx/dev/workflow/workflow.rst b/dev/workflow/workflow.rst → src/sphinx/dev/workflow/workflow.rst
diff --git a/...es/implicit-highlighting/images/hover.png → ...es/implicit-highlighting/images/hover.png b/...es/implicit-highlighting/images/hover.png → ...es/implicit-highlighting/images/hover.png
diff --git a/...t-highlighting/images/implicit-format.png → ...t-highlighting/images/implicit-format.png b/...t-highlighting/images/implicit-format.png → ...t-highlighting/images/implicit-format.png
diff --git a/...es/implicit-highlighting/images/prefs.png → ...es/implicit-highlighting/images/prefs.png b/...es/implicit-highlighting/images/prefs.png → ...es/implicit-highlighting/images/prefs.png
diff --git a/...mplicit-highlighting/images/quick-fix.png → ...mplicit-highlighting/images/quick-fix.png b/...mplicit-highlighting/images/quick-fix.png → ...mplicit-highlighting/images/quick-fix.png
diff --git a/.../features/implicit-highlighting/index.rst → .../features/implicit-highlighting/index.rst b/.../features/implicit-highlighting/index.rst → .../features/implicit-highlighting/index.rst
diff --git a/...yperlinking/images/implicit-hyperlink.png → ...yperlinking/images/implicit-hyperlink.png b/...yperlinking/images/implicit-hyperlink.png → ...yperlinking/images/implicit-hyperlink.png
diff --git a/.../features/implicit-hyperlinking/index.rst → .../features/implicit-hyperlinking/index.rst b/.../features/implicit-hyperlinking/index.rst → .../features/implicit-hyperlinking/index.rst
diff --git a/helium/features/logging.rst → src/sphinx/helium/features/logging.rst b/helium/features/logging.rst → src/sphinx/helium/features/logging.rst
diff --git a/...efactoring/images/change-order-before.png → ...efactoring/images/change-order-before.png b/...efactoring/images/change-order-before.png → ...efactoring/images/change-order-before.png
diff --git a/...efactoring/images/change-order-dialog.png → ...efactoring/images/change-order-dialog.png b/...efactoring/images/change-order-dialog.png → ...efactoring/images/change-order-dialog.png
diff --git a/...factoring/images/change-order-preview.png → ...factoring/images/change-order-preview.png b/...factoring/images/change-order-preview.png → ...factoring/images/change-order-preview.png
diff --git a/...factoring/images/extract-trait-before.png → ...factoring/images/extract-trait-before.png b/...factoring/images/extract-trait-before.png → ...factoring/images/extract-trait-before.png
diff --git a/...factoring/images/extract-trait-dialog.png → ...factoring/images/extract-trait-dialog.png b/...factoring/images/extract-trait-dialog.png → ...factoring/images/extract-trait-dialog.png
diff --git a/...toring/images/extract-trait-extracted.png → ...toring/images/extract-trait-extracted.png b/...toring/images/extract-trait-extracted.png → ...toring/images/extract-trait-extracted.png
diff --git a/...actoring/images/extract-trait-preview.png → ...actoring/images/extract-trait-preview.png b/...actoring/images/extract-trait-preview.png → ...actoring/images/extract-trait-preview.png
diff --git a/...s/new-refactoring/images/merge-dialog.png → ...s/new-refactoring/images/merge-dialog.png b/...s/new-refactoring/images/merge-dialog.png → ...s/new-refactoring/images/merge-dialog.png
diff --git a/...refactoring/images/merge-not-possible.png → ...refactoring/images/merge-not-possible.png b/...refactoring/images/merge-not-possible.png → ...refactoring/images/merge-not-possible.png
diff --git a/.../new-refactoring/images/merge-preview.png → .../new-refactoring/images/merge-preview.png b/.../new-refactoring/images/merge-preview.png → .../new-refactoring/images/merge-preview.png
diff --git a/...oring/images/move-class-configuration.png → ...oring/images/move-class-configuration.png b/...oring/images/move-class-configuration.png → ...oring/images/move-class-configuration.png
diff --git a/...refactoring/images/move-class-preview.png → ...refactoring/images/move-class-preview.png b/...refactoring/images/move-class-preview.png → ...refactoring/images/move-class-preview.png
diff --git a/...toring/images/move-constructor-before.png → ...toring/images/move-constructor-before.png b/...toring/images/move-constructor-before.png → ...toring/images/move-constructor-before.png
diff --git a/...oring/images/move-constructor-preview.png → ...oring/images/move-constructor-preview.png b/...oring/images/move-constructor-preview.png → ...oring/images/move-constructor-preview.png
diff --git a/...s/new-refactoring/images/split-before.png → ...s/new-refactoring/images/split-before.png b/...s/new-refactoring/images/split-before.png → ...s/new-refactoring/images/split-before.png
diff --git a/...s/new-refactoring/images/split-dialog.png → ...s/new-refactoring/images/split-dialog.png b/...s/new-refactoring/images/split-dialog.png → ...s/new-refactoring/images/split-dialog.png
diff --git a/.../new-refactoring/images/split-preview.png → .../new-refactoring/images/split-preview.png b/.../new-refactoring/images/split-preview.png → .../new-refactoring/images/split-preview.png
diff --git a/helium/features/new-refactoring/index.rst → ...helium/features/new-refactoring/index.rst b/helium/features/new-refactoring/index.rst → ...helium/features/new-refactoring/index.rst
diff --git a/...es/scaladebugger/images/detailpane-01.png → ...es/scaladebugger/images/detailpane-01.png b/...es/scaladebugger/images/detailpane-01.png → ...es/scaladebugger/images/detailpane-01.png
diff --git a/...ladebugger/images/logicalstructure-01.png → ...ladebugger/images/logicalstructure-01.png b/...ladebugger/images/logicalstructure-01.png → ...ladebugger/images/logicalstructure-01.png
diff --git a/...ladebugger/images/logicalstructure-02.png → ...ladebugger/images/logicalstructure-02.png b/...ladebugger/images/logicalstructure-02.png → ...ladebugger/images/logicalstructure-02.png
diff --git a/...s/scaladebugger/images/preferences-01.png → ...s/scaladebugger/images/preferences-01.png b/...s/scaladebugger/images/preferences-01.png → ...s/scaladebugger/images/preferences-01.png
diff --git a/...s/scaladebugger/images/preferences-02.png → ...s/scaladebugger/images/preferences-02.png b/...s/scaladebugger/images/preferences-02.png → ...s/scaladebugger/images/preferences-02.png
diff --git a/.../scaladebugger/images/scaladisplay-01.png → .../scaladebugger/images/scaladisplay-01.png b/.../scaladebugger/images/scaladisplay-01.png → .../scaladebugger/images/scaladisplay-01.png
diff --git a/...scaladebugger/images/smartstepping-01.png → ...scaladebugger/images/smartstepping-01.png b/...scaladebugger/images/smartstepping-01.png → ...scaladebugger/images/smartstepping-01.png
diff --git a/...scaladebugger/images/smartstepping-02.png → ...scaladebugger/images/smartstepping-02.png b/...scaladebugger/images/smartstepping-02.png → ...scaladebugger/images/smartstepping-02.png
diff --git a/...scaladebugger/images/smartstepping-03.png → ...scaladebugger/images/smartstepping-03.png b/...scaladebugger/images/smartstepping-03.png → ...scaladebugger/images/smartstepping-03.png
diff --git a/...scaladebugger/images/smartstepping-04.png → ...scaladebugger/images/smartstepping-04.png b/...scaladebugger/images/smartstepping-04.png → ...scaladebugger/images/smartstepping-04.png
diff --git a/...ladebugger/images/unboxedprimitive-01.png → ...ladebugger/images/unboxedprimitive-01.png b/...ladebugger/images/unboxedprimitive-01.png → ...ladebugger/images/unboxedprimitive-01.png
diff --git a/helium/features/scaladebugger/index.rst → ...x/helium/features/scaladebugger/index.rst b/helium/features/scaladebugger/index.rst → ...x/helium/features/scaladebugger/index.rst
diff --git a/.../semantic-highlighting/images/example.png → .../semantic-highlighting/images/example.png b/.../semantic-highlighting/images/example.png → .../semantic-highlighting/images/example.png
diff --git a/...es/semantic-highlighting/images/prefs.png → ...es/semantic-highlighting/images/prefs.png b/...es/semantic-highlighting/images/prefs.png → ...es/semantic-highlighting/images/prefs.png
diff --git a/.../features/semantic-highlighting/index.rst → .../features/semantic-highlighting/index.rst b/.../features/semantic-highlighting/index.rst → .../features/semantic-highlighting/index.rst
diff --git a/helium/features/show-type.rst → src/sphinx/helium/features/show-type.rst b/helium/features/show-type.rst → src/sphinx/helium/features/show-type.rst
diff --git a/...rce-generators/images/generate-before.png → ...rce-generators/images/generate-before.png b/...rce-generators/images/generate-before.png → ...rce-generators/images/generate-before.png
diff --git a/...ators/images/generate-existing-dialog.png → ...ators/images/generate-existing-dialog.png b/...ators/images/generate-existing-dialog.png → ...ators/images/generate-existing-dialog.png
diff --git a/...tors/images/hashcode-and-equals-after.png → ...tors/images/hashcode-and-equals-after.png b/...tors/images/hashcode-and-equals-after.png → ...tors/images/hashcode-and-equals-after.png
diff --git a/...ors/images/hashcode-and-equals-dialog.png → ...ors/images/hashcode-and-equals-dialog.png b/...ors/images/hashcode-and-equals-dialog.png → ...ors/images/hashcode-and-equals-dialog.png
diff --git a/...urce-generators/images/productN-after.png → ...urce-generators/images/productN-after.png b/...urce-generators/images/productN-after.png → ...urce-generators/images/productN-after.png
diff --git a/...rce-generators/images/productN-dialog.png → ...rce-generators/images/productN-dialog.png b/...rce-generators/images/productN-dialog.png → ...rce-generators/images/productN-dialog.png
diff --git a/helium/features/source-generators/index.rst → ...lium/features/source-generators/index.rst b/helium/features/source-generators/index.rst → ...lium/features/source-generators/index.rst
diff --git a/helium/images/logging-preferences.png → ...inx/helium/images/logging-preferences.png b/helium/images/logging-preferences.png → ...inx/helium/images/logging-preferences.png
diff --git a/helium/images/show-type-window.png → ...sphinx/helium/images/show-type-window.png b/helium/images/show-type-window.png → ...sphinx/helium/images/show-type-window.png
diff --git a/helium/images/show-type.png → src/sphinx/helium/images/show-type.png b/helium/images/show-type.png → src/sphinx/helium/images/show-type.png
diff --git a/helium/index.rst → src/sphinx/helium/index.rst b/helium/index.rst → src/sphinx/helium/index.rst
diff --git a/index.rst → src/sphinx/index.rst b/index.rst → src/sphinx/index.rst
diff --git a/license.rst → src/sphinx/license.rst b/license.rst → src/sphinx/license.rst
diff --git a/make.bat → src/sphinx/make.bat b/make.bat → src/sphinx/make.bat
diff --git a/...rces/screenshots/ScalaIDE-2.0.0-large.png → ...rces/screenshots/ScalaIDE-2.0.0-large.png b/...rces/screenshots/ScalaIDE-2.0.0-large.png → ...rces/screenshots/ScalaIDE-2.0.0-large.png
diff --git a/...rces/screenshots/ScalaIDE-2.0.0-small.png → ...rces/screenshots/ScalaIDE-2.0.0-small.png b/...rces/screenshots/ScalaIDE-2.0.0-small.png → ...rces/screenshots/ScalaIDE-2.0.0-small.png
diff --git a/sources/README.rst → src/sphinx/sources/README.rst b/sources/README.rst → src/sphinx/sources/README.rst
diff --git a/sources/testing-frameworks/.classpath → ...inx/sources/testing-frameworks/.classpath b/sources/testing-frameworks/.classpath → ...inx/sources/testing-frameworks/.classpath
diff --git a/sources/testing-frameworks/.project → ...phinx/sources/testing-frameworks/.project b/sources/testing-frameworks/.project → ...phinx/sources/testing-frameworks/.project
diff --git a/sources/testing-frameworks/build.sbt → ...hinx/sources/testing-frameworks/build.sbt b/sources/testing-frameworks/build.sbt → ...hinx/sources/testing-frameworks/build.sbt
diff --git a/sources/testing-frameworks/project/build.sbt → ...rces/testing-frameworks/project/build.sbt b/sources/testing-frameworks/project/build.sbt → ...rces/testing-frameworks/project/build.sbt
diff --git a/...rks/src/test/scala/junit/SimpleTest.scala → ...rks/src/test/scala/junit/SimpleTest.scala b/...rks/src/test/scala/junit/SimpleTest.scala → ...rks/src/test/scala/junit/SimpleTest.scala
diff --git a/...c/test/scala/scalatest/ExampleSuite.scala → ...c/test/scala/scalatest/ExampleSuite.scala b/...c/test/scala/scalatest/ExampleSuite.scala → ...c/test/scala/scalatest/ExampleSuite.scala
diff --git a/...rc/test/scala/specs2/HelloWorldSpec.scala → ...rc/test/scala/specs2/HelloWorldSpec.scala b/...rc/test/scala/specs2/HelloWorldSpec.scala → ...rc/test/scala/specs2/HelloWorldSpec.scala
diff --git a/themes/scala-ide/layout.html → src/sphinx/themes/scala-ide/layout.html b/themes/scala-ide/layout.html → src/sphinx/themes/scala-ide/layout.html
diff --git a/.../scala-ide/static/resources/images/bg.jpg → .../scala-ide/static/resources/images/bg.jpg b/.../scala-ide/static/resources/images/bg.jpg → .../scala-ide/static/resources/images/bg.jpg
diff --git a/...cala-ide/static/resources/images/logo.png → ...cala-ide/static/resources/images/logo.png b/...cala-ide/static/resources/images/logo.png → ...cala-ide/static/resources/images/logo.png
diff --git a/...ide/static/resources/images/watermark.png → ...ide/static/resources/images/watermark.png b/...ide/static/resources/images/watermark.png → ...ide/static/resources/images/watermark.png
diff --git a/...rces/javascript/bootstrap-dropdown-app.js → ...rces/javascript/bootstrap-dropdown-app.js b/...rces/javascript/bootstrap-dropdown-app.js → ...rces/javascript/bootstrap-dropdown-app.js
diff --git a/...esources/javascript/bootstrap-dropdown.js → ...esources/javascript/bootstrap-dropdown.js b/...esources/javascript/bootstrap-dropdown.js → ...esources/javascript/bootstrap-dropdown.js
diff --git a/...tatic/resources/javascript/contentsFix.js → ...tatic/resources/javascript/contentsFix.js b/...tatic/resources/javascript/contentsFix.js → ...tatic/resources/javascript/contentsFix.js
diff --git a/...atic/resources/javascript/effects.core.js → ...atic/resources/javascript/effects.core.js b/...atic/resources/javascript/effects.core.js → ...atic/resources/javascript/effects.core.js
diff --git a/...resources/javascript/effects.highlight.js → ...resources/javascript/effects.highlight.js b/...resources/javascript/effects.highlight.js → ...resources/javascript/effects.highlight.js
diff --git a/...tic/resources/javascript/highlightCode.js → ...tic/resources/javascript/highlightCode.js b/...tic/resources/javascript/highlightCode.js → ...tic/resources/javascript/highlightCode.js
diff --git a/...ide/static/resources/javascript/jquery.js → ...ide/static/resources/javascript/jquery.js b/...ide/static/resources/javascript/jquery.js → ...ide/static/resources/javascript/jquery.js
diff --git a/...e/static/resources/javascript/prettify.js → ...e/static/resources/javascript/prettify.js b/...e/static/resources/javascript/prettify.js → ...e/static/resources/javascript/prettify.js
diff --git a/...e/static/resources/javascript/scrollTo.js → ...e/static/resources/javascript/scrollTo.js b/...e/static/resources/javascript/scrollTo.js → ...e/static/resources/javascript/scrollTo.js
diff --git a/...la-ide/static/resources/javascript/toc.js → ...la-ide/static/resources/javascript/toc.js b/...la-ide/static/resources/javascript/toc.js → ...la-ide/static/resources/javascript/toc.js
diff --git a/...ide/static/resources/stylesheets/base.css → ...ide/static/resources/stylesheets/base.css b/...ide/static/resources/stylesheets/base.css → ...ide/static/resources/stylesheets/base.css
diff --git a/...tatic/resources/stylesheets/bootstrap.css → ...tatic/resources/stylesheets/bootstrap.css b/...tatic/resources/stylesheets/bootstrap.css → ...tatic/resources/stylesheets/bootstrap.css
diff --git a/...-ide/static/resources/stylesheets/doc.css → ...-ide/static/resources/stylesheets/doc.css b/...-ide/static/resources/stylesheets/doc.css → ...-ide/static/resources/stylesheets/doc.css
diff --git a/...static/resources/stylesheets/prettify.css → ...static/resources/stylesheets/prettify.css b/...static/resources/stylesheets/prettify.css → ...static/resources/stylesheets/prettify.css
diff --git a/...e/static/resources/stylesheets/sphinx.css → ...e/static/resources/stylesheets/sphinx.css b/...e/static/resources/stylesheets/sphinx.css → ...e/static/resources/stylesheets/sphinx.css
diff --git a/themes/scala-ide/theme.conf → src/sphinx/themes/scala-ide/theme.conf b/themes/scala-ide/theme.conf → src/sphinx/themes/scala-ide/theme.conf
diff --git a/tutorials/androiddevelopment/index.rst → ...nx/tutorials/androiddevelopment/index.rst b/tutorials/androiddevelopment/index.rst → ...nx/tutorials/androiddevelopment/index.rst
diff --git a/...lugin/images/1-continuations-disabled.png → ...lugin/images/1-continuations-disabled.png b/...lugin/images/1-continuations-disabled.png → ...lugin/images/1-continuations-disabled.png
diff --git a/...ns-plugin/images/2-project-properties.png → ...ns-plugin/images/2-project-properties.png b/...ns-plugin/images/2-project-properties.png → ...ns-plugin/images/2-project-properties.png
diff --git a/...-plugin/images/3-use-project-settings.png → ...-plugin/images/3-use-project-settings.png b/...-plugin/images/3-use-project-settings.png → ...-plugin/images/3-use-project-settings.png
diff --git a/.../images/4-enable-continuations-plugin.png → .../images/4-enable-continuations-plugin.png b/.../images/4-enable-continuations-plugin.png → .../images/4-enable-continuations-plugin.png
diff --git a/...ntinuations-plugin/images/5-no-errors.png → ...ntinuations-plugin/images/5-no-errors.png b/...ntinuations-plugin/images/5-no-errors.png → ...ntinuations-plugin/images/5-no-errors.png
diff --git a/tutorials/continuations-plugin/index.rst → .../tutorials/continuations-plugin/index.rst b/tutorials/continuations-plugin/index.rst → .../tutorials/continuations-plugin/index.rst
diff --git a/tutorials/index.rst → src/sphinx/tutorials/index.rst b/tutorials/index.rst → src/sphinx/tutorials/index.rst
diff --git a/...images/01-lift_basic_folder_structure.png → ...images/01-lift_basic_folder_structure.png b/...images/01-lift_basic_folder_structure.png → ...images/01-lift_basic_folder_structure.png
diff --git a/...ide20/images/02-import_project_dialog.png → ...ide20/images/02-import_project_dialog.png b/...ide20/images/02-import_project_dialog.png → ...ide20/images/02-import_project_dialog.png
diff --git a/...0/images/03-eclipse_project_structure.png → ...0/images/03-eclipse_project_structure.png b/...0/images/03-eclipse_project_structure.png → ...0/images/03-eclipse_project_structure.png
diff --git a/...s/04-eclipse_run_configuration_jrebel.png → ...s/04-eclipse_run_configuration_jrebel.png b/...s/04-eclipse_run_configuration_jrebel.png → ...s/04-eclipse_run_configuration_jrebel.png
diff --git a/tutorials/lift24scalaide20/index.rst → ...hinx/tutorials/lift24scalaide20/index.rst b/tutorials/lift24scalaide20/index.rst → ...hinx/tutorials/lift24scalaide20/index.rst
diff --git a/...calaide20/images/play20-scalaide20-01.png → ...calaide20/images/play20-scalaide20-01.png b/...calaide20/images/play20-scalaide20-01.png → ...calaide20/images/play20-scalaide20-01.png
diff --git a/...calaide20/images/play20-scalaide20-02.png → ...calaide20/images/play20-scalaide20-02.png b/...calaide20/images/play20-scalaide20-02.png → ...calaide20/images/play20-scalaide20-02.png
diff --git a/...calaide20/images/play20-scalaide20-03.png → ...calaide20/images/play20-scalaide20-03.png b/...calaide20/images/play20-scalaide20-03.png → ...calaide20/images/play20-scalaide20-03.png
diff --git a/...calaide20/images/play20-scalaide20-04.png → ...calaide20/images/play20-scalaide20-04.png b/...calaide20/images/play20-scalaide20-04.png → ...calaide20/images/play20-scalaide20-04.png
diff --git a/...calaide20/images/play20-scalaide20-05.png → ...calaide20/images/play20-scalaide20-05.png b/...calaide20/images/play20-scalaide20-05.png → ...calaide20/images/play20-scalaide20-05.png
diff --git a/...calaide20/images/play20-scalaide20-06.png → ...calaide20/images/play20-scalaide20-06.png b/...calaide20/images/play20-scalaide20-06.png → ...calaide20/images/play20-scalaide20-06.png
diff --git a/...calaide20/images/play20-scalaide20-07.png → ...calaide20/images/play20-scalaide20-07.png b/...calaide20/images/play20-scalaide20-07.png → ...calaide20/images/play20-scalaide20-07.png
diff --git a/...calaide20/images/play20-scalaide20-08.png → ...calaide20/images/play20-scalaide20-08.png b/...calaide20/images/play20-scalaide20-08.png → ...calaide20/images/play20-scalaide20-08.png
diff --git a/...calaide20/images/play20-scalaide20-09.png → ...calaide20/images/play20-scalaide20-09.png b/...calaide20/images/play20-scalaide20-09.png → ...calaide20/images/play20-scalaide20-09.png
diff --git a/...calaide20/images/play20-scalaide20-10.png → ...calaide20/images/play20-scalaide20-10.png b/...calaide20/images/play20-scalaide20-10.png → ...calaide20/images/play20-scalaide20-10.png
diff --git a/...calaide20/images/play20-scalaide20-11.png → ...calaide20/images/play20-scalaide20-11.png b/...calaide20/images/play20-scalaide20-11.png → ...calaide20/images/play20-scalaide20-11.png
diff --git a/...calaide20/images/play20-scalaide20-12.png → ...calaide20/images/play20-scalaide20-12.png b/...calaide20/images/play20-scalaide20-12.png → ...calaide20/images/play20-scalaide20-12.png
diff --git a/...calaide20/images/play20-scalaide20-13.png → ...calaide20/images/play20-scalaide20-13.png b/...calaide20/images/play20-scalaide20-13.png → ...calaide20/images/play20-scalaide20-13.png
diff --git a/...calaide20/images/play20-scalaide20-14.png → ...calaide20/images/play20-scalaide20-14.png b/...calaide20/images/play20-scalaide20-14.png → ...calaide20/images/play20-scalaide20-14.png
diff --git a/...calaide20/images/play20-scalaide20-15.png → ...calaide20/images/play20-scalaide20-15.png b/...calaide20/images/play20-scalaide20-15.png → ...calaide20/images/play20-scalaide20-15.png
diff --git a/...calaide20/images/play20-scalaide20-16.png → ...calaide20/images/play20-scalaide20-16.png b/...calaide20/images/play20-scalaide20-16.png → ...calaide20/images/play20-scalaide20-16.png
diff --git a/...calaide20/images/play20-scalaide20-17.png → ...calaide20/images/play20-scalaide20-17.png b/...calaide20/images/play20-scalaide20-17.png → ...calaide20/images/play20-scalaide20-17.png
diff --git a/...calaide20/images/play20-scalaide20-18.png → ...calaide20/images/play20-scalaide20-18.png b/...calaide20/images/play20-scalaide20-18.png → ...calaide20/images/play20-scalaide20-18.png
diff --git a/...calaide20/images/play20-scalaide20-19.png → ...calaide20/images/play20-scalaide20-19.png b/...calaide20/images/play20-scalaide20-19.png → ...calaide20/images/play20-scalaide20-19.png
diff --git a/...calaide20/images/play20-scalaide20-20.png → ...calaide20/images/play20-scalaide20-20.png b/...calaide20/images/play20-scalaide20-20.png → ...calaide20/images/play20-scalaide20-20.png
diff --git a/...calaide20/images/play20-scalaide20-21.png → ...calaide20/images/play20-scalaide20-21.png b/...calaide20/images/play20-scalaide20-21.png → ...calaide20/images/play20-scalaide20-21.png
diff --git a/tutorials/play20scalaide20/index-fr.rst → ...x/tutorials/play20scalaide20/index-fr.rst b/tutorials/play20scalaide20/index-fr.rst → ...x/tutorials/play20scalaide20/index-fr.rst
diff --git a/tutorials/play20scalaide20/index.rst → ...hinx/tutorials/play20scalaide20/index.rst b/tutorials/play20scalaide20/index.rst → ...hinx/tutorials/play20scalaide20/index.rst
diff --git a/...als/scalac-trunk/images/scalac-launch.png → ...als/scalac-trunk/images/scalac-launch.png b/...als/scalac-trunk/images/scalac-launch.png → ...als/scalac-trunk/images/scalac-launch.png
diff --git a/...scalac-trunk/images/scalac-properties.png → ...scalac-trunk/images/scalac-properties.png b/...scalac-trunk/images/scalac-properties.png → ...scalac-trunk/images/scalac-properties.png
diff --git a/tutorials/scalac-trunk/index.rst → src/sphinx/tutorials/scalac-trunk/index.rst b/tutorials/scalac-trunk/index.rst → src/sphinx/tutorials/scalac-trunk/index.rst
diff --git a/user/advancedsetup.rst → src/sphinx/user/advancedsetup.rst b/user/advancedsetup.rst → src/sphinx/user/advancedsetup.rst
diff --git a/user/community.rst → src/sphinx/user/community.rst b/user/community.rst → src/sphinx/user/community.rst
diff --git a/user/faq.rst → src/sphinx/user/faq.rst b/user/faq.rst → src/sphinx/user/faq.rst
diff --git a/user/features.rst → src/sphinx/user/features.rst b/user/features.rst → src/sphinx/user/features.rst
diff --git a/user/features/formatting.rst → src/sphinx/user/features/formatting.rst b/user/features/formatting.rst → src/sphinx/user/features/formatting.rst
diff --git a/user/features/navigating.rst → src/sphinx/user/features/navigating.rst b/user/features/navigating.rst → src/sphinx/user/features/navigating.rst
diff --git a/user/features/refactoring.rst → src/sphinx/user/features/refactoring.rst b/user/features/refactoring.rst → src/sphinx/user/features/refactoring.rst
diff --git a/user/features/scalainterpreter.rst → ...sphinx/user/features/scalainterpreter.rst b/user/features/scalainterpreter.rst → ...sphinx/user/features/scalainterpreter.rst
diff --git a/user/features/typingviewing.rst → src/sphinx/user/features/typingviewing.rst b/user/features/typingviewing.rst → src/sphinx/user/features/typingviewing.rst
diff --git a/user/gettingstarted.rst → src/sphinx/user/gettingstarted.rst b/user/gettingstarted.rst → src/sphinx/user/gettingstarted.rst
diff --git a/user/images/advancedsetup-heapstatus-01.png → ...er/images/advancedsetup-heapstatus-01.png b/user/images/advancedsetup-heapstatus-01.png → ...er/images/advancedsetup-heapstatus-01.png
diff --git a/user/images/advancedsetup-jdtweaving-01.png → ...er/images/advancedsetup-jdtweaving-01.png b/user/images/advancedsetup-jdtweaving-01.png → ...er/images/advancedsetup-jdtweaving-01.png
diff --git a/user/images/clear_co.gif → src/sphinx/user/images/clear_co.gif b/user/images/clear_co.gif → src/sphinx/user/images/clear_co.gif
diff --git a/user/images/feature-code-completion-01.png → ...ser/images/feature-code-completion-01.png b/user/images/feature-code-completion-01.png → ...ser/images/feature-code-completion-01.png
diff --git a/user/images/feature-code-completion-02.png → ...ser/images/feature-code-completion-02.png b/user/images/feature-code-completion-02.png → ...ser/images/feature-code-completion-02.png
diff --git a/user/images/feature-formatting-01.png → ...inx/user/images/feature-formatting-01.png b/user/images/feature-formatting-01.png → ...inx/user/images/feature-formatting-01.png
diff --git a/user/images/feature-formatting-02.png → ...inx/user/images/feature-formatting-02.png b/user/images/feature-formatting-02.png → ...inx/user/images/feature-formatting-02.png
diff --git a/user/images/feature-hyperlinking-01.png → ...x/user/images/feature-hyperlinking-01.png b/user/images/feature-hyperlinking-01.png → ...x/user/images/feature-hyperlinking-01.png
diff --git a/.../images/feature-inferredsemicolons-01.png → .../images/feature-inferredsemicolons-01.png b/.../images/feature-inferredsemicolons-01.png → .../images/feature-inferredsemicolons-01.png
diff --git a/.../images/feature-inferredsemicolons-02.png → .../images/feature-inferredsemicolons-02.png b/.../images/feature-inferredsemicolons-02.png → .../images/feature-inferredsemicolons-02.png
diff --git a/user/images/feature-interpreter-01.png → ...nx/user/images/feature-interpreter-01.png b/user/images/feature-interpreter-01.png → ...nx/user/images/feature-interpreter-01.png
diff --git a/user/images/feature-interpreter-02.png → ...nx/user/images/feature-interpreter-02.png b/user/images/feature-interpreter-02.png → ...nx/user/images/feature-interpreter-02.png
diff --git a/user/images/feature-interpreter-03.png → ...nx/user/images/feature-interpreter-03.png b/user/images/feature-interpreter-03.png → ...nx/user/images/feature-interpreter-03.png
diff --git a/user/images/feature-occurences-01.png → ...inx/user/images/feature-occurences-01.png b/user/images/feature-occurences-01.png → ...inx/user/images/feature-occurences-01.png
diff --git a/user/images/feature-open-type-01.png → ...hinx/user/images/feature-open-type-01.png b/user/images/feature-open-type-01.png → ...hinx/user/images/feature-open-type-01.png
diff --git a/user/images/feature-quickfix-import-01.png → ...ser/images/feature-quickfix-import-01.png b/user/images/feature-quickfix-import-01.png → ...ser/images/feature-quickfix-import-01.png
diff --git a/.../feature-refactoring-extract-local-01.png → .../feature-refactoring-extract-local-01.png b/.../feature-refactoring-extract-local-01.png → .../feature-refactoring-extract-local-01.png
diff --git a/.../feature-refactoring-extract-local-02.png → .../feature-refactoring-extract-local-02.png b/.../feature-refactoring-extract-local-02.png → .../feature-refactoring-extract-local-02.png
diff --git a/...feature-refactoring-extract-method-01.png → ...feature-refactoring-extract-method-01.png b/...feature-refactoring-extract-method-01.png → ...feature-refactoring-extract-method-01.png
diff --git a/...s/feature-refactoring-inline-local-01.png → ...s/feature-refactoring-inline-local-01.png b/...s/feature-refactoring-inline-local-01.png → ...s/feature-refactoring-inline-local-01.png
diff --git a/...eature-refactoring-organize-import-01.png → ...eature-refactoring-organize-import-01.png b/...eature-refactoring-organize-import-01.png → ...eature-refactoring-organize-import-01.png
diff --git a/.../images/feature-refactoring-rename-01.png → .../images/feature-refactoring-rename-01.png b/.../images/feature-refactoring-rename-01.png → .../images/feature-refactoring-rename-01.png
diff --git a/.../images/feature-refactoring-rename-02.png → .../images/feature-refactoring-rename-02.png b/.../images/feature-refactoring-rename-02.png → .../images/feature-refactoring-rename-02.png
diff --git a/...mages/feature-structured-selection-01.png → ...mages/feature-structured-selection-01.png b/...mages/feature-structured-selection-01.png → ...mages/feature-structured-selection-01.png
diff --git a/...images/feature-syntax-highlighting-01.png → ...images/feature-syntax-highlighting-01.png b/...images/feature-syntax-highlighting-01.png → ...images/feature-syntax-highlighting-01.png
diff --git a/user/images/feature-template-01.png → ...phinx/user/images/feature-template-01.png b/user/images/feature-template-01.png → ...phinx/user/images/feature-template-01.png
diff --git a/user/images/feature-typing-error-01.png → ...x/user/images/feature-typing-error-01.png b/user/images/feature-typing-error-01.png → ...x/user/images/feature-typing-error-01.png
diff --git a/user/images/frflag.png → src/sphinx/user/images/frflag.png b/user/images/frflag.png → src/sphinx/user/images/frflag.png
diff --git a/user/images/refresh_interpreter.gif → ...phinx/user/images/refresh_interpreter.gif b/user/images/refresh_interpreter.gif → ...phinx/user/images/refresh_interpreter.gif
diff --git a/user/images/restart_co.gif → src/sphinx/user/images/restart_co.gif b/user/images/restart_co.gif → src/sphinx/user/images/restart_co.gif
diff --git a/user/images/run_interpreter.gif → src/sphinx/user/images/run_interpreter.gif b/user/images/run_interpreter.gif → src/sphinx/user/images/run_interpreter.gif
diff --git a/user/images/setup-diagnostics-01.png → ...hinx/user/images/setup-diagnostics-01.png b/user/images/setup-diagnostics-01.png → ...hinx/user/images/setup-diagnostics-01.png
diff --git a/user/images/show_inferred_semicolons.png → .../user/images/show_inferred_semicolons.png b/user/images/show_inferred_semicolons.png → .../user/images/show_inferred_semicolons.png
diff --git a/user/images/term_restart.gif → src/sphinx/user/images/term_restart.gif b/user/images/term_restart.gif → src/sphinx/user/images/term_restart.gif
diff --git a/user/images/terminate_co.gif → src/sphinx/user/images/terminate_co.gif b/user/images/terminate_co.gif → src/sphinx/user/images/terminate_co.gif
diff --git a/user/images/testing-junit-01.png → src/sphinx/user/images/testing-junit-01.png b/user/images/testing-junit-01.png → src/sphinx/user/images/testing-junit-01.png
diff --git a/user/images/testing-scalatest-01.png → ...hinx/user/images/testing-scalatest-01.png b/user/images/testing-scalatest-01.png → ...hinx/user/images/testing-scalatest-01.png
diff --git a/user/images/testing-specs-01.png → src/sphinx/user/images/testing-specs-01.png b/user/images/testing-specs-01.png → src/sphinx/user/images/testing-specs-01.png
diff --git a/user/images/usflag.png → src/sphinx/user/images/usflag.png b/user/images/usflag.png → src/sphinx/user/images/usflag.png
diff --git a/user/index.rst → src/sphinx/user/index.rst b/user/index.rst → src/sphinx/user/index.rst
diff --git a/user/testingframeworks.rst → src/sphinx/user/testingframeworks.rst b/user/testingframeworks.rst → src/sphinx/user/testingframeworks.rst