merged dev.md and updated

doc/dev.md

@@ -237,8 +237,7 @@ the originally UpStart "service" program tend to be available on many systems
 and is privileged.
 
 ### 6.2. Functions
-<<<<<<< HEAD
-#### 6.2.1. exec_serv
+#### 6.2.1. exec_serv \<service\> \<command\>
 That function execute the given action to the given service. The service have
 to be the first parameter and the action, the second parameter. No more
 parameter will be acceted and an error will be triggered if there's any more
@@ -246,32 +245,29 @@ than two.
 
 The function returns the exit code of the service command.
 
-#### 6.2.2. svc_start
+#### 6.2.2. svc_start <service1> [service2 ... serviceN]
 Start the services given in parmeters. You can give as many services you want.
 
 That function relies on the previously documented exec_serv function.
 
-#### 6.2.3. svc_reload
+#### 6.2.3. svc_reload <service1> [service2 ... serviceN]
 Reload the configuration of the services given in parmeters. You can give as
 many services you want. Be careful using this as some services don't have that
 capability.
 
 That function relies on the previously documented exec_serv function.
 
-#### 6.2.2. svc_restart
+#### 6.2.2. svc_restart <service1> [service2 ... serviceN]
 Restart the services given in parmeters. It consist generally in a stop
 immediately followed by a start. You can give as many services you want.
 
 That function relies on the previously documented exec_serv function.
 
-#### 6.2.3. svc_stop
+#### 6.2.3. svc_stop <service1> [service2 ... serviceN]
 Stop the services given in parmeters. You can give as many services you want.
 
 That function relies on the previously documented exec_serv function.
 
 ### 6.3. Other functionnalities
-That file don't profide any other things that the previously listed functions.
-=======
-#### 6.2.1. exec_serv \<service\> \<command\>
->>>>>>> 0ed780d80de8e1be1d0d99d045c8d4b4d27d52ac
+That file don't profide any other thing that the previously listed functions.