# HG changeset patch
# User Santosh G. Vattam <vattam.santosh@gmail.com>
# Date 1253178188 -19800
# Node ID 401a46c880b04434d10a0aae9377456324fcde42
# Parent  042767d3dd0dcb30f73a20978ca20ee8107e90a4# Parent  0f25f22a2725a4856770ebba577aa5cc3dc2136b
Merged branches and added strings methods.

diff -r 042767d3dd0d -r 401a46c880b0 basic_python/intro.rst
--- a/basic_python/intro.rst	Thu Sep 17 13:47:31 2009 +0530
+++ b/basic_python/intro.rst	Thu Sep 17 14:33:08 2009 +0530
@@ -543,7 +543,8 @@
   False
 
 The **while** loop
-~~~~~~~~~~~~~~~~~~
+==================
+
 
 The Python **while** loop is similar to the C/C++ while loop. The syntax is as
 follows:
@@ -572,7 +573,7 @@
     5
 
 The **if** conditional
-~~~~~~~~~~~~~~~~~~~~~~
+======================
 
 The Python **if** block provides the conditional execution of statements. 
 If the condition evaluates as true the block of statements defined under the if 
@@ -612,7 +613,7 @@
          print n, " is 0"
 
 **raw_input()**
-~~~~~~~~~~~~~~~
+===============
 
 In the previous example we saw the call to the raw_input() subroutine. 
 The **raw_input()** method is used to take user inputs through the console.
@@ -685,7 +686,7 @@
 cannot be performed on it. Hence the exception is raised.
 
 **int()** method
-~~~~~~~~~~~~~~~~
+================
 
 Generally for computing purposes, the data used is not strings or raw data but 
 on integers, floats and similar mathematical data structures. The data obtained
@@ -715,7 +716,7 @@
 
 
 Functions in Python: **def**
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+============================
 
 *Functions* allow us to enclose a set of statements and call the function again
 and again instead of repeating the group of statements everytime. Functions also
@@ -809,7 +810,6 @@
   >>> can_change(name)
   >>> name
   ['Mr.', 'James', 'Gosling']
-
 If nothing is returned by the function explicitly, Python takes care to return
 None when the funnction is called.
 
diff -r 042767d3dd0d -r 401a46c880b0 basic_python/strings_dicts.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/basic_python/strings_dicts.rst	Thu Sep 17 14:33:08 2009 +0530
@@ -0,0 +1,33 @@
+=======
+Strings
+=======
+
+Strings were briefly introduced previously in the introduction document. In this
+section strings will be presented in greater detail. All the standard operations 
+that can be performed on sequences such as indexing, slicing, multiplication, length
+minimum and maximum can be performed on string variables as well. One thing to
+be noted is that strings are immutable, which means that string variables are
+unchangeable. Hence, all item and slice assignments on strings are illegal.
+Let us look at a few example.
+
+::
+
+  >>> name = 'PythonFreak'
+  >>> print name[3]
+  h
+  >>> print name[-1]
+  k
+  >>> print name[6:]
+  Freak
+  >>> name[6:0] = 'Maniac'
+  Traceback (most recent call last):
+    File "<stdin>", line 1, in <module>
+  TypeError: 'str' object does not support item assignment
+
+This is quite expected, since string objects are immutable as already mentioned.
+The error message is clear in mentioning that 'str' object does not support item
+assignment.
+
+String Formatting
+=================
+