Merge remote-tracking branch 'origin/master' into Fox-Working

Author: JLiscom

Doc/Themes.md

@@ -9,12 +9,22 @@ and Dark:
 ![][dark]
 ![][darkEdit]
 
-to flip between them, simple change the following line in `/OpenNote/Config.php`
+to flip between them, simple change the following line in `index.html`
 ```php
-	public static $theme = "dark"; //Default: light; //"dark" also available
+	<!-- Theme -->
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/intojs.css">
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/alertify.css">
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/light/style.css">
+```
+to
+```php
+	<!-- Theme -->
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/dark/intojs.css">
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/dark/alertify.css">
+		<link rel="stylesheet" type="text/css" href="openNote/style/invert/dark/style.css">
 ```
 
 [light]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/topLevel.png
 [dark]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/dark1.png 
 [lightEdit]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/seedsEdit.png
-[darkEdit]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/dark2.png
+[darkEdit]: https://raw.github.com/FoxUSA/OpenNote/master/Doc/screenShots/dark2.png

Doc/Upgrade.md

@@ -1,8 +1,9 @@
 # How to upgrade
-###MYSql
+###MySQL
 - Make sure you make a copy of you database and the OpenNote directory
 - Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
 - You will copy need to copy the upload directory contents into the new upload direcory in `Service/upload`.
+- You will also need to put int you database information in the new config `Service/Config.php`
 
 ###SQLite
-Same as the MYSql. You may need to slightly modify the sql upload script to be compatible with sqlite.
+Same as the MySQL. You may need to slightly modify the sql upload script to be compatible with sqlite.

License.txt

@@ -1,9 +1,9 @@
 OpenNote [![Build Status](https://travis-ci.org/FoxUSA/OpenNote.png?branch=master)](https://travis-ci.org/FoxUSA/OpenNote)
 =============
-In a post 9/11 world of mass digital survailence, there is only one way to keep yor digital information safe.
-In the United States, you do not have have 5th admentment rights if you entrust you information to a third party.
+In a post 9/11 world of mass digital survailence, there is only one way to keep your digital information safe.
+In the United States, you do not have have 5th amendment rights if you entrust you information to a third party.
 
-The fix is to take personal responsability and host apps data yourself.
+The fix is to take personal responsibility and host applications yourself.
 
 OpenNote was built to be a open source(MIT License), web based alternative to Microsoft OneNote (T) or EverNote.
 It is designed to be self hosted and gives you ownership of your data.
@@ -18,6 +18,11 @@ Thank you!
 [Download most resent release from here.][Download]
 
 
+Demo
+-------
+http://stardrive.us/OpenNote/
+
+
 ![][topLevel]
 Features
 --------
@@ -50,10 +55,6 @@ Please do not re-submit issues for these features. Instead, how about a donation
 
 - Out of box PostgreSQL support. PDO connector support PostgreSQL.
 
-Demo
--------
-http://stardrive.us/OpenNote/
-
 Documentation
 -----------------
 [How to install][Install]