change payara to app server #6593

doc/sphinx-guides/source/installation/r-rapache-tworavens.rst

@@ -80,7 +80,7 @@ server to download the file **directly from the Dataverse application**. Access
 URLs need to be configured for this to work properly (this is done by the TwoRavens 
 installer script in step ``3.``)  
 
-If you install all components on a single server and front Payara with Apache 
+If you install all components on a single server and front the app server with Apache 
 (see :ref:`network-ports` under the :doc:`config` section), the component and 
 data flow diagram might looks something like this:
 
@@ -293,7 +293,7 @@ Dataverse URL         ``http://{your hostname}:8080``     URL of the Dataverse t
 Please note the default values above. The installer assumes 
 
 - that you are running both the Dataverse and TwoRavens/rApache on the same host; 
-- the default ports for Apache (80) and Payara that is serving your Dataverse (8080); 
+- the default ports for Apache (80) and the app server that is serving your Dataverse (8080); 
 - ``http`` (not ``https``!) for both . 
 
 This configuration is recommended if you are simply trying out/testing Dataverse 
@@ -332,7 +332,7 @@ Compare the two files. **It is important that the two copies are identical**.
 
 **If different**: 
 
-- the **TwoRavens version wins**. Meaning, you need to copy the version supplied with this TwoRavens distribution and overwrite the Payara version (above); then restart Payara. 
+- the **TwoRavens version wins**. Meaning, you need to copy the version supplied with this TwoRavens distribution and overwrite the app server version (above); then restart the app server. 
 
 - unless this is a brand new Dataverse installation, it may have cached summary statistics fragments that were produced with the older version of this R code. You **must remove** all such cached files::
 
@@ -370,7 +370,7 @@ If the file does NOT appear as Tabular Data - if it is shown as Stata/dta,
 and no tabular attributes - the numbers of Variables and Observations and the UNF - 
 are being displayed, try to refresh the page a couple of times. If that doesn't 
 change the view to Tabular, it likely means that something went very wrong with the 
-tabular ingest. Consult the Payara server log for any error messages that may 
+tabular ingest. Consult the app server log for any error messages that may 
 explain the failure. 
 
 If the file is showing as Tabular Data, but the ``Explore`` button isn't present, 
@@ -420,9 +420,9 @@ You should get the output that looks like this::
         ...
 
 If you are getting an error message instead, this is likely an Rserve connection problem. 
-Consult the Payara server log for any Rserve-related "connection refused" messages. 
+Consult the app server log for any Rserve-related "connection refused" messages. 
 See if Rserve is running, and start it with ``service rserve start``, if necessary. 
-Check if the Rserve host name, username and password in the Payara configuration match 
+Check if the Rserve host name, username and password in the app server configuration match 
 the actual Rserve configuration. (this is discussed in the section ``2.`` of the guide). 
 Correct this, if necessary, then try again. 
 
@@ -446,7 +446,7 @@ Symptom: the variables view is initialized properly, but no model output appears
 I. Ports configuration discussion
 ---------------------------------
 
-By default, Payara will install itself on ports 8080 and 8181 (for
+By default, the app server will install itself on ports 8080 and 8181 (for
 ``HTTP`` and ``HTTPS``, respectively). Apache will install itself on port 80 
 (the default port for ``HTTP``). Under this configuration, your Dataverse will 
 be accessible at ``http://{your host}:8080``, and rApache at 
@@ -460,16 +460,16 @@ defaults, and you should have a working installation in no
 time. However, if you are planning to use this installation to
 actually serve data to real users, you will most likely want to run your Dataverse 
 on a standard port; and to use ``HTTPS``. It is definitely possible to configure 
-Payara to serve the application under ``HTTPS`` on port 443. However, we 
-**do not recommend** this setup! For at least 2 reasons: 1. Running Payara on 
+the app server to serve the application under ``HTTPS`` on port 443. However, we 
+**do not recommend** this setup! For at least 2 reasons: 1. Running the app server on 
 port 443 will require you to **run it as root** user; which should be avoided, 
 if possible, for reasons of security. Also, 2) installing ``SSL`` certificates under 
-Payara is unnecessarily complicated. The alternative configuration that 
-we recommend is to "hide" your Payara behind Apache. In this setup Apache 
+the app server is unnecessarily complicated. The alternative configuration that 
+we recommend is to "hide" your app server behind Apache. In this setup Apache 
 serves as the ``HTTPS`` front running on port 443, proxying the traffic to 
-Payara using ``mod_proxy_ajp``; and Payara is running as 
+the app server using ``mod_proxy_ajp``; and the app server is running as 
 an non-privileged user on a high port that's not accessible from the outside. 
-Unlike Payara, Apache has a mechanism for running on a privileged port (in 
+Unlike the app server, Apache has a mechanism for running on a privileged port (in 
 this case, 443) as a non-privileged user. It is possible to use this 
 configuration, and have this Apache instance serve TwoRavens and rApache too, 
 all on the same server. Please see :ref:`network-ports` under the :doc:`config`