Skip to content

Commit

Permalink
Modify licensing (mainly Nokia -> Digia) and wording in docs
Browse files Browse the repository at this point in the history
  • Loading branch information
uranusjr committed Sep 25, 2013
1 parent 9fb8702 commit 0dcddd4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Tzu-ping Chung (uranusjr) uranusjr@gmail.com
Tzu-ping Chung (@uranusjr) uranusjr [at] gmail.com
4 changes: 4 additions & 0 deletions Qelly.pro
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,7 @@ TEMPLATE = subdirs
CONFIG += ordered

SUBDIRS = src

OTHER_FILES += \
AUTHORS \
README.md
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![Build Status](https://travis-ci.org/uranusjr/Qelly.png?branch=master)](https://travis-ci.org/uranusjr/Qelly)

# Qelly

Nally, every platform, every machine.
Expand All @@ -16,7 +18,7 @@ also planned.
## Licensing

Qelly is published under the terms of GNU Public License version 3 (GPL v3) as
defined by the Free Software Foundation (FSF). A copy of the licensse should
defined by the Free Software Foundation (FSF). A copy of the license should
have been included with this file. You may also find the details of GPL v3 at:
http://www.gnu.org/licenses/gpl-3.0.txt

Expand All @@ -28,7 +30,7 @@ contact information.
## Special Notices on SSH Feature

The SSH connection is driven by external executables. In Unix-like systems, the
OpenSSH client, which is built-in in most cases, is used. In Windows, Plink
OpenSSH client, which is built-in in most cases, is used. Under Windows, Plink
(PuTTY Link command-line interface) is used.

You can get Plink at the PuTTY project download page:
Expand All @@ -43,9 +45,10 @@ location correctly in Qelly's Preferences.

## Thrid Party Components

Qelly uses Qt under the terms of GPL v3. Qt is a product of Nokia Corp.. Nokia,
Qt, and their respective logos are trademarks of Nokia Corp.. See the Qt website
for more information: http://qt.nokia.com/
Qelly uses Qt under the terms of GPL v3. The Qt GUI Toolkit (Qt) is a product of
Digia Plc and/or its subsidiary(-ies). Digia Plc, Qt, and their respective logos
are trademarks of Digia Plc. Visit Qt's project website for more information:
http://qt-project.org/

Plink (PuTTY Link) is distributed under the MIT license. For more, see:
http://www.chiark.greenend.org.uk/~sgtatham/putty/licence.html
Expand Down

0 comments on commit 0dcddd4

Please sign in to comment.