Merge branch 'master' of https://github.com/aeo/style-guide into opti…

…onal_tags

General.md

@@ -17,11 +17,11 @@ Omitting the protocol—which makes the URL relative—prevents mixed content is
 	<script src="//www.google.com/js/gweb/analytics/autotrack.js"></script>
 	/* Not recommended */
 	.example {
-	  background: url(http://www.google.com/images/example);
+		background: url(http://www.google.com/images/example);
 	}
 	/* Recommended */
 	.example {
-	  background: url(//www.google.com/images/example);
+		background: url(//www.google.com/images/example);
 	}
 
 
@@ -30,7 +30,7 @@ Formatting Rules
 
 Indentation
 -----------
-**Indent by 1 tab at a time.**
+*\*In Flux\** **Indent by 1 tab at a time.**
 
 Don’t use spaces or mix tabs and spaces for indentation.
 
@@ -102,7 +102,7 @@ Append action items after a colon as in TODO: action item.
 	<center>Test</center>
 	<!-- TODO: remove optional tags -->
 	<ul>
-	  <li>Apples</li>
-	  <li>Oranges</li>
+		<li>Apples</li>
+		<li>Oranges</li>
 	</ul>
 

README.md

@@ -4,7 +4,7 @@ The AEO Front-end Dev Style Guide
 
 Our agreed-upon guide for HTML, CSS, JS development style and practices. It aims at improving collaboration, code quality, and enabling supporting infrastructure. It applies to raw, working files that use HTML and CSS files. Tools are free to obfuscate, minify, and compile as long as the general code quality is maintained.
 
-The General, HTML, and CSS guides (and some of this README) are forked/inspired from [Google's HTML/CSS guide](http://google-styleguide.googlecode.com/svn/trunk/htmlcssguide.xml). The JS guide is TBD but maybe based on [Idiomatic.js](https://github.com/rwldrn/idiomatic.js/).
+The General, HTML, and CSS guides (and some of this README) are forked/inspired from [Google's HTML/CSS guide](http://google-styleguide.googlecode.com/svn/trunk/htmlcssguide.xml). The JS guide is TBD but may eventually start as a fork of [Idiomatic.js](https://github.com/rwldrn/idiomatic.js/).
 
 This guide itself should be authored in [Markdown](http://daringfireball.net/projects/markdown/); as it currently lives on [GitHub](https://github.com/), you may also use [GitHub Flavored Markdown](http://github.github.com/github-flavored-markdown/).