Merge remote-tracking branch 'upstream/master' into mavenize

# Conflicts:
#	README.md
#	debian/copyright
#	doc/authorization_howto.txt
#	doc/groups_howto.txt
#	jrcs/pom.xml
#	opengrok-indexer/pom.xml
#	opengrok-indexer/src/main/java/org/opengrok/indexer/search/Search.java
#	opengrok-indexer/src/test/java/org/opengrok/indexer/search/SearchTest.java
#	opengrok-web/pom.xml
#	plugins/pom.xml
#	pom.xml

Author: ahornace

README.md

@@ -12,13 +12,12 @@ Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
 3.  [Usage](#3-usage)
 4.  [OpenGrok install](#4-opengrok-install)
 5.  [OpenGrok setup](#5-opengrok-setup)
-6.  [Optional Command Line Interface Usage](#6-optional-command-line-interface-usage)
-7.  [Change web application properties or name](#7-change-web-application-properties-or-name)
-8.  [Information for developers](#8-information-for-developers)
-9.  [Tuning OpenGrok for large code bases](#9-tuning-opengrok-for-large-code-bases)
-10. [Authors](#10-authors)
-11. [Contact us](#11-contact-us)
-12. [Demo](#12-demo)
+6.  [Change web application properties or name](#7-change-web-application-properties-or-name)
+7.  [Information for developers](#8-information-for-developers)
+8.  [Tuning OpenGrok for large code bases](#9-tuning-opengrok-for-large-code-bases)
+9. [Authors](#10-authors)
+10. [Contact us](#11-contact-us)
+11. [Demo](#12-demo)
 
 ## 1. Introduction
 
@@ -254,7 +253,9 @@ them and index them.
 
 It basically works like this:
 
-1. bootstrap initial configuration: OpenGrok bootstrap
+1. create initial configuration:
+
+  `OpenGrok bootstrap`
 
   * this will create `/var/opengrok/etc/configuration.xml` with basic set of
     properties. If more is needed use:
@@ -266,7 +267,7 @@ It basically works like this:
 2. add a new project **foo**:
 
   ```
-  Messages -t foo -n project add
+  curl -d "foo" -H "Content-Type: text/plain" -X POST "${webapp_uri}/api/v1/projects"
   ```
 
   * the project **foo** is now visible in the configuration however is not yet
@@ -280,8 +281,8 @@ It basically works like this:
 3. index the project. It will become searchable after that.
 
   ```
-  OPENGROK_READ_XML_CONFIGURATION=/var/opengrok/etc/configuration.xml
-  OpenGrok indexpart /foo
+  OPENGROK_READ_XML_CONFIGURATION=/var/opengrok/etc/configuration.xml \
+      OpenGrok indexpart /foo
   ```
 
 4. make the project `indexed` status of the project persistent so that if
@@ -314,9 +315,9 @@ project to this directory. The creation of the per-project directory and the
 The command used in step 2 can thus look like this:
 
 ```bash
-OPENGROK_LOGGER_CONFIG_PATH=/var/opengrok/myproj.logging
-OPENGROK_READ_XML_CONFIGURATION=/var/opengrok/etc/configuration.xml
-OpenGrok indexpart /myproj
+OPENGROK_LOGGER_CONFIG_PATH=/var/opengrok/myproj.logging \
+    OPENGROK_READ_XML_CONFIGURATION=/var/opengrok/etc/configuration.xml \
+    OpenGrok indexpart /myproj
 ```
 
 The last argument is path relative to `SRC_ROOT`.
@@ -344,33 +345,6 @@ configuration into a separate file and simplify future upgrades.
 
   See `opengrok.jar` manual below for more details.
 
-#### 5.4.5 Custom ctags configuration
-
-To make ctags recognize additional symbols/definitions/etc. it is possible to
-specify configuration file with extra configuration options for ctags.
-
-This can be done by setting `OPENGROK_CTAGS_OPTIONS_FILE` environment variable
-when running the OpenGrok shell script (or directly with the `-o` option for
-`opengrok.jar`). Default location for the configuration file in the OpenGrok
-shell script is `etc/ctags.config` under the OpenGrok base directory (by default
-the full path to the file will be `/var/opengrok/etc/ctags.config`).
-
-Sample configuration file for Solaris code base is delivered in the `doc/`
-directory.
-
-### 5.6 Introduce own mapping for an extension to analyzer
-
-OpenGrok script doesn't support this out of box, so you'd need to add it there.
-Usually to `StdInvocation()` function after line `-jar ${OPENGROK_JAR}`.
-It would look like this:
-
-```
--A cs:org.opengrok.indexer.analysis.PlainAnalyzer
-```
-
-(this will map extension `.cs` to `PlainAnalyzer`)
-You should even be able to override OpenGroks analyzers using this option.
-
 ### 5.7 Logging
 
 Both indexer and web app emit extensive log messages.
@@ -386,43 +360,25 @@ If not using the shell script, the path to the configuration file can be
 set using the `-Djava.util.logging.config.file=/PATH/TO/MY/logging.properties`
 java parameter.
 
-
-## 6. Optional Command Line Interface Usage
-
-You need to pass location of project file + the query to `Search` class, e.g.
-for fulltext search for project with above generated `configuration.xml` you'd
-do:
-
-```bash
-java -cp ./opengrok.jar org.opengrok.indexer.search.Search -R \
-    /var/opengrok/etc/configuration.xml -f fulltext_search_string
-```
- For quick help run:
-
-```bash
-java -cp ./opengrok.jar org.opengrok.indexer.search.Search
-```
-
-## 7. Change web application properties or name
+## 6. Change web application properties or name
 
 See https://github.com/oracle/opengrok/wiki/Webapp-configuration
 
-
-## 8. Information for developers
+## 7. Information for developers
 
 See https://github.com/oracle/opengrok/wiki/Developer-intro and https://github.com/oracle/opengrok/wiki/Developers
 
-## 9. Tuning OpenGrok for large code bases
+## 8. Tuning OpenGrok for large code bases
 
 See https://github.com/oracle/opengrok/wiki/Tuning-for-large-code-bases
 
-## 10. Authors
+## 9. Authors
 
 The project has been originally conceived in Sun Microsystems by Chandan B.N.
 
 For full list of contributors see https://github.com/oracle/opengrok/graphs/contributors
 
-## 11. Contact us
+## 10. Contact us
 
 Feel free to participate in discussion on the mailing lists:
 
@@ -432,5 +388,6 @@ Feel free to participate in discussion on the mailing lists:
 
 To subscribe, send email to `<mailing_list_name>[email protected]`
 
-## 12. Demo
+## 11. Demo
+
 Visit <http://demo.opengrok.org>