[docs] Add Julia to 'Languages and frameworks' section and improve Py…

…thon modified: src/docs/languages_and_frameworks.md modified: src/docs/python_in_gitpod.md
gitpod-io · Jan 12, 2020 · df584aa · df584aa
1 parent 59258c5
commit df584aa
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/src/docs/julia_in_gitpod.md b/src/docs/julia_in_gitpod.md
@@ -6,6 +6,6 @@ It's relatively easy to set up your Julia project in Gitpod.
 
 A great minimal example of a ready-to-code Julia development environment is [JesterOrNot/Gitpod-Julia](https://github.com/JesterOrNot/Gitpod-Julia).
 
-To showcase a real-world Julia project in Gitpod we gitpodified the Julia Programming Language in Gitpod. Try it here:
+To showcase a real-world Julia project in Gitpod we gitpodified the Julia Programming Language in Gitpod! Try it here:
 
 [![JesterOrNot/Julia](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/JesterOrNot/Julia)
diff --git a/src/docs/languages_and_frameworks.md b/src/docs/languages_and_frameworks.md
@@ -7,3 +7,4 @@ Below is a list of language and framework specific tips & tricks.
   * [Julia](/docs/julia_in_gitpod/)
   * [Ruby](/docs/ruby_in_gitpod)
   * [Go](/docs/go_in_gitpod/)
+  * [Ruby](/docs/ruby_in_gitpod)
diff --git a/src/docs/python_in_gitpod.md b/src/docs/python_in_gitpod.md
@@ -1,12 +1,15 @@
 # Python
 
 
+> 🚧 Please help improve this guide by [editing it](https://gitpod.io/#https://github.com/gitpod-io/website/blob/master/src/docs/python_in_gitpod.md).
+
 Gitpod comes with great support for Python builtin. Still, depending on your particular project, you might want to further optimize the experience.
 
 ## GUI Applications with wxPython
 Have a super cool GUI application you are building with wxPython? Want to run it in Gitpod? Please take a look at [JesterOrNot/Gitpod-PythonGUI-Example](https://github.com/JesterOrNot/Gitpod-PythonGUI-Example)
 
 Here is an example `.gitpod.Dockerfile`:
+
 ```dockerfile
 FROM gitpod/workspace-full-vnc:latest
 
@@ -37,7 +40,11 @@ USER gitpod
 
 RUN pip3 install -U -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-18.04/ wxPython
 ```
+<<<<<<< HEAD
 Here is an example `.gitpod.yml`:
+=======
+Here is an example .gitpod.yml
+>>>>>>> 631b729... [docs] Add Julia to 'Languages and frameworks' section and improve Python
 ```yaml
 image:
   file: .gitpod.Dockerfile

diff --git a/src/docs/ruby_in_gitpod.md b/src/docs/ruby_in_gitpod.md
@@ -37,3 +37,4 @@ vscode:
     - [email protected]:RN+gv0dPjYfMqlcEEralhg==
     - [email protected]:VakXVw0C77hAQ3U3AZTn1Q==
 ```
+