Skip to content

Document --credentials, --apikey and --sessionkey; remove -k (duplicate)#3360

Merged
muxator merged 3 commits intoether:developfrom
michael-dev:feature/add-argv-to-docs
Aug 9, 2018
Merged

Document --credentials, --apikey and --sessionkey; remove -k (duplicate)#3360
muxator merged 3 commits intoether:developfrom
michael-dev:feature/add-argv-to-docs

Conversation

@michael-dev
Copy link
Copy Markdown
Contributor

This pull requests adds some basic documentation for --credentials, --apikey and --sessionkey.
It removes the -k option, as it is currently used for both apikey and sessionkey.

Comment thread README.md Outdated

## Tweak the settings
You can initially modify the settings in `settings.json`. (If you need to handle multiple settings files, you can pass the path to a settings file to `bin/run.sh` using the `-s|--settings` option. This allows you to run multiple Etherpad instances from the same installation.) Once you have access to your /admin section settings can be modified through the web browser.
You can initially modify the settings in `settings.json`. (If you need to handle multiple settings files, you can pass the path to a settings file to `bin/run.sh` using the `-s|--settings` option. This allows you to run multiple Etherpad instances from the same installation. Similarly '--credentials' can be used to give an settings override file, '--apikey' to give a different APIKEY.txt file and '--sessionkey' to give a non-default SESSIONKEY.txt.) Once you have access to your /admin section settings can be modified through the web browser.
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we stick to using ` around arguments, as in setting's example?

Comment thread src/node/utils/Cli.js
}

// Override location of settings.json file
if ( prevArg == '--sessionkey' || prevArg == '-k' ) {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing an argument ruins backward compatibility.
Was this argument so broken that removing it is not going to break any installation?

I am 100% ok merging the doc changes, but would like some details on this change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants