LicensesDialog-12 Improve readability of license texts

- fixes #12
PSDev · Oct 15, 2013 · 9cd144f · 9cd144f
1 parent ba00b0d
commit 9cd144f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/library/res/raw/asl_20_summary.txt b/library/res/raw/asl_20_summary.txt
@@ -4,8 +4,4 @@ You may obtain a copy of the License at
 
     http://www.apache.org/licenses/LICENSE-2.0
 
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
diff --git a/library/res/raw/isc_summary.txt b/library/res/raw/isc_summary.txt
@@ -1,11 +1,3 @@
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted, provided that this
-permission notice appear in all copies.
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that this permission notice appear in all copies.
 
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/sample/res/raw/notices.xml b/sample/res/raw/notices.xml
@@ -55,7 +55,7 @@
     <notice>
         <name>Jackson JSON-processor</name>
         <url>http://jackson.codehaus.org/</url>
-        <copyright></copyright>
+        <copyright/>
         <license>Apache Software License 2.0</license>
     </notice>
     <notice>
@@ -112,4 +112,10 @@
         <copyright>(c) 2012 Martin van Zuilekom (http://martin.cubeactive.com)</copyright>
         <license>Apache Software License 2.0</license>
     </notice>
+    <notice>
+        <name>Cool Project with BSD License</name>
+        <url>http://example.com</url>
+        <copyright>Author of Cool Project with BSD License</copyright>
+        <license>BSD 3-Clause License</license>
+    </notice>
 </notices>