Merge branch 'develop' of github.com:conwetlab/Marketplace-RI into de…

…velop

README.md

@@ -78,13 +78,9 @@ For further documentation, you can check the API Reference available at:
 
 ## Testing
 
-### End-To-End tests
+### End-to-End tests
 
-To execute the end-to-end tests, just run:
-
-```
-mvn integration-test
-```
+End-to-End tests are described in the [Installation Guide](http://wmarket.readthedocs.org/en/latest/installation-guide.html#end-to-end-testing)
 
 ### Unit tests
 
@@ -94,6 +90,14 @@ To execute the unit tests, just run:
 mvn test
 ```
 
+### Integration tests
+
+To execute the integration tests, just run:
+
+```
+mvn integration-test
+```
+
 
 ## Advanced Topics
 
@@ -102,4 +106,4 @@ mvn test
 * [Administration Guide](doc/administration-guide.rst)
 * [Building from Sources Guide](doc/building-from-sources-guide.rst)
 
-You can also find this documentation on [ReadTheDocs](http://wmarket.readthedocs.org)
+You can also find this documentation on [ReadTheDocs](http://wmarket.readthedocs.org)

doc/installation-guide.rst

@@ -555,12 +555,36 @@ correctly. If you receive an error check that you have complete all the
 fields in an appropriate way and that you have follow all the
 instructions given in this guide.
 
-**Step 2: Authenticating your user**
+**Step 2: Authenticating your user and becoming a provider**
 
-Go to \`\ ``http://[WMARKET_HOST]:[WMARKET_PORT]/`` and introduce the
-authentication details according to the user that you have created in
-the previous step. If you don't obtain any error, the WMarket is
-correctly deployed. Congratulations!!
+Go to ``http://[WMARKET_HOST]:[WMARKET_PORT]/WMarket`` and introduce
+the authentication details according to the user that you have created
+in the previous step. Then, become a provider as explained in the
+:doc:`administration-guide`.
+
+**Step 3: Creating a Store**
+
+Once that you are provider, you should check that you are able to 
+create a new Store. To do so, follow the steps provided 
+:ref:`here <creating_stores>`. You will be required to introduce
+the Store details such as the name and the URL. You can introduce
+any name and any valid URL.
+
+**Step 4: Registering a Description**
+
+Finally, you should check that you are able to register a description.
+Just follow the steps provided :ref:`here <creating_descriptions>`.
+You will be asked for a name and an URL. Please, note that the URL
+must be a link to a valid USDL. If you do not have a valid USDL hosted
+in a HTTP Server, you can use the following URL:
+
+::
+
+    http://wmarket.readthedocs.org/en/latest/_downloads/example.rdf
+
+
+If you don't obtain any error, the WMarket is correctly deployed. 
+Congratulations!!
 
 List of Running Processes
 =========================

doc/user-programmer-guide.rst

@@ -367,6 +367,8 @@ upload offerings to WMarket. To become a provider, you can refer to the
 Stores Management
 -----------------
 
+.. _creating_stores:
+
 Creating Stores
 ```````````````
 
@@ -448,6 +450,8 @@ Descriptions Management
 Descriptions are the definitions of your offerings. These descriptions are 
 written in `Linked USDL <http://linked-usdl.org/>`__.
 
+.. _creating_descriptions:
+
 Creating Descriptions
 `````````````````````
 To register a new description, click in the menu button that is next to the