Skip to content

Commit 004bc86

Browse files
mattmakaimattmakai
committed
good point raised in issue mattmakai#52. rearranged categories
1 parent 3a489b1 commit 004bc86

File tree

4 files changed

+31
-19
lines changed

4 files changed

+31
-19
lines changed

‎all.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ <h2>A development environment example</h2>
489489
to quickly switch between the interpreters created by virtualenv.</p>
490490
<p>That's a common set up but you can certainly write great code with a much
491491
less expensive set up or a cloud-based development environment.</p>
492-
<h2>Open source development environments</h2>
492+
<h2>Open source text editors</h2>
493493
<ul>
494494
<li>
495495
<p><a href="http://www.vim.org/">vim</a> is my editor of choice and installed by default
@@ -500,17 +500,20 @@ <h2>Open source development environments</h2>
500500
on *nix.</p>
501501
</li>
502502
<li>
503-
<p><a href="http://pydev.org/">PyDev</a> is a Python IDE plug in for
504-
<a href="https://www.eclipse.org/">Eclipse</a>.</p>
503+
<p><a href="https://atom.io/">Atom</a> is an open source editor built by the
504+
<a href="https://github.com">GitHub</a> team.</p>
505505
</li>
506+
</ul>
507+
<h2>Proprietary (closed source) editors</h2>
508+
<ul>
506509
<li>
507510
<p><a href="http://www.sublimetext.com/">Sublime Text</a> versions 2 and 3 (currently
508511
in beta) are popular text editors that can be extended with code completion,
509512
linting, syntax highlighting and other features using plugins.</p>
510513
</li>
511514
<li>
512-
<p><a href="https://atom.io/">Atom</a> is an open source editor built by the
513-
<a href="https://github.com">GitHub</a> team.</p>
515+
<p><a href="http://komodoide.com/">Komodo</a> is a cross-platform text editor and IDE
516+
for major languages including Python, Ruby, JavaScript, Go and more.</p>
514517
</li>
515518
</ul>
516519
<h2>Python-specific IDEs</h2>
@@ -525,7 +528,8 @@ <h2>Python-specific IDEs</h2>
525528
integrated debugging and code completion.</p>
526529
</li>
527530
<li>
528-
<p><a href="http://komodoide.com/">Komodo</a></p>
531+
<p><a href="http://pydev.org/">PyDev</a> is a Python IDE plug in for
532+
<a href="https://www.eclipse.org/">Eclipse</a>.</p>
529533
</li>
530534
</ul>
531535
<h2>Hosted development environment services</h2>

‎development-environments.html‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ <h2>A development environment example</h2>
6868
to quickly switch between the interpreters created by virtualenv.</p>
6969
<p>That's a common set up but you can certainly write great code with a much
7070
less expensive set up or a cloud-based development environment.</p>
71-
<h2>Open source development environments</h2>
71+
<h2>Open source text editors</h2>
7272
<ul>
7373
<li>
7474
<p><a href="http://www.vim.org/">vim</a> is my editor of choice and installed by default
@@ -79,17 +79,20 @@ <h2>Open source development environments</h2>
7979
on *nix.</p>
8080
</li>
8181
<li>
82-
<p><a href="http://pydev.org/">PyDev</a> is a Python IDE plug in for
83-
<a href="https://www.eclipse.org/">Eclipse</a>.</p>
82+
<p><a href="https://atom.io/">Atom</a> is an open source editor built by the
83+
<a href="https://github.com">GitHub</a> team.</p>
8484
</li>
85+
</ul>
86+
<h2>Proprietary (closed source) editors</h2>
87+
<ul>
8588
<li>
8689
<p><a href="http://www.sublimetext.com/">Sublime Text</a> versions 2 and 3 (currently
8790
in beta) are popular text editors that can be extended with code completion,
8891
linting, syntax highlighting and other features using plugins.</p>
8992
</li>
9093
<li>
91-
<p><a href="https://atom.io/">Atom</a> is an open source editor built by the
92-
<a href="https://github.com">GitHub</a> team.</p>
94+
<p><a href="http://komodoide.com/">Komodo</a> is a cross-platform text editor and IDE
95+
for major languages including Python, Ruby, JavaScript, Go and more.</p>
9396
</li>
9497
</ul>
9598
<h2>Python-specific IDEs</h2>
@@ -104,7 +107,8 @@ <h2>Python-specific IDEs</h2>
104107
integrated debugging and code completion.</p>
105108
</li>
106109
<li>
107-
<p><a href="http://komodoide.com/">Komodo</a></p>
110+
<p><a href="http://pydev.org/">PyDev</a> is a Python IDE plug in for
111+
<a href="https://www.eclipse.org/">Eclipse</a>.</p>
108112
</li>
109113
</ul>
110114
<h2>Hosted development environment services</h2>

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-04-12T09:04:03Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-04-13T02:23:42Z</updated></feed>

‎source/content/pages/02-learning-programming/04-development-environments.markdown‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,22 +46,24 @@ That's a common set up but you can certainly write great code with a much
4646
less expensive set up or a cloud-based development environment.
4747

4848

49-
## Open source development environments
49+
## Open source text editors
5050
* [vim](http://www.vim.org/) is my editor of choice and installed by default
5151
on most \*nix systems.
5252

5353
* [emacs](http://www.gnu.org/software/emacs/) is another editor often used
5454
on \*nix.
5555

56-
* [PyDev](http://pydev.org/) is a Python IDE plug in for
57-
[Eclipse](https://www.eclipse.org/).
56+
* [Atom](https://atom.io/) is an open source editor built by the
57+
[GitHub](https://github.com) team.
58+
5859

60+
## Proprietary (closed source) editors
5961
* [Sublime Text](http://www.sublimetext.com/) versions 2 and 3 (currently
6062
in beta) are popular text editors that can be extended with code completion,
6163
linting, syntax highlighting and other features using plugins.
6264

63-
* [Atom](https://atom.io/) is an open source editor built by the
64-
[GitHub](https://github.com) team.
65+
* [Komodo](http://komodoide.com/) is a cross-platform text editor and IDE
66+
for major languages including Python, Ruby, JavaScript, Go and more.
6567

6668

6769
## Python-specific IDEs
@@ -72,7 +74,9 @@ less expensive set up or a cloud-based development environment.
7274
* [Wing IDE](https://wingware.com/) is a paid development environment with
7375
integrated debugging and code completion.
7476

75-
* [Komodo](http://komodoide.com/)
77+
* [PyDev](http://pydev.org/) is a Python IDE plug in for
78+
[Eclipse](https://www.eclipse.org/).
79+
7680

7781

7882
## Hosted development environment services

0 commit comments

Comments
 (0)