README.rdoc in stomp-1.2.4 vs README.rdoc in stomp-1.2.5

@@ -8,40 +8,21 @@
 
 * [STOMP 1.0 and 1.1] (http://stomp.github.com/index.html)
 
 ===New
 
-* Gem version 1.2.2.  Stomp 1.1 heartbeat fix, autoflush capability, miscellaneous fixes
-* Gem version 1.2.3.  Miscellaneous fixes, see changelog for details.
-* Gem version 1.2.2.  Performance and more SSL enhancements.
+* Gem version 1.2.5. Restructure. Forks with modifcations will be affected. See _CHANGELOG.rdoc_ for details.
+* Gem version 1.2.4. Stomp 1.1 heartbeat fix, autoflush capability, miscellaneous fixes.
+* Gem version 1.2.3. Miscellaneous fixes, see changelog for details.
+* Gem version 1.2.2. Performance and more SSL enhancements.
 * Full support of SSL certificates is announced as of gem version 1.2.1.
 * Support of Stomp protocol level 1.1 is announced as of gem version 1.2.0.
 
-See the change log for details.
+See _CHANGELOG.rdoc_ for details.
 
-===Example Usage
+===Hash Login Example Usage (this is the recommended login technique)
 
-    client = Stomp::Client.new("test", "user", "localhost", 61613)
-    client.send("/queue/mine", "hello world!")
-    client.subscribe("/queue/mine") do |msg|
-      p msg
-    end
-
-===Failover + SSL Example URL Usage
-
-    options = "initialReconnectDelay=5000&randomize=false&useExponentialBackOff=false"
-    
-    # remotehost1 uses SSL, remotehost2 doesn't
-    client = Stomp::Client.new("failover:(stomp+ssl://login1:passcode1@remotehost1:61612,stomp://login2:passcode2@remotehost2:61613)?#{options}")
-    
-    client.publish("/queue/mine", "hello world!")
-    client.subscribe("/queue/mine") do |msg|
-      p msg
-    end
-
-===Hash Login Example Usage
-
   hash = {
       :hosts => [
         {:login => "login1", :passcode => "passcode1", :host => "remotehost1", :port => 61612, :ssl => true},
         {:login => "login2", :passcode => "passcode2", :host => "remotehost2", :port => 61613, :ssl => false},
         
@@ -65,11 +46,42 @@
     client = Stomp::Client.new(hash)
     
     # for connection
     connection = Stomp::Connection.new(hash)
     
+===Positional Parameter Usage
 
-===Hstorical Information
+    client = Stomp::Client.new("test", "user", "localhost", 61613)
+    client.send("/queue/mine", "hello world!")
+    client.subscribe("/queue/mine") do |msg|
+      p msg
+    end
+
+===Stomp URL Usage
+
+    # Stomp URL :
+    A Stomp URL must begin with 'stomp://' and can be in one of the following forms:
+
+    stomp://host:port
+    stomp://host.domain.tld:port
+    stomp://login:passcode@host:port
+    stomp://login:[e-mail]:port
+   
+    e.g. c = Stomp::Client.new(urlstring)
+
+===Failover + SSL Example URL Usage
+
+    options = "initialReconnectDelay=5000&randomize=false&useExponentialBackOff=false"
+    
+    # remotehost1 uses SSL, remotehost2 doesn't
+    client = Stomp::Client.new("failover:(stomp+ssl://login1:passcode1@remotehost1:61612,stomp://login2:passcode2@remotehost2:61613)?#{options}")
+    
+    client.publish("/queue/mine", "hello world!")
+    client.subscribe("/queue/mine") do |msg|
+      p msg
+    end
+
+===Historical Information
 
 Up until March 2009 the project was maintained and primarily developed by Brian McCallister. 
 
 ===Source Code and Project URLs