update

jiangxincode · jiangxincode · commit b8d271674aae · 2017-06-11T23:44:50.000+08:00
diff --git a/DB学习之路.md b/DB学习之路.md
@@ -109,6 +109,7 @@
 * Managing Oracle Enterprise Manager Database Control: http://docs.oracle.com/cd/E11882_01/server.112/e25494/dbcontrol.htm#ADMIN13401
 * 2 Oracle SQL Connector for Hadoop Distributed File System: http://docs.oracle.com/cd/E37231_01/doc.20/e36961/sqlch.htm#BDCUG125
 * Generating an AWR Report Using the Command-Line Interface: http://docs.oracle.com/database/121/TGDBA/gather_stats.htm#TGDBA233
+* TRUNC (date): http://docs.oracle.com/cd/B28359_01/server.111/b28286/functions209.htm#SQLRF06151
 
 * Oracle SQL Developer: http://www.oracle.com/technetwork/developer-tools/sql-developer/overview/index.html
 * Instant Client Downloads for Microsoft Windows (32-bit): http://www.oracle.com/technetwork/topics/winsoft-085727.html
diff --git a/EditorAndIDE学习之路.md b/EditorAndIDE学习之路.md
@@ -325,3 +325,32 @@ J 合并行
 * GNU Emacs Manuals Online: http://www.gnu.org/software/emacs/manual/
 
 
+# VSC
+
+* Visual Studio Code: https://code.visualstudio.com/Download
+* Settings Sync: https://marketplace.visualstudio.com/items?itemName=Shan.code-settings-sync
+
+
+# ultraedit
+
+* http://www.ultraedit.com/
+* User-submitted wordfiles for UltraEdit/UEStudio: http://www.ultraedit.com/downloads/extras/wordfiles.html
+
+
+# Sublime Text
+
+* http://www.sublimetext.com/
+* http://www.sublimetext.com/docs/3/
+* https://packagecontrol.io/installation
+
+
+# Others
+
+* geany: http://www.geany.org/Download/Extras
+* Lime Text: http://limetext.org/
+* sourceinsight: http://www.sourceinsight.com/
+* Scintilla: http://www.scintilla.org/
+* xmlspy: https://www.altova.com/xmlspy.html
+* Bluefish: http://bluefish.openoffice.nl/index.html
+
+
diff --git a/Linux学习之路.md b/Linux学习之路.md
@@ -135,6 +135,8 @@
 * linux中screen命令的用法：http://www.9usb.net/201002/linux-screen-mingling.html
 * linux 下script命令记录终端会话：http://blog.chinaunix.net/uid-25885064-id-3430216.html
 * 记录终端下的操作（tee）：http://os.chinaunix.net/a2008/0810/986/000000986568.shtml
+* Shell脚本交互之：自动输入密码: http://blog.csdn.net/zhangjikuan/article/details/51105166
+* Shell中重定向<<EOF注意事项: http://blog.csdn.net/iamlaosong/article/details/40509399
 * 音乐播放软件：clementine
 * rhythmbox歌词显示工具：osd-lyrics
 * 桌面美化工具：compiz
@@ -152,6 +154,8 @@
 * Audio CD Extractor（音频CD提取器）:又名“音乐榨汁机”、“Sound Juicer”。能把CD转成flac、ogg、mp3等格式。官方主页：http://www.burtonini.com/blog/computers/sound-juicer
 * Sound Converter（声音转换程序）: 支持flac、ogg、mp3、wav、m4a等格式间批量互转。官方主页：http://soundconverter.berlios.de
 * curl是利用URL语法在命令行方式下工作的文件传输工具。
+* thunderbird: https://www.mozilla.org/zh-CN/thunderbird/
+* gimp: https://www.gimp.org/
 
 * PDFtk: https://www.pdflabs.com/
 * Master PDF Editor for Linux: https://code-industry.net/free-pdf-editor/
@@ -350,12 +354,11 @@ linux 下全局的文件与程序的关联是通过`/usr/share/applications/defa
 ```
 
 * 安装Synaptic软件包管理器
-* 卸载libreoffice/firefox/thunderbird/youker-assistant/amazon
+* 卸载libreoffice/firefox/youker-assistant/amazon
 * 重新启动计算机
 * 安装GLX-Dock并进行配置
 * 配置输入法（快捷键等）并重新登录
 * 安装clementine/osd-lyrics并进行配置，解决乱码问题，安装解码插件
-* 按装bluefish和geany
 * 安装快盘，进行配快盘和ubuntu one
 * 安装filezilla/okular/meld
 * 卸载Rhythmbox/empathy/account-plugin-*
