# HG changeset patch # User Kadambari Devarajan # Date 1250970764 -19800 # Node ID 873afb14bc6e5588339464caa8c236dfbffd05e1 # Parent 20425ae92f41318c00362309a88977e2a47749a0 Added session plan diff -r 20425ae92f41 -r 873afb14bc6e ult/ult_module_plan.rst --- a/ult/ult_module_plan.rst Sat Aug 22 22:32:55 2009 +0530 +++ b/ult/ult_module_plan.rst Sun Aug 23 01:22:44 2009 +0530 @@ -18,3 +18,65 @@ (1) "In the beginning..." by Neal Stephenson (2) "The Unix Programming Environment" by Kerninghan and Pike +**Initial Session Plan** + ++---------+---------------------------------+---------+ +| Session | Topic | Duration| ++=========+=================================+=========+ +| 1 | Introduction to Course | 5 mts | +| | | | +| | Historical background and | 10 mts | +| | implications. Why Unix? | | +| | | | +| | Getting started–logging in; ls, | 10 mts | +| | date, who, cd, mkdir | | +| | | | +| | Getting help: apropos, man, info| 10 mts | +| | | | +| | Basic file handling: cp, mv, rm | 10 mts | +| | | | +| |First session buffer | 5 mts | ++---------+---------------------------------+---------+ +| 2 | Command line arguments | 5 mts | +| | | | +| | Basic text processing: head, | 15 mts | +| | tail, cut, paste | | +| | | | +| | Shell meta characters | 10 mts | +| | | | ++---------+---------------------------------+---------+ +| 3 | Learning the Lingo | 5 mts | ++---------+---------------------------------+---------+ +| 4 | Let there be Repository... | 15 mts | +| | - Creating Repositpry. | | +| | - Cloning existing Repo. | | +| | - Branches concept | | ++---------+---------------------------------+---------+ +| 5 | Navigating through history logs | 5 mts | ++---------+---------------------------------+---------+ +| 6 | Making changes in local branch | 15 mts | +| | - add | | +| | - cp | | +| | - rename | | +| | - rm | | ++---------+---------------------------------+---------+ +| 7 | Sharing the changes | 10 mts | +| | - status | | +| | - pull | | +| | - update | | ++---------+---------------------------------+---------+ +| 8 | Merging the changes | 20 mts | +| | - commit | | +| | - glog | | +| | - push | | +| | - merge | | ++---------+---------------------------------+---------+ +| 9 | Handling conflicts during merge | 20 mts | ++---------+---------------------------------+---------+ +| 10 | Exporting the changes: getting | | +| | patch, diff | 10 mts | ++---------+---------------------------------+---------+ + +*total session time = 110 mts* + +*buffer time = 10 mts* diff -r 20425ae92f41 -r 873afb14bc6e ult/ult_module_plan.rst~ --- a/ult/ult_module_plan.rst~ Sat Aug 22 22:32:55 2009 +0530 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -Module 1: Using Linux Tools -================= - -Module Objectives ----------------------- - -After successfully completing this module a participant will be able to: - -* Understand the design philosophy of *nix {U} -* Use Linux as their day-to-day operating system {Ap} -* Use the text processing tools such as 'grep', 'tr' {Ap} -* Write and execute (bash) shell scripts {Ap} -* Use a text editor comfortably {Ap} - -Suggested Reading ------------------------ - -(1) "In the beginning..." by Neal Stephenson -(2) "The Unix Programming Environment" by Kerninghan and Pike -