Permalink
Browse files

Merge branch 'master' of github.com:zefhemel/zed

  • Loading branch information...
2 parents 94209f2 + 08c9a78 commit 23239c2477ed0319370a17782dd50146c28362af @zefhemel zefhemel committed Apr 8, 2013
Showing with 5 additions and 6 deletions.
  1. +2 −2 README.md
  2. +3 −4 TODO
View
@@ -3,7 +3,7 @@ Zed
Welcome to Zed, a code editor built using web technologies, designed to rethink
some of the assumptions that underly most editors today. Some of the editor's
-core features are the features it doesn't have:
+core features are the features it does **not** have:
* Tabs
* Always visible file tree
@@ -106,4 +106,4 @@ Technology
* The excellent [ACE](http://github.com/ajaxorg/ace) editor
* [jQuery](http://jquery.com)
-* [Require.js](http://requirejs.org)
+* [Require.js](http://requirejs.org)
View
7 TODO
@@ -5,16 +5,15 @@
* Cursor
* Settings
* Navigate
-* Per project settings zedconfig.json
+* Per project settings zedsettings.json
* Proper HTML preview (loading via HTTP)
* WebFS
* Proper content-types for files from server
* Option to use auth only for write, not for read
- * node.js implementation
* Nix Mode
* Save folds in .zedstate
* Change all keyboard handlers to commands
-* Context-aware enable/disable with isAvailable() call
+* Context-aware command enable/disable with isAvailable() call
* Test suite for WebFS
* Better support for local projects (with path completion)
* Implement Tree as generic alternative view of Goto
@@ -23,4 +22,4 @@
Implement settings:
editor.getSession().setTabSize(4);
- editor.getSession().setUseSoftTabs(value);
+ editor.getSession().setUseSoftTabs(value);

0 comments on commit 23239c2

Please sign in to comment.