update socket API

content/firmwareapi/micropython/usocket.md

@@ -16,98 +16,93 @@ Functions below which expect a network address, accept it in the format of `(ipv
 
 ## Methods
 
-#### socket.socket(socket.AF\_INET, socket.SOCK\_STREAM, socket.IPPROTO\_TCP)
+### socket.socket([socket.AF_INET, socket.SOCK_STREAM, socket.IPPROTO_TCP])
 
-Create a new socket using the given address family, socket type and protocol number.
+Create a new socket using the given address family, socket type and protocol number. The initialiser takes the following arguments:
+Family type:
+* `socket.AF_INET`: For use with Internet protocols (WiFi, LTE, Ethernet)
+* `socket.AF_LORA`: For use with LoRa RAW or LoRaWAN.
+* `socket.AF_SIGFOX`: For use with SigFox.
+Socket type:
+* `socket.SOCK_STREAM`:
+* `socket.SOCK_DGRAM`:
+* `socket.SOCK_RAW`:
+Socket protocols:
+* `socket.IPPROTO_UDP`: 
+* `socket.IPPROTO_TCP`: 
 
-#### socket.getaddrinfo(host, port)
+### socket.setsockopt(level, optname, value)
+
+Set the value of the given socket option. The needed symbolic constants are defined in the socket module (`SO_*` etc.). The value can be an integer or a bytes-like object representing a buffer. This function takes the following arguments:
+* `level`: The socket type, can take the following values:
+    * `socket.SOL_SOCKET`
+    * `socket.SOL_LORA`:
+    * `socket.SOL_SIGFOX`
+* `optname`: The option name, can take the following values, depending on the chosen socket level.
+    * `
+
+### socket.getaddrinfo(host, port)
 
 Translate the host/port argument into a sequence of 5-tuples that contain all the necessary arguments for creating a socket connected to that service. The list of 5-tuples has following structure:
 
 `(family, type, proto, canonname, sockaddr)` The following example shows how to connect to a given url:
 
 ```python
-
 s = socket.socket()
 s.connect(socket.getaddrinfo('www.micropython.org', 80)[0][-1])
 ```
 
-## Exceptions
-
-`socket.error`, `socket.timeout`
-
-## Constants
-
-* Family types: `socket.AF_INET`, `socket.AF_LORA`, `socket.AF_SIGFOX`
-* Socket types: `socket.SOCK_STREAM`, `socket.SOCK_DGRAM`, `socket.SOCK_RAW`
-    * stream = TCP
-    * dgram = UDP
-    * raw = no protocol
-* Socket protocols: `socket.IPPROTO_UDP`, `socket.IPPROTO_TCP`
-* Socket options layers: `socket.SOL_SOCKET`, `socket.SOL_LORA`, `socket.SOL_SIGFOX`
-* IP socket options: `socket.SO_REUSEADDR`
-* LoRa socket options: `socket.SO_CONFIRMED`, `socket.SO_DR`
-* Sigfox socket options: `socket.SO_RX`, `socket.SO_TX_REPEAT`, `socket.SO_OOB`, `socket.SO_BIT`
-
-## class Socket
-
-### Methods
-
-#### socket.close()
+### socket.close()
 
 Mark the socket closed. Once that happens, all future operations on the socket object will fail. The remote end will receive no more data (after queued data is flushed).
 
 Sockets are automatically closed when they are garbage-collected, but it is recommended to `close()` them explicitly, or to use a with statement around them.
 
-#### socket.bind(address)
+### socket.bind(address)
 
 Bind the `socket` to `address`. The socket must not already be bound. The `address` parameter must be a tuple containing the IP address and the port.
 
 >In the case of LoRa sockets, the address parameter is simply an integer with the port number, for instance: `s.bind(1)`
 
-#### socket.listen(\[backlog\])
+### socket.listen([backlog])
 
 Enable a server to accept connections. If backlog is specified, it must be at least 0 (if it's lower, it will be set to 0); and specifies the number of unaccepted connections that the system will allow before refusing new connections. If not specified, a default reasonable value is chosen.
 
-#### socket.accept()
+### socket.accept()
 
 Accept a connection. The socket must be bound to an address and listening for connections. The return value is a pair `(conn, address)` where `conn` is a new socket object usable to send and receive data on the connection, and `address` is the address bound to the socket on the other end of the connection.
 
-#### socket.connect(address)
+### socket.connect(address)
 
 Connect to a remote socket at `address`.
 
-#### socket.send(bytes)
+### socket.send(bytes)
 
 Send data to the socket. The socket must be connected to a remote socket.
 
-#### socket.sendall(bytes)
+### socket.sendall(bytes)
 
 Alias of `socket.send(bytes)`.
 
-#### socket.recv(bufsize)
+### socket.recv(bufsize)
 
 Receive data from the socket. The return value is a bytes object representing the data received. The maximum amount of data to be received at once is specified by `bufsize`.
 
-#### socket.sendto(bytes, address)
+### socket.sendto(bytes, address)
 
 Send data to the socket. The socket should not be connected to a remote socket, since the destination socket is specified by address.
 
-#### socket.recvfrom(bufsize)
+### socket.recvfrom(bufsize)
 
 Receive data from the socket. The return value is a pair `(bytes, address)` where `bytes` is a bytes object representing the data received and `address` is the address of the socket sending the data.
 
-#### socket.setsockopt(level, optname, value)
-
-Set the value of the given socket option. The needed symbolic constants are defined in the socket module (`SO_*` etc.). The value can be an integer or a bytes-like object representing a buffer.
-
-#### socket.settimeout(value)
+### socket.settimeout(value)
 
 Set a timeout on blocking socket operations. The value argument can be a nonnegative floating point number expressing seconds, or `None`. If a non-zero value is given, subsequent socket operations will raise a timeout exception if the timeout period value has elapsed before the operation has completed. If zero is given, the socket is put in non-blocking mode. If None is given, the socket is put in blocking mode.
 
-#### socket.setblocking(flag)
+### socket.setblocking(flag)
 
-Set blocking or non-blocking mode of the socket: if flag is false, the socket is set to non-blocking, else to blocking mode.
+Set blocking or non-blocking mode of the socket: if flag is false, the socket is set to non-blocking, else to blocking mode. This will override the timeout setting
 
 This method is a shorthand for certain `settimeout()` calls:
 
@@ -117,7 +112,7 @@ sock.setblocking(True) is equivalent to sock.settimeout(None)
 sock.setblocking(False) is equivalent to sock.settimeout(0.0)
 ```
 
-#### socket.makefile(mode='rb')
+### socket.makefile(mode='rb')
 
 Return a file object associated with the socket. The exact returned type depends on the arguments given to makefile(). The support is limited to binary modes only (`rb` and `wb`). CPython's arguments: `encoding`, `errors`, and `newline` are not supported.
 
@@ -127,40 +122,40 @@ The socket must be in blocking mode; it can have a timeout, but the file object'
 >Closing the file object returned by `makefile()` **WILL** close the original socket as well.
 
 
-#### socket.read(size)
+### socket.read(size)
 
 Read up to size bytes from the socket. Return a bytes object. If `size` is not given, it behaves just like [`socket.readall()`](../usocket#socket-readall), see below.
 
-#### socket.readall()
+### socket.readall()
 
 Read all data available from the socket until EOF. This function will not return until the socket is closed.
 
-#### socket.readinto(buf\[, nbytes\])
+### socket.readinto(buf[, nbytes])
 
 Read bytes into the `buf`. If `nbytes` is specified then read at most that many bytes. Otherwise, read at most `len(buf)` bytes.
 
 Return value: number of bytes read and stored into `buf`.
 
-#### socket.readline()
+### socket.readline()
 
 Read a line, ending in a newline character.
 
 Return value: the line read.
 
-#### socket.write(buf)
+### socket.write(buf)
 
 Write the buffer of bytes to the socket.
 
 Return value: number of bytes written.
 
-#### socket.do_handshake()
+### socket.do_handshake()
 
 Perform the SSL handshake on the previously "wrapped" socket with ssl.wrap_socket().
 could be used when the socket is non-blocking and the SSL handshake is not performed during connect().
 
 Example:
 
-```
+```python
 from network import WLAN
 import time
 import socket
@@ -204,7 +199,7 @@ while True:
     break
 ```
 
-#### socket.dnsserver(*, dnsIndex, ip_addr)
+### socket.dnsserver([dnsIndex, ip_addr])
 
 When no arguments are passed this function returns the configured DNS servers Primary (Index=0) and backup (Index = 1)
 to set primary and Backup DNS servers specify the Index and Ip Address.
@@ -222,3 +217,17 @@ Setting DNS servers:
 >>> socket.dnsserver()
 ('10.0.0.1', '0.0.0.0')
 ```
+
+## Exceptions
+
+`socket.error`, `socket.timeout`
+
+## Constants
+
+* Family types: `socket.AF_INET`, `socket.AF_LORA`, `socket.AF_SIGFOX`
+* Socket types: `socket.SOCK_STREAM`, `socket.SOCK_DGRAM`, `socket.SOCK_RAW`
+* Socket protocols: `socket.IPPROTO_UDP`, `socket.IPPROTO_TCP`
+* Socket options layers: `socket.SOL_SOCKET`, `socket.SOL_LORA`, `socket.SOL_SIGFOX`
+    * IP socket options: `socket.SO_REUSEADDR`
+    * LoRa socket options: `socket.SO_CONFIRMED`, `socket.SO_DR`
+    * Sigfox socket options: `socket.SO_RX`, `socket.SO_TX_REPEAT`, `socket.SO_OOB`, `socket.SO_BIT`