diff --git a/archiva-docs/src/site/apt/userguide/browsing.apt b/archiva-docs/src/site/apt/userguide/browsing.apt
index 5b39318e8..a5f892af4 100644
--- a/archiva-docs/src/site/apt/userguide/browsing.apt
+++ b/archiva-docs/src/site/apt/userguide/browsing.apt
@@ -2,8 +2,9 @@
  Browsing
  ------  
  Maria Odea Ching
+ Olivier Lamy
  ------
- 2009-02-23
+ 2012-09-11
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
diff --git a/archiva-docs/src/site/apt/userguide/searching.apt b/archiva-docs/src/site/apt/userguide/searching.apt
index 6b408220a..a2c75ccba 100644
--- a/archiva-docs/src/site/apt/userguide/searching.apt
+++ b/archiva-docs/src/site/apt/userguide/searching.apt
@@ -2,8 +2,9 @@
  Searching
  ------
  Maria Odea Ching
+ Olivier Lamy
  ------
- 2007-11-23
+ 2012-09-11
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -42,6 +43,8 @@ Searching
   
   * when an artifact is proxied or downloaded from a remote repository
 
+  * when remote index is available and downloaded
+
   []
   
   During repository scanning, the <<<index-content>>> consumer (see {{{../adminguide/consumers.html}Consumers}}) creates an
@@ -86,31 +89,32 @@ Searching
   (like 'bytecode:myMethod'). But since version 1.2, we no longer need to type the keyword. Just type the java class or package name
   in the search box.. and voila!
   
-  The 'Search Results Only' option saves the previous search criteria and use it together with the new query string for
-  searching. When the user types a word in the search box, 'launcher' for example, Archiva will search the query string
-  from the previous list of search hits and return a new paginated list of artifacts.
+  You can use various criterias to search artifacts:
 
-  Below is a sample screenshot of the search results with 'Search Results Only' option selected:
+** Simple Query string
 
-[../images/search-results.jpg] Search Results 
+[../images/search-simple.png]
+
+** Advanced Paramters
+
+[../images/search-advanced.png]
+
+** OSGI Parameters
+
+[../images/search-osgi.png]
+
+*Search results
+
+  You can apply various filters on the search results.
+
+  Below is a sample screenshot of the search results:
+
+[../images/search-results.png] Search Results
 
   When the user clicks a specific artifact in the search results list, Archiva will direct the user in the Artifact Info
   page (the same page from the Repository Browse). Otherwise if it is not a pom file (ex. metadata.xml), the file will
   appear as a file to be downloaded from the browser.
 
-* Advanced Search
-
-  The Advanced Search feature allows user to narrow down the search by specifying the criteria such as group id,
-  artifact id, version, class or package, and the repository to be searched. This feature also provides the user the
-  option to configure the pagination of results by specifying the number of hits to be displayed in each page.
-
-  To perform an advanced search, click the <<Advanced Search \>\>>> link from Archiva's Quick Search and the Advanced Search Fields should
-  pop out. Select the search criteria you want to use from the Advanced Search Fields and click the + icon and for each criteria you
-  selected, a text field for that will be created (see the sample screenshot below). For the provided search fields, specify the term(s) for your query and click
-  the Search button.
-  
-[../images/advanced-search.jpg] Advanced Search screen 
-
 * Security
 
   The Search functionality respects the repository permissions. If the user is not logged in to Archiva and does a search,
diff --git a/archiva-docs/src/site/resources/images/search-results.jpg b/archiva-docs/src/site/resources/images/search-results.jpg
deleted file mode 100644
index 5f0347aa1..000000000
Binary files a/archiva-docs/src/site/resources/images/search-results.jpg and /dev/null differ