Merge branch 'master' into pr/padLeft

coala · Jan 17, 2018 · 93bddbe · 93bddbe
2 parents d3809ad + c24bbfd
commit 93bddbe
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,6 @@ cache:
   directories:
     - docs/_build
 
-before_install:
-  - cp docs-requirements.txt requirements.txt
-
 script:
   - make html SPHINXOPTS=-W
 

diff --git a/Help/FAQ.rst b/Help/FAQ.rst
@@ -46,14 +46,14 @@ What sort of analysis does coala do? What languages are supported?
 ------------------------------------------------------------------
 
 A list of all analysis routines and supported languages is
-`fully browsable <https://github.com/coala/bear-docs/blob/master/README.rst#supported-languages>`__.
+`fully browsable <https://coala.io/#/languages>`__.
 
 For a top level view on what languages support what kind of analysis roughly,
 consult `this link <https://docs.google.com/spreadsheets/d/1bm63TQHndmGf3HQ33fp9UEmGKNYI7dTkjMyFIof2PqA/edit?usp=sharing>`__.
 
 There are also generic bears, which can be applied language independently on
 your code. Their capabilities and information can be seen
-`here <https://github.com/coala/bear-docs/blob/master/README.rst#all>`__.
+`here <https://coala.io/#/languages>`__.
 
 How do I get started with coala?
 --------------------------------

diff --git a/README.rst b/README.rst
@@ -15,7 +15,7 @@ You should run this command before trying to build the documentation:
 
 ::
 
-    pip3 install -r docs-requirements.txt
+    pip3 install -r requirements.txt
 
 You can test the documentation locally through simply running
 

diff --git a/Users/Docker_Image.rst b/Users/Docker_Image.rst
@@ -62,6 +62,12 @@ on your code in the working directory, like this:
 
   The coala Docker image does not support Python 2 analysis.
 
+You can add coala as alias for docker image, like this:
+
+::
+
+  alias coala="docker run -ti -v $(pwd):/app --workdir=/app coala/base coala"
+
 coala on GitLab CI
 ------------------
 

diff --git a/Users/Tutorial.rst b/Users/Tutorial.rst
@@ -14,7 +14,7 @@ Installation instructions can be found `here <https://coala.io/install>`_.
 
     Here's a list of our
     `supported languages
-    <https://github.com/coala/bear-docs/blob/master/README.rst>`__.
+    <https://coala.io/#/languages>`__.
 
 
 Get Some Code
@@ -226,7 +226,7 @@ sequentially.
 .. note::
 
     For a list of configuration options for the bears, take a look at our
-    `bear-docs <https://github.com/coala/bear-docs>`_ documentation.
+    `coala languages <https://coala.io/#/languages>`_ directory.
 
 Auto-applying Results
 ---------------------

diff --git a/index.rst b/index.rst
@@ -65,12 +65,12 @@ popular languages such as **C/C++**, **Python**, **JavaScript**, **CSS**,
 **Java** and many more, in addition to some generic language independent
 algorithms. To learn more about the different languages supported and the
 bears themselves,
-`click here. <https://github.com/coala/bear-docs/blob/master/README.rst>`__
+`click here. <https://coala.io/#/languages>`__
 
 .. note::
 
   To see what coala can do for you and your language, take a look at
-  `our capabilities listing <https://github.com/coala/bear-docs/blob/master/README.rst>`__.
+  `our capabilities listing <https://coala.io/#/languages>`__.
 
 If you are here to use coala for your own projects, take a look at our
 :doc:`installation guide<Users/Install>`.

diff --git a/docs-requirements.txt → requirements.txt b/docs-requirements.txt → requirements.txt
diff --git a/runtime.txt b/runtime.txt
@@ -0,0 +1 @@
+3.6.2
-Original file line number
+Diff line change
@@ Expand Up @@
     ::
-        pip3 install -r docs-requirements.txt
+        pip3 install -r requirements.txt
     You can test the documentation locally through simply running
@@ Expand Down @@