update README

README

@@ -29,65 +29,77 @@ on SUSE anyway):
 
 CONFIGURATION:
 
-osc uses authentication data if it finds it in .netrc, otherwise it will ask
-for username/password once, and store it in ~/.oscrc.
+When you use it for the first time, it will ask you for your username and
+password, and store it in ~/.oscrc.
+
+If authentication data is found in .netrc, it will also be used.
 
 
 
 USAGE EXAMPLES:
 
+To list existing content on the server
  osc ls 				# list projects
  osc ls Apache 			# list packages in a project 
  osc ls Apache subversion 	# list files of package of a project
 
-# check out 
+Check out content
  osc co Apache 			# entire project
  osc co Apache subversion	# a package
  osc co Apache subversion foo	# single file
 
-# update working copy
+Update a working copy
  osc up
-osc up <directory>
+ osc up [pac_dir]		# update a single package by its path
  osc up * 			# from within a project dir, update all packages
+ osc up  			# from within a project dir, update all packages
+				   AND check out all newly added packages
 
-# check in
+If an update can't be merged automatically, a file is in 'C' (conflict)
+state, and conflicts are marked with special <<<<<<< and >>>>>>> lines. 
+After manually resolving the problem, use
+ osc resolved foo
+
+Upload change content, this does only work within package directories, but not in project directories currently.
  osc ci				# current dir
  osc ci <dir>
  osc ci file1 file2 ...
 
-# show status
+Show the status (which files have been changed locally)
  osc st
  osc st <directory>
  osc st file1 file2 ...
 
-# initialize a source directory to be a 
-# working copy of project <prj> package <pac>
+Initialize a directory to be a working copy of an existing buildservice
+package. (This is the same as checking out a package and then copying sources
+into the directory. It does NOT create a new package.)
  osc init <prj> <pac>
 
-# schedule files foo to be added / deleted
+Mark files to be added or removed on the next 'checkin'
  osc add file1 file2 ...
  osc rm file1 file2 ...
 
-# add all unknown files AND remove all missing files
+Adds all new files in local copy and removes all disappeared files.
  osc addremove
 
-# show diff
+Generates a diff, to view the changes
  osc diff 			# current dir
  osc diff file1 file2 ...
 
-# show build results (xml)
+Shows the build results of the package
  osc results
  osc results [platform]
 
-# show logfile (must be run from workingdir)
+Shows the log file from a package (you need to be inside a package directory)
  osc log <platform> <arch>
 
-# show platforms
+Shows available platforms/build targets
  osc platforms
-# show platforms used by project Apache
-osc platforms Apache
 
-# show various xml meta
+Shows the configured platforms/build targets of a project
+ osc platforms <project>
+
+Shows meta information
  osc meta Apache
  osc meta Apache subversion
  osc id username