Skip to content

Commit

Permalink
update the licence
Browse files Browse the repository at this point in the history
  • Loading branch information
phodal committed Nov 9, 2014
1 parent 81da4b7 commit 9311bc1
Show file tree
Hide file tree
Showing 10 changed files with 428 additions and 347 deletions.
405 changes: 405 additions & 0 deletions Licence.txt

Large diffs are not rendered by default.

344 changes: 0 additions & 344 deletions License.md

This file was deleted.

4 changes: 2 additions & 2 deletions Makefile
@@ -1,11 +1,11 @@
all:
pandoc -s -V geometry:margin=1in --number-sections --highlight-style pygments -S --toc -c css/vendor.css -B template/head.html src/pre/*.md src/*.md -o index.html
pandoc -s -V geometry:margin=1in --number-sections --highlight-style pygments -S --toc -c css/vendor.css -B template/head.html src/pre/*.md src/*.md src/end/*.md -o index.html

iot:
pandoc -s -V geometry:margin=1in --number-sections --highlight-style pygments -S --toc -c css/vendor.css -B template/head.html end/iot.md -o iot.html

release:
pandoc -s -V geometry:margin=1in --number-sections --highlight-style pygments -S --toc -c css/vendor.css -B template/headpdf.html src/pre/*.md src/*.md -o build/pdf.html
pandoc -s -V geometry:margin=1in --number-sections --highlight-style pygments -S --toc -c css/vendor.css -B template/headpdf.html src/pre/*.md src/*.md src/end/*.md -o build/pdf.html
pandoc --template=template/template.tex build/pdf.html -o build/iot.pdf --latex-engine=xelatex
pandoc build/pdf.html -o build/designiot.epub
pandoc build/pdf.html -o build/designiot.mobi
5 changes: 4 additions & 1 deletion README.md
Expand Up @@ -18,4 +18,7 @@ Github | Name

## License

© 2014 [Phodal Huang](http://www.phodal.com). This code is distributed under the GNU/GPL license.
本作品采用[知识共享署名-非商业性使用 4.0 国际许可协议](http://creativecommons.org/licenses/by-nc/4.0/)进行许可。
![cc](https://i.creativecommons.org/l/by-nc/4.0/88x31.png)
© 2014 [Phodal Huang](http://www.phodal.com).

Binary file modified build/designiot.epub
Binary file not shown.
Binary file modified build/iot.pdf
Binary file not shown.
6 changes: 6 additions & 0 deletions build/pdf.html
Expand Up @@ -2800,6 +2800,12 @@ <h2 id="nodejs-mqtt"><span class="header-section-number">16.1</span> Nodejs MQTT
});

<span class="ot">client</span>.<span class="fu">end</span>();</code></pre>
<p>意见及建议: <a href="https://github.com/phodal/designiot/issues" class="uri">https://github.com/phodal/designiot/issues</a> 邮箱: <a href="h@phodal.com" class="uri">h@phodal.com</a></p>
<p>本作品采用<a href="http://creativecommons.org/licenses/by-nc/4.0/">知识共享署名-非商业性使用 4.0 国际许可协议</a>进行许可。</p>
<div class="figure">
<img src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" alt="cc" /><p class="caption">cc</p>
</div>
<p>© 2014 <a href="http://www.phodal.com">Phodal Huang</a>.</p>
<div class="footnotes">
<hr />
<ol>
Expand Down
3 changes: 3 additions & 0 deletions index.html
Expand Up @@ -258,6 +258,8 @@ <h2>一步步搭建物联网系统</h2>
</ul></li>
</ul>
</div>
<p><img src="https://i.creativecommons.org/l/by-nc/4.0/88x31.png" alt="cc" />本作品采用<a href="http://creativecommons.org/licenses/by-nc/4.0/">知识共享署名-非商业性使用 4.0 国际许可协议</a>进行许可。</p>
<p>© 2014 <a href="http://www.phodal.com">Phodal Huang</a>.</p>
<h1 id="前言"><span class="header-section-number">1</span> 前言</h1>
<p>设计物联网系统是一种有意思的事情,我们需要考虑到软件、硬件、通讯等等不同的几个方案。探索不同的语言,不同的框架,形成不同的解决方案。</p>
<p>在文档中,我们将对设计物联网系统有一个简单的介绍,我们会探讨如何设计一个最小的物联网系统。</p>
Expand Down Expand Up @@ -2832,6 +2834,7 @@ <h2 id="nodejs-mqtt"><span class="header-section-number">16.1</span> Nodejs MQTT
});

<span class="ot">client</span>.<span class="fu">end</span>();</code></pre>
<p>意见及建议: <a href="https://github.com/phodal/designiot/issues" class="uri">https://github.com/phodal/designiot/issues</a> 邮箱: <a href="h@phodal.com" class="uri">h@phodal.com</a></p>
<div class="footnotes">
<hr />
<ol>
Expand Down
4 changes: 4 additions & 0 deletions src/end/qa.md
@@ -0,0 +1,4 @@


意见及建议: [https://github.com/phodal/designiot/issues](https://github.com/phodal/designiot/issues)
邮箱: [h@phodal.com](h@phodal.com)
4 changes: 4 additions & 0 deletions src/pre/1.pre.md
@@ -1,3 +1,7 @@
![cc](https://i.creativecommons.org/l/by-nc/4.0/88x31.png)本作品采用[知识共享署名-非商业性使用 4.0 国际许可协议](http://creativecommons.org/licenses/by-nc/4.0/)进行许可。

© 2014 [Phodal Huang](http://www.phodal.com).

#前言##

设计物联网系统是一种有意思的事情,我们需要考虑到软件、硬件、通讯等等不同的几个方案。探索不同的语言,不同的框架,形成不同的解决方案。
Expand Down

0 comments on commit 9311bc1

Please sign in to comment.