Empty commit

.gitattributes

@@ -1,32 +1,37 @@
 # Try to autodetect as fallback
 * text=auto
 
-# 
-# Explicit settings in case git gets retarded
+#
+# Explicit settings in case Git does something stupid
 #
 
 #
 # Text files
 #
-*.sql
-*.php text
-*.xml text
-*.js text
-*.html text
-*.txt text
+*.conf text
 *.css text
+*.html text diff=html
+*.js text
+*.md text
+*.php text diff=php
 *.phtml text
+*.sql text
 *.tpl text
+*.txt text
+*.TXT text
+*.xml text
 
-# 
+#
 # Binary files
 #
-*.png binary
+*.bz2 binary
+*.gif binary
+*.ico binary
+*.jar binary
 *.jpeg binary
 *.jpg binary
-*.gif binary
-*.jar binary
-*.ico binary
-*.TTF binary
+*.otf binary
+*.png binary
 *.tar.* binary
-*.bz2 binary
+*.ttf binary
+*.TTF binary

README.md

@@ -5,14 +5,14 @@ Gazelle is a web framework geared towards private BitTorrent trackers. Although
 ## Gazelle Dependencies
 
 * [Git](http://git-scm.com/) (required)
-* [NGINX](http://wiki.nginx.org/Main) (recommended)
-* [PHP 5.4 or later](http://us.php.net/) (required)
+* [Nginx](http://wiki.nginx.org/Main) (recommended)
+* [PHP 5.4 or later](https://www.php.net/) (required)
 * [Memcached](http://memcached.org/) (required)
 * [Sphinx](http://sphinxsearch.com/) (required)
 * [procps-ng](http://sourceforge.net/projects/procps-ng/) (recommended)
 
-## Changelog
-You may have noticed that commits in the repository do not have have descriptive messages. If you are looking for a change log of Gazelle it can be [viewed here](https://raw.github.com/WhatCD/Gazelle/master/docs/CHANGES.txt). The change log is generated daily and includes new additions or modifications to Gazelle's source.
+## Change Log
+You may have noticed that commits in the repository do not have descriptive messages. If you are looking for a change log of Gazelle, it can be [viewed here](https://raw.github.com/WhatCD/Gazelle/master/docs/CHANGES.txt). The change log is generated daily and includes new additions or modifications to Gazelle's source.
 
 ## Coding Standards
 Gazelle's code adheres to a set of coding standards that can be found [here](https://github.com/WhatCD/Gazelle/wiki/Coding-Standards). If you plan on sending pull requests, these standards must be followed.
@@ -21,7 +21,7 @@ Gazelle's code adheres to a set of coding standards that can be found [here](htt
 [This guide](https://github.com/WhatCD/Gazelle/wiki/Gazelle-installation) will walk you through setting up Gazelle on a machine running Gentoo Linux. Although installing Gazelle is relatively straightforward, we recommend a working knowledge of PHP if you plan to modify the source code.
 
 ## Gazelle development using Vagrant
-[VagrantGazelle](https://github.com/dr4g0nnn/VagrantGazelle) allows for convenient development of Gazelle, without going to the trouble of setting it all up for yourself.
+[VagrantGazelle](https://github.com/dr4g0nnn/VagrantGazelle) allows for convenient development of Gazelle, without going through the trouble of setting it all up yourself.
 
 Vagrant uses virtual machines to allow for easy development in consistent environments. The setup linked above allows for development on your local machine and the Gazelle setup to run without altering your system.
 

classes/permissions.class.php

@@ -43,7 +43,7 @@ public static function get_permissions($PermissionID) {
 	 * @param $UserID
 	 * @param array|false $CustomPermissions
 	 *	Pass in the user's custom permissions if you already have them.
-	 *	Leave false if you don't have their permissions, the function will fetch them.
+	 *	Leave false if you don't have their permissions. The function will fetch them.
 	 * @return array Mapping of PermissionName=>bool/int
 	 */
 	public static function get_permissions_for_user($UserID, $CustomPermissions = false) {

docs/CHANGES.txt

@@ -1,5 +1,10 @@
 CHANGE LOG
 
+2014-01-27 by alderaan
+.gitattributes: set diff=html and diff=php, and clean up the file a bit
+
+This should give us better diff output for HTML and PHP files by choosing more sane hunk headers.
+
 2014-01-23 by Ajax
 Introduced classes to test models. Classes with a @TestClass comment which include public static functions with a @Test comment will be made available to test via testing.php