SOLR-14214: Clean up client lists and references

shatejas · Jan 24, 2020 · ba77a5f · ba77a5f
1 parent eaa3dbe
commit ba77a5f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 35 deletions.
diff --git a/solr/solr-ref-guide/src/client-api-lineup.adoc b/solr/solr-ref-guide/src/client-api-lineup.adoc
@@ -1,4 +1,4 @@
-= Client API Lineup
+= Other Clients
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -16,28 +16,4 @@
 // specific language governing permissions and limitations
 // under the License.
 
-The Solr Wiki contains a list of client APIs at http://wiki.apache.org/solr/IntegratingSolr.
-
-Here is the list of client APIs, current at this writing (November 2011):
-
-// TODO: Change column width to %autowidth.spread when https://github.com/asciidoctor/asciidoctor-pdf/issues/599 is fixed
-
-[cols="20,20,60",options="header"]
-|===
-|Name |Environment |URL
-|SolRuby |Ruby |https://github.com/rsolr/rsolr
-|DelSolr |Ruby |https://github.com/avvo/delsolr
-|acts_as_solr |Rails |http://acts-as-solr.rubyforge.org/, http://rubyforge.org/projects/background-solr/
-|Flare |Rails |http://wiki.apache.org/solr/Flare
-|SolPHP |PHP |http://wiki.apache.org/solr/SolPHP
-|SolrJ |Java |http://wiki.apache.org/solr/SolJava
-|Python API |Python |http://wiki.apache.org/solr/SolPython
-|PySolr |Python |http://code.google.com/p/pysolr/
-|SolPerl |Perl |http://wiki.apache.org/solr/SolPerl
-|Solr.pm |Perl |http://search.cpan.org/~garafola/Solr-0.03/lib/Solr.pm
-|SolrForrest |Forrest/Cocoon |http://wiki.apache.org/solr/SolrForrest
-|SolrSharp |C# |http://www.codeplex.com/solrsharp
-|SolColdfusion |ColdFusion |http://solcoldfusion.riaforge.org/
-|SolrNet |.NET |https://github.com/mausch/SolrNet
-|AJAX Solr |AJAX |http://github.com/evolvingweb/ajax-solr/wiki
-|===
+The Solr Wiki contains a list of client APIs at https://cwiki.apache.org/confluence/display/solr/IntegratingSolr.
diff --git a/solr/solr-ref-guide/src/client-apis.adoc b/solr/solr-ref-guide/src/client-apis.adoc
@@ -1,5 +1,5 @@
 = Client APIs
-:page-children: introduction-to-client-apis, choosing-an-output-format, client-api-lineup, using-javascript, using-python, using-solrj, using-solr-from-ruby
+:page-children: introduction-to-client-apis, choosing-an-output-format, using-solrj, using-javascript, using-python, using-solr-from-ruby, client-api-lineup 
 // Licensed to the Apache Software Foundation (ASF) under one
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
@@ -23,14 +23,12 @@ This section discusses the available client APIs for Solr. It covers the followi
 
 <<choosing-an-output-format.adoc#choosing-an-output-format,Choosing an Output Format>>: Information about choosing a response format in Solr.
 
+<<using-solrj.adoc#using-solrj,Using SolrJ>>: Detailed information about SolrJ, an API for working with Java applications.
+
 <<using-javascript.adoc#using-javascript,Using JavaScript>>: Explains why a client API is not needed for JavaScript responses.
 
 <<using-python.adoc#using-python,Using Python>>: Information about Python and JSON responses.
 
-<<client-api-lineup.adoc#client-api-lineup,Client API Lineup>>: A list of all Solr Client APIs, with links.
-
-<<using-solrj.adoc#using-solrj,Using SolrJ>>: Detailed information about SolrJ, an API for working with Java applications.
-
 <<using-solr-from-ruby.adoc#using-solr-from-ruby,Using Solr From Ruby>>: Detailed information about using Solr with Ruby applications.
 
-<<mbean-request-handler.adoc#mbean-request-handler,MBean Request Handler>>: Describes the MBean request handler for programmatic access to Solr server statistics and information.
+<<client-api-lineup.adoc#client-api-lineup,Other Clients>>: How to find links to 3rd-party client libraries.
diff --git a/solr/solr-ref-guide/src/using-javascript.adoc b/solr/solr-ref-guide/src/using-javascript.adoc
@@ -22,6 +22,6 @@ HTTP requests can be sent to Solr using the standard `XMLHttpRequest` mechanism.
 
 By default, Solr sends <<response-writers.adoc#json-response-writer,JavaScript Object Notation (JSON) responses>>, which are easily interpreted in JavaScript. You don't need to add anything to the request URL to have responses sent as JSON.
 
-For more information and an excellent example, read the SolJSON page on the Solr Wiki:
+For more information and an excellent example, take a look at the SolJSON page on the Solr Wiki:
 
-http://wiki.apache.org/solr/SolJSON
+https://cwiki.apache.org/confluence/display/solr/SolJSON#SolJSON-UsingSolr'sJSONoutputforAJAX
diff --git a/solr/solr-ref-guide/src/using-solr-from-ruby.adoc b/solr/solr-ref-guide/src/using-solr-from-ruby.adoc
@@ -111,4 +111,4 @@ puts 'number of matches = ' + rsp['response']['numFound'].to_s
 rsp['response']['docs'].each { |doc| puts 'name field = ' + doc['name'] }
 ----
 
-For simple interactions with Solr, this may be all you need! If you are building complex interactions with Solr, then consider the libraries mentioned at https://wiki.apache.org/solr/Ruby%20Response%20Format
+For simple interactions with Solr, this may be all you need! If you are building complex interactions with Solr, then consider the libraries mentioned in the https://cwiki.apache.org/confluence/display/solr/Ruby+Response+Format#RubyResponseFormat-Libraries[Solr Wiki].