diff --git a/docs/commands/global.md b/docs/commands/global.md index 1ef5857..4c6afce 100644 --- a/docs/commands/global.md +++ b/docs/commands/global.md @@ -22,5 +22,17 @@ The global restart command stops all servers, and then restarts only the previou *See the [Active vs Inactive Servers Page][active-vs-inactive] for a more information on the differences between an active and an inactive server.* + version + +Displays the verison of MSM you are running. Useful when reporting bugs, or looking to upgrade. + + config + +Displays a list of values MSM is using that can be configured. Anything in this list can be overriden in `/etc/msm.conf`. + + update [--noinput] + +Updates MSM files to the latest versions. Will ask for confirmation before overwriting your files. However one may disable this requirement with the `--noinput` flag. + [active-vs-inactive]: {{ site.baseurl }}docs/concepts/active-vs-inactive.html \ No newline at end of file diff --git a/docs/commands/in-game.md b/docs/commands/in-game.md index 4e10d43..12645a4 100644 --- a/docs/commands/in-game.md +++ b/docs/commands/in-game.md @@ -14,7 +14,7 @@ These commands can also be called "server commands" but effect who can play, and A whitelist is a set of names defining who is allowed onto a server. If a player attempts to logon to a server with a whitelist enabled, and their name is not on that whitelist, they cannot join and are told why. This command turns a whitelist on or off. -Note the use of the `|` character means "or", for example `creativeserver whitelist on` is acceptable or `creativeserver wl off`, but not `creativeserver wl on off` or `creativeserver whitelist wl on` or `creativeserver whitelist on|off`. +Note the use of the `|` character means "or", for example `msm creativeserver whitelist on` is acceptable or `msm creativeserver wl off`, but not `msm creativeserver wl on off` or `msm creativeserver whitelist wl on` or `msm creativeserver whitelist on|off`. whitelist|wl list @@ -54,7 +54,7 @@ Forcibly disconnects a player. say -Broadcast a message to all players which appears in bright pink, the invocation `creativeserver say "Hello all"` would produce: `[SERVER]: Hello all`. +Broadcast a message to all players which appears in bright pink, the invocation `msm creativeserver say Hello all` would produce: `[SERVER]: Hello all`. time set|add @@ -82,7 +82,7 @@ Forces the writing of all pending unsaved changes to file. cmd -Sends a command to the server, for example: `creativeserver cmd "tp craftysaurus MrWizardBeef"`. +Sends a command to the server, for example: `msm creativeserver cmd tp craftysaurus MrWizardBeef`. cmdlog diff --git a/docs/commands/index.md b/docs/commands/index.md index bd63ae0..4097891 100644 --- a/docs/commands/index.md +++ b/docs/commands/index.md @@ -76,6 +76,7 @@ You can always get a quick list of commands by typing `msm help`, which outputs restart [now] Restarts all active servers version Prints the Minecraft Server Manager version installed config Displays a list of the config values used by MSM + update [--noinput] Replaces MSM files with the latest recommended versions diff --git a/docs/updating.md b/docs/updating.md index 628a76a..92868d1 100644 --- a/docs/updating.md +++ b/docs/updating.md @@ -8,13 +8,15 @@ docsitem: updating Updating ======== -New versions of MSM contain new features, more reliable code, bug fixes, and contributions from the community. Since MSM is a single script replacing it with the new version is enough to get up to date. +New versions of MSM contain new features, more reliable code, bug fixes, and contributions from the community. Since version `0.8.0` MSM has an inbuilt command to download and install everything for you automatically. Don't worry, **it will ask for confirmation** before overwriting your files. -The MSM code repository is managed by git source control, and has tags which mark versions as well as a special tag called `latest` which always points to the recommended latest version. + sudo msm update -Downloading the Latest Version ------------------------------- +Manually updating +----------------- + +If you are upgrading from a version of MSM that does not have the update command, you will have to do one thing by hand. Download and replace your MSM script file with the latest version: sudo wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/init/msm -O /etc/init.d/msm sudo wget https://raw.github.com/marcuswhybrow/minecraft-server-manager/latest/bash_completion/msm -O /etc/bash_completion.d/msm