Skip to content

Commit 8aca06e

Browse files
committed
书籍介绍fix
1 parent 0ef6fd5 commit 8aca06e

File tree

10 files changed

+32
-90
lines changed

10 files changed

+32
-90
lines changed

_build/doctrees/environment.pickle

-27.9 KB
Binary file not shown.

_build/doctrees/index.doctree

2.25 KB
Binary file not shown.

_build/html/_sources/index.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ Linux工具快速教程
1212
说明
1313
^^^^^^^^^^^^^^^^^^^^
1414

15-
1. 教程将工具分为基础和进阶两种;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;
16-
2. 同时,此教程也可当作Linux命令手册使用,使用左边栏的目录和搜索栏可以很方便的查阅
17-
3. Linux命令行将以 $ 开始,比如 $ls
15+
1. 工具讲解分为基础篇和进阶篇;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;
16+
2. 第三部分是工具参考篇,主要介绍实用工具的用法和实例;相比第一二部分,这里针对每个工具的介绍更全面
17+
3. 同时,此教程也可当作Linux命令手册使用,使用左边栏的目录和搜索栏可以很方便的查阅;
1818

1919
建议
2020
^^^^^^^^^^^^^^^^^^^^
2121
1. 最好安装一个Linux系统(对于新手Ubuntu容易入门),将教程中的命令敲到bash中看看效果
2222
2. 如果有兴趣,可以在了解之后立即查看相关更完备的内容 (比如查阅官方文档)
2323

24-
注:写作使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势;使用sphnix能够自动
25-
目录和索引文件,方便查收和检索;
26-
24+
PS:写作本书使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势:
25+
* 使用sphnix能够自动生成目录和索引文件,方便查询和检索;
26+
* 有大量漂亮的HTML书籍主题模版,可为书籍轻松换肤(类似Wordpress的网站模版);
27+
* 对于参考手册类书籍的编写在语法上更为便利(python官方帮助文档的使用者);
2728

2829

2930
目录
@@ -36,7 +37,6 @@ Linux工具快速教程
3637
base/index
3738
advance/index
3839
tool/index
39-
helloworld
4040

4141

4242
Indices and tables

_build/html/genindex.html

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,6 @@
9898
<li class="toctree-l2"><a class="reference internal" href="tool/crontab.html">19. crontab 定时任务</a></li>
9999
</ul>
100100
</li>
101-
<li class="toctree-l1"><a class="reference internal" href="helloworld.html">1&nbsp;&nbsp;&nbsp;附录:reStructuredText简明教程</a><ul>
102-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id2">1.1&nbsp;&nbsp;&nbsp;段落</a></li>
103-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id6">1.2&nbsp;&nbsp;&nbsp;二号标题:使用链接</a></li>
104-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id14">1.3&nbsp;&nbsp;&nbsp;尾注</a></li>
105-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id19">1.4&nbsp;&nbsp;&nbsp;引用:</a></li>
106-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id21">1.5&nbsp;&nbsp;&nbsp;添加图片</a></li>
107-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id24">1.6&nbsp;&nbsp;&nbsp;内联标记(单词标记)</a></li>
108-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id30">1.7&nbsp;&nbsp;&nbsp;列表:</a></li>
109-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#definition-lists">1.8&nbsp;&nbsp;&nbsp;Definition Lists</a></li>
110-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#bullet-lists">1.9&nbsp;&nbsp;&nbsp;Bullet Lists</a></li>
111-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id32">1.10&nbsp;&nbsp;&nbsp;特殊段落标记</a></li>
112-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id37">1.11&nbsp;&nbsp;&nbsp;源代码标记</a></li>
113-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id43">1.12&nbsp;&nbsp;&nbsp;替换文本</a></li>
114-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id44">1.13&nbsp;&nbsp;&nbsp;表格</a></li>
115-
</ul>
116-
</li>
117101
</ul>
118102

119103

@@ -159,19 +143,13 @@ <h2 id="P">P</h2>
159143
<table style="width: 100%" class="indextable genindextable"><tr>
160144
<td style="width: 33%" valign="top"><dl>
161145

162-
<dt><a href="sphinx_rtd_theme-master/demo_docs/source/index.html#payments.dotpay.DotpayProvider">payments.dotpay.DotpayProvider (built-in class)</a>
163-
</dt>
164-
165-
</dl></td>
166-
<td style="width: 33%" valign="top"><dl>
167-
168146
<dt>
169147
Python Enhancement Proposals
170148
</dt>
171149

172150
<dd><dl>
173151

174-
<dt><a href="sphinx_rtd_theme-master/demo_docs/source/demo.html#index-0">PEP 287</a>, <a href="helloworld.html#index-0">[1]</a>
152+
<dt><a href="helloworld.html#index-0">PEP 287</a>
175153
</dt>
176154

177155
</dl></dd>
@@ -188,7 +166,7 @@ <h2 id="R">R</h2>
188166

189167
<dd><dl>
190168

191-
<dt><a href="sphinx_rtd_theme-master/demo_docs/source/demo.html#index-1">RFC 2822</a>, <a href="helloworld.html#index-1">[1]</a>
169+
<dt><a href="helloworld.html#index-1">RFC 2822</a>
192170
</dt>
193171

194172
</dl></dd>

_build/html/index.html

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -98,22 +98,6 @@
9898
<li class="toctree-l2"><a class="reference internal" href="tool/crontab.html">19. crontab 定时任务</a></li>
9999
</ul>
100100
</li>
101-
<li class="toctree-l1"><a class="reference internal" href="helloworld.html">1&nbsp;&nbsp;&nbsp;附录:reStructuredText简明教程</a><ul>
102-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id2">1.1&nbsp;&nbsp;&nbsp;段落</a></li>
103-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id6">1.2&nbsp;&nbsp;&nbsp;二号标题:使用链接</a></li>
104-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id14">1.3&nbsp;&nbsp;&nbsp;尾注</a></li>
105-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id19">1.4&nbsp;&nbsp;&nbsp;引用:</a></li>
106-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id21">1.5&nbsp;&nbsp;&nbsp;添加图片</a></li>
107-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id24">1.6&nbsp;&nbsp;&nbsp;内联标记(单词标记)</a></li>
108-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id30">1.7&nbsp;&nbsp;&nbsp;列表:</a></li>
109-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#definition-lists">1.8&nbsp;&nbsp;&nbsp;Definition Lists</a></li>
110-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#bullet-lists">1.9&nbsp;&nbsp;&nbsp;Bullet Lists</a></li>
111-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id32">1.10&nbsp;&nbsp;&nbsp;特殊段落标记</a></li>
112-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id37">1.11&nbsp;&nbsp;&nbsp;源代码标记</a></li>
113-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id43">1.12&nbsp;&nbsp;&nbsp;替换文本</a></li>
114-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id44">1.13&nbsp;&nbsp;&nbsp;表格</a></li>
115-
</ul>
116-
</li>
117101
</ul>
118102

119103

@@ -157,9 +141,9 @@ <h2>前言<a class="headerlink" href="#id1" title="Permalink to this headline">
157141
<div class="section" id="id2">
158142
<h3>说明<a class="headerlink" href="#id2" title="Permalink to this headline"></a></h3>
159143
<ol class="arabic simple">
160-
<li>教程将工具分为基础和进阶两种;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;</li>
144+
<li>工具讲解分为基础篇和进阶篇;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;</li>
145+
<li>第三部分是工具参考篇,主要介绍实用工具的用法和实例;相比第一二部分,这里针对每个工具的介绍更全面;</li>
161146
<li>同时,此教程也可当作Linux命令手册使用,使用左边栏的目录和搜索栏可以很方便的查阅;</li>
162-
<li>Linux命令行将以 $ 开始,比如 $ls</li>
163147
</ol>
164148
</div>
165149
<div class="section" id="id3">
@@ -168,8 +152,15 @@ <h3>建议<a class="headerlink" href="#id3" title="Permalink to this headline">
168152
<li>最好安装一个Linux系统(对于新手Ubuntu容易入门),将教程中的命令敲到bash中看看效果</li>
169153
<li>如果有兴趣,可以在了解之后立即查看相关更完备的内容 (比如查阅官方文档)</li>
170154
</ol>
171-
<p>注:写作使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势;使用sphnix能够自动
172-
目录和索引文件,方便查收和检索;</p>
155+
<dl class="docutils">
156+
<dt>PS:写作本书使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势:</dt>
157+
<dd><ul class="first last simple">
158+
<li>使用sphnix能够自动生成目录和索引文件,方便查询和检索;</li>
159+
<li>有大量漂亮的HTML书籍主题模版,可为书籍轻松换肤(类似Wordpress的网站模版);</li>
160+
<li>对于参考手册类书籍的编写在语法上更为便利(python官方帮助文档的使用者);</li>
161+
</ul>
162+
</dd>
163+
</dl>
173164
</div>
174165
</div>
175166
<div class="section" id="id4">
@@ -216,22 +207,6 @@ <h2>目录<a class="headerlink" href="#id4" title="Permalink to this headline">
216207
<li class="toctree-l2"><a class="reference internal" href="tool/crontab.html">19. crontab 定时任务</a></li>
217208
</ul>
218209
</li>
219-
<li class="toctree-l1"><a class="reference internal" href="helloworld.html">1&nbsp;&nbsp;&nbsp;附录:reStructuredText简明教程</a><ul>
220-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id2">1.1&nbsp;&nbsp;&nbsp;段落</a></li>
221-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id6">1.2&nbsp;&nbsp;&nbsp;二号标题:使用链接</a></li>
222-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id14">1.3&nbsp;&nbsp;&nbsp;尾注</a></li>
223-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id19">1.4&nbsp;&nbsp;&nbsp;引用:</a></li>
224-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id21">1.5&nbsp;&nbsp;&nbsp;添加图片</a></li>
225-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id24">1.6&nbsp;&nbsp;&nbsp;内联标记(单词标记)</a></li>
226-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id30">1.7&nbsp;&nbsp;&nbsp;列表:</a></li>
227-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#definition-lists">1.8&nbsp;&nbsp;&nbsp;Definition Lists</a></li>
228-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#bullet-lists">1.9&nbsp;&nbsp;&nbsp;Bullet Lists</a></li>
229-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id32">1.10&nbsp;&nbsp;&nbsp;特殊段落标记</a></li>
230-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id37">1.11&nbsp;&nbsp;&nbsp;源代码标记</a></li>
231-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id43">1.12&nbsp;&nbsp;&nbsp;替换文本</a></li>
232-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id44">1.13&nbsp;&nbsp;&nbsp;表格</a></li>
233-
</ul>
234-
</li>
235210
</ul>
236211
</div>
237212
<ul class="simple">

_build/html/objects.inv

-144 Bytes
Binary file not shown.

_build/html/search.html

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,22 +97,6 @@
9797
<li class="toctree-l2"><a class="reference internal" href="tool/crontab.html">19. crontab 定时任务</a></li>
9898
</ul>
9999
</li>
100-
<li class="toctree-l1"><a class="reference internal" href="helloworld.html">1&nbsp;&nbsp;&nbsp;附录:reStructuredText简明教程</a><ul>
101-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id2">1.1&nbsp;&nbsp;&nbsp;段落</a></li>
102-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id6">1.2&nbsp;&nbsp;&nbsp;二号标题:使用链接</a></li>
103-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id14">1.3&nbsp;&nbsp;&nbsp;尾注</a></li>
104-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id19">1.4&nbsp;&nbsp;&nbsp;引用:</a></li>
105-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id21">1.5&nbsp;&nbsp;&nbsp;添加图片</a></li>
106-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id24">1.6&nbsp;&nbsp;&nbsp;内联标记(单词标记)</a></li>
107-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id30">1.7&nbsp;&nbsp;&nbsp;列表:</a></li>
108-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#definition-lists">1.8&nbsp;&nbsp;&nbsp;Definition Lists</a></li>
109-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#bullet-lists">1.9&nbsp;&nbsp;&nbsp;Bullet Lists</a></li>
110-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id32">1.10&nbsp;&nbsp;&nbsp;特殊段落标记</a></li>
111-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id37">1.11&nbsp;&nbsp;&nbsp;源代码标记</a></li>
112-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id43">1.12&nbsp;&nbsp;&nbsp;替换文本</a></li>
113-
<li class="toctree-l2"><a class="reference internal" href="helloworld.html#id44">1.13&nbsp;&nbsp;&nbsp;表格</a></li>
114-
</ul>
115-
</li>
116100
</ul>
117101

118102

_build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

base/03_text_processing.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ grep输出以\0作为结尾符的文件名(-z)::
127127

128128
grep "test" file* -lZ| xargs -0 rm
129129

130+
综合应用:将日志中的所有带where条件的sql查找查找出来::
131+
132+
cat LOG.* | tr a-z A-Z | grep "FROM " | grep "WHERE" > b
133+
130134
xargs 命令行参数转换
131135
---------------------
132136
xargs 能够将输入数据转化为特定命令的命令行参数;这样,可以配合很多命令来组合使用。比如grep,比如find;

index.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,19 @@ Linux工具快速教程
1212
说明
1313
^^^^^^^^^^^^^^^^^^^^
1414

15-
1. 教程将工具分为基础和进阶两种;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;
16-
2. 同时,此教程也可当作Linux命令手册使用,使用左边栏的目录和搜索栏可以很方便的查阅
17-
3. Linux命令行将以 $ 开始,比如 $ls
15+
1. 工具讲解分为基础篇和进阶篇;基础篇都是简单常用的工具,而进阶篇更多的适合程序员使用,用来做程序调试或优化;
16+
2. 第三部分是工具参考篇,主要介绍实用工具的用法和实例;相比第一二部分,这里针对每个工具的介绍更全面
17+
3. 同时,此教程也可当作Linux命令手册使用,使用左边栏的目录和搜索栏可以很方便的查阅;
1818

1919
建议
2020
^^^^^^^^^^^^^^^^^^^^
2121
1. 最好安装一个Linux系统(对于新手Ubuntu容易入门),将教程中的命令敲到bash中看看效果
2222
2. 如果有兴趣,可以在了解之后立即查看相关更完备的内容 (比如查阅官方文档)
2323

24-
注:写作使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势;使用sphnix能够自动
25-
目录和索引文件,方便查收和检索;
26-
24+
PS:写作本书使用的reStructuredText标记语言,相对Markdown来说,在写书方面更有优势:
25+
* 使用sphnix能够自动生成目录和索引文件,方便查询和检索;
26+
* 有大量漂亮的HTML书籍主题模版,可为书籍轻松换肤(类似Wordpress的网站模版);
27+
* 对于参考手册类书籍的编写在语法上更为便利(python官方帮助文档的使用者);
2728

2829

2930
目录

0 commit comments

Comments
 (0)