GitHub user AhyoungRyu reopened a pull request: https://github.com/apache/incubator-zeppelin/pull/907
Update/shiro docs ### What is this PR for? Currently, Zeppelin has two authentication docs. One is [**Authentication**](https://zeppelin.incubator.apache.org/docs/0.6.0-incubating-SNAPSHOT/security/authentication.html) and the other is [**Shiro Authentication**](https://zeppelin.incubator.apache.org/docs/0.6.0-incubating-SNAPSHOT/manual/shiroauthentication.html). As a user, it's little bit confused. So I changed the category of `shiroauthentication.md` file from `manual` to `security` and also changed the name of `Authentication` to `Authentication for NGINX`. Please see the below screenshot images :) ### What type of PR is it? Improvement ### Todos * [x] - Add `conf/shiro.ini` file to `.gitignore` * [x] - Update `zeppelin-login.png` screenshot image file in `shiroauthentication.md` * [x] - Change the category of `shiroauthentication.md` file from `manual` -> `security` * [x] - Change `Authentication` -> `Authentication for NGINX` ### What is the Jira issue? ### How should this be tested? ### Screenshots (if appropriate) 1. Updating zeppelin-login.png - before ![zeppelin-login 1](https://cloud.githubusercontent.com/assets/10060731/15422239/7ad7cf0c-1eb2-11e6-9106-70d5833d99af.png) - after <img width="1272" alt="zeppelin-login" src="https://cloud.githubusercontent.com/assets/10060731/15422244/812541e6-1eb2-11e6-89bc-ed635bc9aaa8.png"> 2. Changing the category of **Shiro Authentication** & Changing **Authentication** -> **Authentication for NGINX** - before ![screen shot 2016-05-20 at 5 31 34 pm](https://cloud.githubusercontent.com/assets/10060731/15422261/9c63cd92-1eb2-11e6-938d-959ff5ebbb0d.png) - after ![screen shot 2016-05-20 at 5 31 19 pm](https://cloud.githubusercontent.com/assets/10060731/15422270/a4a06d6c-1eb2-11e6-90ff-5ad18cb2ac61.png) ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No You can merge this pull request into a Git repository by running: $ git pull https://github.com/AhyoungRyu/incubator-zeppelin update/shiroDocs Alternatively you can review and apply these changes as the patch at: https://github.com/apache/incubator-zeppelin/pull/907.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #907 ---- commit 122afc23550cd0ef35616e02c6092828a4a4db2b Author: AhyoungRyu <fbdkdu...@hanmail.net> Date: 2016-05-20T08:24:18Z Add conf/shiro.ini file to .gitignore commit 20b8ae9c072f100dbbe683f5eec19d4eed39beb3 Author: AhyoungRyu <fbdkdu...@hanmail.net> Date: 2016-05-20T08:25:19Z Update login screenshot image in shiroauthentication.md commit 749ce8c5ef09693f943114778e4ecc091284cbba Author: AhyoungRyu <fbdkdu...@hanmail.net> Date: 2016-05-20T08:32:35Z Change shiroauthentication.md location commit d290937ac899e87ea251ab98b20d652a344dc6d5 Author: AhyoungRyu <fbdkdu...@hanmail.net> Date: 2016-05-20T08:33:33Z Change Shiro Authentication docs category commit 95d37ab8f4abebf118d85507e3580b2ef7883942 Author: AhyoungRyu <fbdkdu...@hanmail.net> Date: 2016-05-20T08:34:01Z Change title Authentication -> Authentication for NGINX ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---