@liancheng's updates

Conflicts:
	docs/sql-programming-guide.md