fixing merge for contribution docs

laravel/documentation/contents.md

@@ -110,3 +110,9 @@
 	- [Bundle Tasks](/docs/artisan/tasks#bundle-tasks)
 	- [CLI Options](/docs/artisan/tasks#cli-options)
 - [Commands](/docs/artisan/commands)
+
+### Contributing
+
+- [Laravel on GitHub](docs/contrib/github)
+- [Command Line](docs/contrib/command-line)
+- [TortoiseGit](docs/contrib/tortoisegit)

laravel/documentation/contrib/command-line.md

@@ -0,0 +1,127 @@
+# Contributing to Laravel via Command-Line
+
+## Contents
+ - [Getting Started](#getting-started)
+ - [Forking Laravel](#forking-laravel)
+ - [Cloning Laravel](#cloning-laravel)
+ - [Adding your Fork](#adding-your-fork)
+ - [Creating Branches](#creating-branches)
+ - [Committing](#committing)
+ - [Submitting a Pull Request](#submitting-a-pull-request)
+ - [What's Next?](#whats-next)
+
+<a name='getting-started'></a>
+## Getting Started
+
+This tutorial explains the basics of contributing to a project on [GitHub](https://github.com/) via the command-line. The workflow can apply to most projects on GitHub, but in this case, we will be focused on the [Laravel](https://github.com/laravel/laravel) project. This tutorial is applicable to OSX, Linux and Windows.
+
+This tutorial assumes you have installed [Git](http://git-scm.com/) and you have created a [GitHub account](https://github.com/signup/free). If you haven't already, look at the [Laravel on GitHub](/docs/contrib/github) documentation in order to familiarize yourself with Laravel's repositories and branches.
+
+<a name='forking-laravel'></a>
+## Forking Laravel
+
+Login to GitHub and visit the [Laravel Repository](https://github.com/laravel/laravel). Click on the **Fork** button. This will create your own fork of Laravel in your own GitHub account. Your Laravel fork will be located at **https://github.com/username/laravel** (your GitHub username will be used in place of *username*).
+
+<a name='cloning-laravel'></a>
+## Cloning Laravel
+
+Open up the command-line or terminal and make a new directory where you can make development changes to Laravel:
+
+	# mkdir laravel-develop
+	# cd laravel-develop
+
+Next, clone the Laravel repository (not your fork you made):
+
+	# git clone https://github.com/laravel/laravel.git .
+
+> **Note**: The reason you are cloning the original Laravel repository (and not the fork you made) is so you can always pull down the most recent changes from the Laravel repository to your local repository.
+
+<a name='adding-your-fork'></a>
+## Adding your Fork
+
+Next, it's time to add the fork you made as a **remote repository**:
+
+	# git remote add fork git@github.com:username/laravel.git
+
+Remember to replace *username** with your GitHub username. *This is case-sensitive*. You can verify that your fork was added by typing:
+
+	# git remote
+
+Now you have a pristine clone of the Laravel repository along with your fork as a remote repository. You are ready to begin branching for new features or fixing bugs.
+
+<a name='creating-branches'></a>
+## Creating Branches
+
+First, make sure you are working in the **develop** branch. If you submit changes to the **master** branch, it is unlikely they will be pulled in anytime in the near future. For more information on this, read the documentation for [Laravel on GitHub](/docs/contrib/github). To switch to the develop branch:
+
+	# git checkout develop
+
+Next, you want to make sure you are up-to-date with the latest Laravel repository. If any new features or bug fixes have been added to the Laravel project since you cloned it, this will ensure that your local repository has all of those changes. This important step is the reason we originally cloned the Laravel repository instead of your own fork.
+
+	# git pull origin develop
+
+Now you are ready to create a new branch for your new feature or bug-fix. When you create a new branch, use a self-descriptive naming convention. For example, if you are going to fix a bug in Eloquent, name your branch *bug/eloquent*:
+
+	# git branch bug/eloquent
+	# git checkout bug/eloquent
+	Switched to branch 'bug/eloquent'
+
+Or if there is a new feature to add or change to the documentation that you want to make, for example, the localization documentation:
+
+	# git branch feature/localization-docs
+	# git checkout feature/localization-docs
+	Switched to branch 'feature/localization-docs'
+
+> **Note:** Create one new branch for every new feature or bug-fix. This will encourage organization, limit interdependency between new features/fixes and will make it easy for the Laravel team to merge your changes into the Laravel core.
+
+Now that you have created your own branch and have switched to it, it's time to make your changes to the code. Add your new feature or fix that bug.
+
+<a name='committing'></a>
+## Committing
+
+Now that you have finished coding and testing your changes, it's time to commit them to your local repository. First, add the files that you changed/added:
+
+	# git add laravel/documentation/localization.md
+
+Next, commit the changes to the repository:
+
+	# git commit -s -m "I added some more stuff to the Localization documentation."
+
+ - **-s** means that you are signing-off on your commit with your name. This tells the Laravel team know that you personally agree to your code being added to the Laravel core.
+ - **-m** is the message that goes with your commit. Provide a brief explanation of what you added or changed.
+
+<a name='pushing-to-your-fork'></a>
+## Pushing to your Fork
+
+Now that your local repository has your committed changes, it's time to push (or sync) your new branch to your fork that is hosted in GitHub:
+
+	# git push fork feature/localization-docs
+
+Your branch has been successfully pushed to your fork on GitHub.
+
+<a name='submitting-a-pull-request'></a>
+## Submitting a Pull Request
+
+The final step is to submit a pull request to the Laravel repository. This means that you are requesting that the Laravel team pull and merge your changes to the Laravel core. In your browser, visit your Laravel fork at [https://github.com/username/laravel](https://github.com/username/laravel). Click on **Pull Request**. Next, make sure you choose the proper base and head repositories and branches:
+
+ - **base repo:** laravel/laravel
+ - **base branch:** develop
+ - **head repo:** username/laravel
+ - **head branch:** feature/localization-docs
+
+Use the form to write a more detailed description of the changes you made and why you made them. Finally, click **Send pull request**. That's it! The changes you made have been submitted to the Laravel team.
+
+<a name='whats-next'></a>
+## What's Next?
+
+Do you have another feature you want to add or another bug you need to fix? First, make sure you always base your new branch off of the develop branch:
+
+	# git checkout develop
+
+Then, pull down the latest changes from Laravel's repository:
+
+	# git pull origin develop
+
+Now you are ready to create a new branch and start coding again!
+
+> [Jason Lewis](http://jasonlewis.me/)'s blog post [Contributing to a GitHub Project](http://jasonlewis.me/blog/2012/06/how-to-contributing-to-a-github-project) was the primary inspiration for this tutorial.

laravel/documentation/contrib/github.md

@@ -0,0 +1,35 @@
+# Laravel on GitHub
+
+## Contents
+
+- [The Basics](#the-basics)
+- [Repositories](#repositoriess)
+- [Branches](#branches)
+
+<a name='the-basics'></a>
+## The Basics
+
+Because Laravel's development and source control is done through GitHub, anyone is able to make contributions to it. Anyone can fix bugs, add features or improve the documentation.
+
+After submitting proposed changes to the project, the Laravel team will review the changes and make the decision to commit them to Laravel's core.
+
+<a name='repositories'></a>
+## Repositories
+
+Laravel's home on GitHub is at [github.com/laravel](https://github.com/laravel). Laravel has several repositories. For basic contributions, the only repository you need to pay attention to is the **laravel** repository, located at [github.com/laravel/laravel](https://github.com/laravel/laravel).
+
+<a name='branches'></a>
+## Branches
+
+The **laravel** repository has multiple branches, each serving a specific purpose:
+
+- **master** - This is the Laravel release branch. Active development does not happen on this branch. This branch is only for the most recent, stable Laravel core code. When you download Laravel from [laravel.com](http://laravel.com/), you are downloading directly from this master branch. *Do not make pull requests to this branch.*
+- **staging** - I'm not sure what this is for... Last minute testing before pushing develop to master?
+- **develop** - This is the working development branch. All proposed code changes and contributions by the community are pulled into this branch. *When you make a pull request to the Laravel project, this is the branch you want to pull-request into.*
+
+Once certain milestones have been reached and/or Taylor Otwell and the Laravel team is happy with the stability and additional features of the current development branch, the changes in the **develop** branch are pulled into the **master** branch, thus creating and releasing the newest stable version of Laravel for the world to use.
+
+*Further Reading*
+
+ - [Contributing to Laravel via Command-Line](docs/contrib/command-line)
+ - [Contributing to Laravel using TortoiseGit](docs/contrib/tortoisegit)

laravel/documentation/contrib/tortoisegit.md

@@ -0,0 +1,113 @@
+# Contributing to Laravel using TortoiseGit
+
+## Contents
+ - [Getting Started](#getting-started)
+ - [Forking Laravel](#forking-laravel)
+ - [Cloning Laravel](#cloning-laravel)
+ - [Adding your Fork](#adding-your-fork)
+ - [Creating Branches](#creating-branches)
+ - [Committing](#committing)
+ - [Submitting a Pull Request](#submitting-a-pull-request)
+ - [What's Next?](#whats-next)
+
+<a name='getting-started'></a>
+## Getting Started
+
+This tutorial explains the basics of contributing to a project on [GitHub](https://github.com/) using [TortoiseGit](http://code.google.com/p/tortoisegit/) for Windows. The workflow can apply to most projects on GitHub, but in this case, we will be focused on the [Laravel](https://github.com/laravel/laravel) project.
+
+This tutorial assumes you have installed TortoiseGit for Windows and you have created a GitHub account. If you haven't already, look at the [Laravel on GitHub](/docs/contrib/github) documentation in order to familiarize yourself with Laravel's repositories and branches.
+
+<a name='forking-laravel'></a>
+## Forking Laravel
+
+Login to GitHub and visit the [Laravel Repository](https://github.com/laravel/laravel). Click on the **Fork** button. This will create your own fork of Laravel in your own GitHub account. Your Laravel fork will be located at **https://github.com/username/laravel** (your GitHub username will be used in place of *username*).
+
+<a name='cloning-laravel'></a>
+## Cloning Laravel
+
+Open up Windows Explorer and create a new directory where you can make development changes to Laravel.
+
+ - Right-click the Laravel directory to bring up the context menu. Click on **Git Clone...**
+ - Git clone
+  - **Url:** https://github.com/laravel/laravel.git
+  - **Directory:** the directory that you just created in the previous step
+  - Click **OK**
+
+> **Note**: The reason you are cloning the original Laravel repository (and not the fork you made) is so you can always pull down the most recent changes from the Laravel repository to your local repository.
+
+<a name='adding-your-fork'></a>
+## Adding your Fork
+
+After the cloning process is complete, it's time to add the fork you made as a **remote repository**.
+
+ - Right-click the Laravel directory and goto **TortoiseGit > Settings**
+ - Goto the **Git/Remote** section. Add a new remote:
+  - **Remote**: fork
+  - **URL**: https://github.com/username/laravel.git
+  - Click **Add New/Save**
+  - Click **OK**
+
+Remember to replace *username* with your GitHub username. *This is case-sensitive*.
+
+<a name='creating-branches'></a>
+## Creating Branches
+
+Now you are ready to create a new branch for your new feature or bug-fix. When you create a new branch, use a self-descriptive naming convention. For example, if you are going to fix a bug in Eloquent, name your branch *bug/eloquent*. Or if you were going to make changes to the localization documentation, name your branch *feature/localization-docs*. A good naming convention will encourage organization and help others understand the purpose of your branch.
+
+ - Right-click the Laravel directory and goto **TortoiseGit > Create Branch**
+  - **Branch:** feature/localization-docs
+  - **Base On Branch:** remotes/origin/develop
+  - **Check** *Track*
+  - **Check** *Switch to new branch*
+  - Click **OK**
+
+This will create your new *feature/localization-docs* branch and switch you to it.
+
+> **Note:** Create one new branch for every new feature or bug-fix. This will encourage organization, limit interdependency between new features/fixes and will make it easy for the Laravel team to merge your changes into the Laravel core.
+
+Now that you have created your own branch and have switched to it, it's time to make your changes to the code. Add your new feature or fix that bug.
+
+<a name='committing'></a>
+##Committing
+
+Now that you have finished coding and testing your changes, it's time to commit them to your local repository:
+
+ - Right-click the Laravel directory and goto **Git Commit -> "feature/localization-docs"...**
+ - Commit
+  - **Message:** Provide a brief explaination of what you added or changed
+  - Click **Sign** - This tells the Laravel team know that you personally agree to your code being added to the Laravel core
+  - **Changes made:** Check all changed/added files
+  - Click **OK**
+
+<a name='pushing-to-your-fork'></a>
+## Pushing to your Fork
+
+Now that your local repository has your committed changes, it's time to push (or sync) your new branch to your fork that is hosted in GitHub:
+
+- Right-click the Laravel directory and goto **Git Sync...**
+- Git Syncronization
+ - **Local Branch:** feature/localization-docs
+ - **Remote Branch:** leave this blank
+ - **Remote URL:** fork
+ - Click **Push**
+ - When asked for "username:" enter your GitHub *case-sensitive* username
+ - When asked for "password:" enter your GitHub *case-sensitive* account
+
+Your branch has been successfully pushed to your fork on GitHub.
+
+<a name='submitting-a-pull-request'></a>
+## Submitting a Pull Request
+
+The final step is to submit a pull request to the Laravel repository. This means that you are requesting that the Laravel team pull and merge your changes to the Laravel core. In your browser, visit your Laravel fork at [https://github.com/username/laravel](https://github.com/username/laravel). Click on **Pull Request**. Next, make sure you choose the proper base and head repositories and branches:
+
+ - **base repo:** laravel/laravel
+ - **base branch:** develop
+ - **head repo:** username/laravel
+ - **head branch:** feature/localization-docs
+
+Use the form to write a more detailed description of the changes you made and why you made them. Finally, click **Send pull request**. That's it! The changes you made have been submitted to the Laravel team.
+
+<a name='whats-next'></a>
+## What's Next?
+
+Do you have another feature you want to add or another bug you need to fix? Just follow the same instructions as before in the [Creating Branches](#creating-branches) section. Just remember to always create a new branch for every new feature/fix and don't forget to always base your new branches off of the *remotes/origin/develop* branch.