Kohana v3.3.2

system/guide/kohana/install.md

@@ -1,45 +1,64 @@
-# Installation
+# Requirements
 
-1. Download the latest **stable** release from the [Kohana website](http://kohanaframework.org/).
-2. Unzip the downloaded package to create a `kohana` directory.
-3. Upload the contents of this folder to your webserver.
-4. Open `application/bootstrap.php` and make the following changes:
-	- Set the default [timezone](http://php.net/timezones) for your application.
-		
-		~~~
-			// Example of changing timezone from Chicago to Sao Paulo, Brazil
-			date_default_timezone_set('America/Sao_Paulo');
-		~~~
-	- Set the `base_url` in the [Kohana::init] call to reflect the location of the kohana folder on your server relative to the document root.
+[!!] Before continuing, make sure you have a web server (like Apache) configured with the following requirements.
 
-		~~~
-			// Example of kohana's installation at /var/www/mywebsite and
-			// Apache's DocumentRoot configured to /var/www
-			Kohana::init(array(
-				'base_url'   => '/mywebsite',
-			));
-		~~~	
-6. Make sure the `application/cache` and `application/logs` directories are writable by the web server.
+ - PHP 5.3.3 or newer.
+ - [Iconv Extension](http://php.net/iconv)
+ - [Character Type (CTYPE) Extension](http://php.net/ctype)
 
-	~~~
-		sudo chmod 777 -R application/cache
-		sudo chmod 777 -R application/logs
-	~~~
-	
-7. Test your installation by opening the URL you set as the `base_url` in your favorite browser.
+# Download
 
-[!!] Depending on your platform, the installation's subdirs may have lost their permissions thanks to zip extraction. Chmod them all to 755 by running `find . -type d -exec chmod 0755 {} \;` from the root of your Kohana installation.
+You can get the latest **stable** release on the [Kohana website](http://kohanaframework.org/). This will give you a fully functional application with an `application`, `modules`, and `system` directory.
+
+[!!] You can find information about the file structure on the [Cascading Filesystem](files) page.
+
+Once downloaded, you should extract the Kohana application to a directory where the web server can access it. Going forward, we are going to assume you've extracted the application to a `kohana` directory such that `http://localhost/kohana/index.php` is pointing to the `index.php` file in the Kohana release.
+
+# Configure
+
+Before the application can be run, you will need to make a few changes to the `application/bootstrap.php` file. This file is the first one to be included by `index.php` and sets up most of the global options for the application. Open `application/bootstrap.php` and make the following changes:
+
+ - Set the default [timezone](http://php.net/timezones) for your application.
+~~~
+// Example of changing timezone to Sao Paulo, Brazil
+date_default_timezone_set('America/Sao_Paulo');
+~~~
+ - Set the `base_url` in the [Kohana::init] call to reflect the location of the kohana folder on your server relative to the document root.
+~~~
+/**
+ * Example of kohana's installation at /var/www/kohana and
+ * Apache's DocumentRoot configured to /var/www
+ */
+Kohana::init(array(
+	'base_url' => '/kohana/',
+));
+~~~
+
+ - Make sure the `application/cache` and `application/logs` directories are writable by the web server.
+~~~
+sudo chmod -R a+rwx application/cache
+sudo chmod -R a+rwx application/logs
+~~~
+
+ - Define a salt for the `Cookie` class.
+~~~
+Cookie::$salt = [really-long-cookie-salt-here]
+~~~
+
+[!!] Make sure to use a unique salt for your application and never to share it. Take a look at the [Cookies](cookies) page for more information on how cookies work in Kohana. If you do not define a `Cookie::$salt` value, Kohana will throw an exception when it encounters any cookie on your domain.
+
+ - Test your installation by opening [http://localhost/kohana](http://localhost/kohana).
 
 You should see the installation page. If it reports any errors, you will need to correct them before continuing.
 
 ![Install Page](install.png "Example of install page")
 
-Once your install page reports that your environment is set up correctly you need to either rename or delete `install.php` in the root directory. Kohana is now installed and you should see the output of the welcome controller:
+Once your install page reports that your environment is set up correctly you need to either rename or delete `install.php`. Kohana is now installed and you should see the output of the welcome controller:
 
 ![Welcome Page](welcome.png "Example of welcome page")
 
 ## Installing Kohana From GitHub
 
-The [source code](http://github.com/kohana/kohana) for Kohana is hosted with [GitHub](http://github.com).  To install Kohana using the github source code first you need to install [git](http://git-scm.com/).  Visit [http://help.github.com](http://help.github.com) for details on how to install git on your platform.
+The [source code](http://github.com/kohana/kohana) for Kohana is hosted with [GitHub](http://github.com). To install Kohana using the github source code first you need to install [git](http://git-scm.com/). Visit [http://help.github.com](http://help.github.com) for details on how to install git on your platform.
 
-[!!] For more information on installing Kohana using git submodules, see the [Working with Git](tutorials/git) tutorial.
+[!!] For more information on installing Kohana using git, see the [Working with Git](tutorials/git) tutorial.

system/guide/kohana/menu.md

@@ -1,7 +1,7 @@
 ## [Kohana]()
 
+- [Installation](install)
 - Getting Started
-   - [Installation](install)
    - [Conventions and Style](conventions)
    - [Model View Controller](mvc)
       - [Controllers](mvc/controllers)
@@ -37,13 +37,11 @@
    - [Database](security/database)
    - [Encryption](security/encryption)
    - [Deploying](security/deploying)
-- [Tutorials](tutorials)
+- Tutorials
    - [Hello World](tutorials/hello-world)
    - [Simple MVC](tutorials/simple-mvc)
    - [Custom Error Pages](tutorials/error-pages)
-   - [Content Translation](tutorials/translation)
    - [Clean URLs](tutorials/clean-urls)
    - [Sharing Kohana](tutorials/sharing-kohana)
    - [Kohana as a Library](tutorials/library-kohana)
-   - [Template Driven Site](tutorials/templates)
    - [Working with Git](tutorials/git)

system/guide/kohana/mvc/controllers.md

@@ -128,7 +128,7 @@ A user login action.
 			// Try to login
 			if (Auth::instance()->login($this->request->post('username'), $this->request->post('password')))
 			{
-				$this->redirect('home', 302);
+				$this->redirect('home', 303);
 			}
 
 			$view->errors = 'Invalid email or password';

system/guide/kohana/mvc/views.md

@@ -126,9 +126,9 @@ You can also assign a variable of your parent view to be the child view from wit
 
 	// In your controller:
 
-	public functin action_index()
+	public function action_index()
 	{
-		$view = View::factory('common/template);
+		$view = View::factory('common/template');
 		
 		$view->title = "Some title";
 		$view->body = View::factory('pages/foobar');

system/guide/kohana/routing.md

@@ -241,17 +241,3 @@ However, Kohana also provides a method to generate the uri from the route's defi
     ));
 
 Let's say you decided later to make that route definition more verbose by changing it to `feeds/<user_id>(/<action>).<format>`. If you wrote your code with the above uri generation method you wouldn't have to change a single line! When a part of the uri is enclosed in parentheses and specifies a key for which there in no value provided for uri generation and no default value specified in the route, then that part will be removed from the uri. An example of this is the `(/<id>)` part of the default route; this will not be included in the generated uri if an id is not provided.
-
-One method you might use frequently is the shortcut [Request::uri] which is the same as the above except it assumes the current route, directory, controller and action. If our current route is the default and the uri was `users/list`, we can do the following to generate uris in the format `users/view/$id`:
-
-    $this->request->uri(array('action' => 'view', 'id' => $user_id));
-    
-Or if within a view, the preferable method is:
-
-    Request::instance()->uri(array('action' => 'view', 'id' => $user_id));
-
-TODO: examples of using html::anchor in addition to the above examples
-
-## Testing routes
-
-TODO: mention bluehawk's devtools module

system/guide/kohana/security/validation.md

@@ -230,7 +230,7 @@ Next, we need a controller and action to process the registration, which will be
                 $user->register($this->request->post());
 
                 // Always redirect after a successful POST to prevent refresh warnings
-                $this->redirect('user/profile', 302);
+                $this->redirect('user/profile', 303);
             }
 
             // Validation failed, collect the errors