Merge branch 'master' of git@github.com:280north/cappuccino

README

@@ -20,11 +20,9 @@ System Requirements
 To run Cappuccino applications, all you need is a web browser that understands
 JavaScript.
 
-To build Cappuccino itself, you'll need the following tools:
+To build Cappuccino itself, please read more here :
 
-  - Java 1.5: http://www.java.com/
-  - Rake: http://rake.rubyforge.org/
-  - GCC: http://gcc.gnu.org/
+  - http://wiki.github.com/280north/cappuccino/getting-and-building-the-source
 
 If you're using Windows, you'll also need Cygwin: http://www.cygwin.com/
 
@@ -53,12 +51,12 @@ If you need help with Cappuccino, you can get help from the following sources:
   - Documentation: http://cappuccino.org/learn/
   - Wiki:          http://github.com/280north/cappuccino/wikis
   - Mailing Lists: http://groups.google.com/group/objectivej
-		   http://groups.google.com/group/objectivej-dev
+		           http://groups.google.com/group/objectivej-dev
   - IRC:           irc://irc.freenode.net#cappuccino
 
 If you discover any bugs, please file a ticket at:
 
-    http://cappuccino.lighthouseapp.com.
+    http://github.com/280north/cappuccino/issues.
 
 License
 -------

Rakefile

@@ -71,13 +71,13 @@ task :deploy => [:tools_download, :starter_download, :docs] do
     starter_zip_output = File.join($BUILD_DIR, 'Cappuccino', 'Starter.zip')
     rm_rf(starter_zip_output)
 
-    `cd #{cappuccino_output_path} && zip -r -8 Starter.zip Starter`
+    `cd #{cappuccino_output_path} && zip -ry -8 Starter.zip Starter`
 
     #zip the tools pack
     tools_zip_output = File.join($BUILD_DIR, 'Cappuccino', 'Tools.zip')
     rm_rf(tools_zip_output)
 
-    `cd #{cappuccino_output_path} && zip -r -8 Tools.zip Tools`
+    `cd #{cappuccino_output_path} && zip -ry -8 Tools.zip Tools`
 end
 
 file_d $STARTER_DOWNLOAD_APPLICATION => [$TOOLS_DOWNLOAD_ENV] do

Tools/READMEs/STARTER-README

@@ -4,9 +4,11 @@ Included you should find the following:
 
 1. Documentation
 2. NewApplication
-3. README
+3. NibApplication
+4. README
 
 NewApplication is a stand alone Cappuccino application that you can use as a template to start building your own apps.  To get started, just open up NewApplication/index.html in your favorite web browser.  A great place to go from there is to read the "Downloading and Getting Started" tutorial found at http://cappuccino.org/learn/tutorials/starter-tutorial.php.  This will walk you through these initial steps as well as getting you to do a little coding. If you want to debug your application, try running it with index-debug.html instead, which should make it easier.
 
-You can build your entire application right from this sample project, but if you want to dig a little deeper, you can also download the Tools package found at http://cappuccino.org/download/.  This will set you up with some great additions like syntax modules for certain text editors and build tools to get extra performance.
+NibApplication is a stand alone Cappuccino application that uses .cib files for its interface. You will find two files of interest in the Resources folder: MainMenu.xib and MainMenu.cib. To edit the interface, open MainMenu.xib in Interface Builder. When you are done, run the nib2cib command on MainMenu.xib to generate a new MainMenu.cib file, and refresh your application.
 
+You can build your entire application right from either of these sample projects, but if you want to dig a little deeper, you can also download the Tools package found at http://cappuccino.org/download/.  This will set you up with some great additions like syntax modules for certain text editors and build tools to get extra performance.

Tools/READMEs/TOOLS-README

@@ -45,7 +45,7 @@ This will load the obj-j syntax highlighting when you open files ending in .j
 1. Navigate to Tools (the directory containing this README).
 2. Enter "sudo sh install-tools"
 3. You should see this: "Cappuccino Tools Installed"
-5. You can optionally specify a global Build directory. If you wish to use it, you must set the STEAM_BUILD environment variable. Building Cappuccino from source requires this, for example.
+4. You can optionally specify a global Build directory. If you wish to use it, you must set the CAPP_BUILD environment variable. Building Cappuccino from source requires this, for example. As does using the -l flag in the capp tool.
 
 **********************************************************************
 * objj
@@ -65,4 +65,9 @@ objjc is a static pre-interpreter for Objective-J. It will take Objective-J file
 
 capp is a simple tool for creating Objective-J applications.
 
-    steam /path/to/your/app [options]
+    capp COMMAND [OPTIONS]
+
+    cap gen PROJECT_PATH [-t TEMPLATE_NAME] [-l] [-f] to create new projects
+
+    capp config name value to configure capp with your information (such as user.name, user.email, etc.)
+