diff --git a/README.md b/README.md index b124dda0..b4ff6d83 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ In order to getting started with *nymea* and find information you can take a loo * A detailed description how to install and getting started with the *nymea* can be found in the - [nymea | github wiki](https://github.com/guh/guh/wiki). + [nymea | github wiki](https://github.com/guh/nymea/wiki). * A detailed documentation of the source code can be found in the diff --git a/data/systemd/nymead.service b/data/systemd/nymead.service index a15f5f1a..b0ef5b8c 100644 --- a/data/systemd/nymead.service +++ b/data/systemd/nymead.service @@ -1,6 +1,6 @@ [Unit] Description=nymead - IoT server -Documentation=https://github.com/guh/guh/wiki +Documentation=https://github.com/guh/nymea/wiki After=network.target Wants=network-online.target diff --git a/debian/man/nymea-generateplugininfo.1 b/debian/man/nymea-generateplugininfo.1 index 7d1cbb6e..831f870a 100644 --- a/debian/man/nymea-generateplugininfo.1 +++ b/debian/man/nymea-generateplugininfo.1 @@ -35,13 +35,13 @@ The plugininfo.h outputFile with the uuid declarations. The translation files for the plugin. .SH SEE ALSO -Full developer documentation at: +Full developer documentation at: .br -Wiki on github: +Wiki on github: .SH "REPORTING BUGS" -Issue tracker on github: +Issue tracker on github: .br -How to report bugs: +How to report bugs: .SH AUTHOR Written by Simon Stürz .SH COPYRIGHT diff --git a/debian/man/nymead.1 b/debian/man/nymead.1 index e19a614e..ff97ddb8 100644 --- a/debian/man/nymead.1 +++ b/debian/man/nymead.1 @@ -134,13 +134,13 @@ The systemd unit file: \fI/lib/systemd/system/nymead.service\fR .br The plugins directory: \fI/usr/lib//nymea/plugins/\fR .SH SEE ALSO -Full developer documentation at: +Full developer documentation at: .br -Wiki on github: +Wiki on github: .SH "REPORTING BUGS" -Issue tracker on github: +Issue tracker on github: .br -How to report bugs: +How to report bugs: .SH AUTHOR Written by Simon Stürz and Michael Zanetti .SH COPYRIGHT diff --git a/doc/api.qdoc b/doc/api.qdoc index 2ca31251..68761dfb 100644 --- a/doc/api.qdoc +++ b/doc/api.qdoc @@ -5,10 +5,10 @@ The nymea server provides two different API's: \list \li \l{JSON-RPC API}{JSON-RPC} - \li \l{https://github.com/guh/guh/wiki/REST-API}{REST} + \li \l{https://github.com/guh/nymea/wiki/REST-API}{REST} \endlist - The \l{https://github.com/guh/guh/wiki/REST-API}{REST API} is accessable on the \l{nymeaserver::WebServer}{WebServer}. The JSON-RPC API can be accessed from the \l {nymeaserver::TcpServer}{TcpServer} and the \l {nymeaserver::WebSocketServer}{WebSocketServer} interface. The command line interface \b {\tt nymea-cli} communicates with the \l {nymeaserver::TcpServer}{TcpServer} and \l {JSON-RPC API}. The \b {\tt nymea-webinterface} uses the \l{nymeaserver::WebServer}{WebServer} with the \l{https://github.com/guh/guh/wiki/REST-API}{REST-API} and catches notifications from the \l {nymeaserver::WebSocketServer}{WebSocketServer}. + The \l{https://github.com/guh/nymea/wiki/REST-API}{REST API} is accessable on the \l{nymeaserver::WebServer}{WebServer}. The JSON-RPC API can be accessed from the \l {nymeaserver::TcpServer}{TcpServer} and the \l {nymeaserver::WebSocketServer}{WebSocketServer} interface. The command line interface \b {\tt nymea-cli} communicates with the \l {nymeaserver::TcpServer}{TcpServer} and \l {JSON-RPC API}. The \b {\tt nymea-webinterface} uses the \l{nymeaserver::WebServer}{WebServer} with the \l{https://github.com/guh/nymea/wiki/REST-API}{REST-API} and catches notifications from the \l {nymeaserver::WebSocketServer}{WebSocketServer}. \image api-overview.png diff --git a/doc/nymea.qdoc b/doc/nymea.qdoc index ef222c85..55472c6c 100644 --- a/doc/nymea.qdoc +++ b/doc/nymea.qdoc @@ -28,7 +28,7 @@ The nymea daemon provides two API's: \list \li \l{JSON-RPC API}{JSON-RPC} - \li \l{https://github.com/guh/guh/wiki/REST-API}{REST} + \li \l{https://github.com/guh/nymea/wiki/REST-API}{REST} \endlist \section1 Write your own plugin diff --git a/doc/setup-environment.qdoc b/doc/setup-environment.qdoc index e1d44492..a27b3eb1 100644 --- a/doc/setup-environment.qdoc +++ b/doc/setup-environment.qdoc @@ -20,7 +20,7 @@ You can find a good instructions how to install the nymea repository on your system here: - \b {\unicode{0x2192}} \l{https://github.com/guh/guh/wiki/Install}{nymea install wiki} + \b {\unicode{0x2192}} \l{https://github.com/guh/nymea/wiki/Install}{nymea install wiki} For example, if you are working on Ubuntu 15.04 Vivid, you can create a source list file and add the nymea repository like this: @@ -56,7 +56,7 @@ \list \li \underline{\e nymea} \unicode{0x2192} the \tt nymea package is a meta package and will install the \tt nymead, \tt libnymea1 and \tt nymea-plugins package so you can start the nymea daemon. \li \underline{\e nymea-webinterface} \unicode{0x2192} the \tt nymea-webinterface package will install the webinterface for nymea, which is accessable on \l{http://localhost:3333}. - \li \underline{\e nymea-cli} \unicode{0x2192} the \tt nymea-cli package will install the command line interface for the nymea JSON-RPC API. You can find more infomation \l{https://github.com/guh/guh/wiki/guh-cli}{here}. + \li \underline{\e nymea-cli} \unicode{0x2192} the \tt nymea-cli package will install the command line interface for the nymea JSON-RPC API. You can find more infomation \l{https://github.com/guh/nymea/wiki/nymea-cli}{here}. \li \underline{\e nymea-doc} \unicode{0x2192} the \tt nymea-doc package will install the offline documentation on your system (this homepage). You can access the documentation in your brwoser with \l{file:///usr/share/doc/nymea/html/index.html}{file:///usr/share/doc/nymea/html/index.html}. \li \underline{\e libnymea1-dev} \unicode{0x2192} the \tt libnymea1-dev package brings all development files of nymea (header files and lib) which will be needed to write a plugin. \endlist diff --git a/doc/tutorial1.qdoc b/doc/tutorial1.qdoc index f0f1f073..6dc0420d 100644 --- a/doc/tutorial1.qdoc +++ b/doc/tutorial1.qdoc @@ -13,7 +13,7 @@ \endlist \section1 Open the project - Assuming you already have downloaded the \l{https://github.com/guh/plugin-templates}{plugin-templates} you can open the \tt {plugin-templates \unicode{0x2192} minimal \unicode{0x2192} minimal.pro} file with the Qt Creator. + Assuming you already have downloaded the \l{https://github.com/guh/nymea-plugin-template}{nymea-plugin-template} you can open the \tt {plugin-template \unicode{0x2192} minimal \unicode{0x2192} minimal.pro} file with the Qt Creator. \image minimal-project-open.png "Qt Creator" @@ -84,7 +84,7 @@ Now you can use any nymea client application to examin the new plugin and device. Since the application \b {\tt nymea-cli} (nymea command line interface) was developed for developers, I will show you how this works with the \b {\tt nymea-cli}. - \note You can open two terminal tabs. In the first one you can start \tt nymead with the \tt -n parameter to see the debug output. In the second one you can start \b {\tt nymea-cli} to interact with the server and test your plugin. You can find the documentation for \b {\tt nymea-cli} \l{https://github.com/guh/guh/wiki/guh-cli}{here}. + \note You can open two terminal tabs. In the first one you can start \tt nymead with the \tt -n parameter to see the debug output. In the second one you can start \b {\tt nymea-cli} to interact with the server and test your plugin. You can find the documentation for \b {\tt nymea-cli} \l{https://github.com/guh/nymea/wiki/guh-cli}{here}. \section2 nymea-cli diff --git a/libnymea-core/webserver.cpp b/libnymea-core/webserver.cpp index e125edda..6ab6f992 100644 --- a/libnymea-core/webserver.cpp +++ b/libnymea-core/webserver.cpp @@ -27,7 +27,7 @@ The \l{WebServer} class provides a HTTP/1.1 web server. The web server provides access to the nymea-webinterface and the path can be specified - in the \tt /etc/nymea/nymead.conf file and to the nymea \l{https://github.com/guh/guh/wiki/REST-Api-documentation}{REST API}. + in the \tt /etc/nymea/nymead.conf file and to the nymea \l{https://github.com/guh/nymea/wiki/REST-Api-documentation}{REST API}. The default port for the web server is 3333, which is according to this \l{https://en.wikipedia.org/wiki/List_of_TCP_and_UDP_port_numbers}{list} officially free.