From 7b4922d42839952b4766bc2e5717bb0859d8df4f Mon Sep 17 00:00:00 2001 From: Marcus Whybrow Date: Sun, 12 Aug 2012 03:52:26 +0100 Subject: [PATCH] Fix jekyll links --- docs/commands/global.md | 2 +- docs/commands/server.md | 2 +- docs/concepts/active-vs-inactive.md | 2 +- docs/concepts/layout.md | 4 ++-- docs/configuration/msm.md | 2 +- docs/configuration/server.md | 31 ++--------------------------- docs/index.html | 2 +- 7 files changed, 9 insertions(+), 36 deletions(-) diff --git a/docs/commands/global.md b/docs/commands/global.md index 4c6afce..4b4a1e0 100644 --- a/docs/commands/global.md +++ b/docs/commands/global.md @@ -35,4 +35,4 @@ Displays a list of values MSM is using that can be configured. Anything in this 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 +[active-vs-inactive]: {{ site.baseurl }}/docs/concepts/active-vs-inactive.html \ No newline at end of file diff --git a/docs/commands/server.md b/docs/commands/server.md index 964ad1e..daf5864 100644 --- a/docs/commands/server.md +++ b/docs/commands/server.md @@ -95,4 +95,4 @@ This command may be a good entry point for admins not familiar with command line [we-snapshots]: http://wiki.sk89q.com/wiki/WorldEdit/Snapshots -[active-vs-inactive]: {{ site.baseurl }}docs/concepts/active-vs-inactive.html \ No newline at end of file +[active-vs-inactive]: {{ site.baseurl }}/docs/concepts/active-vs-inactive.html \ No newline at end of file diff --git a/docs/concepts/active-vs-inactive.md b/docs/concepts/active-vs-inactive.md index 50d6899..aee7ed5 100644 --- a/docs/concepts/active-vs-inactive.md +++ b/docs/concepts/active-vs-inactive.md @@ -58,4 +58,4 @@ The global restart command stops all severs, preserving the active/inactive stat *Again, see the [Commands Page][commands] for more information on commands.* -[commands]: {{ site.baseurl }}docs/commands/ \ No newline at end of file +[commands]: {{ site.baseurl }}/docs/commands/ \ No newline at end of file diff --git a/docs/concepts/layout.md b/docs/concepts/layout.md index 6a86888..4a90ea0 100644 --- a/docs/concepts/layout.md +++ b/docs/concepts/layout.md @@ -34,6 +34,6 @@ So a typical Bukkit server managed by MSM would look like this: MSM expects to find your worlds in the `worldstorage` folder. This allows MSM to reliably determine which folders are worlds for making backups, moving worlds into RAM and other behind the scenes stuff. -**Advanced:** *You can change the location MSM expects to find world using the `msm-world-storage-path` setting in your server's `server.properties` file. See [Cofniguration → Individual Server][config-server] for more info.* +**Advanced:** *You can change the location MSM expects to find world using the `msm-world-storage-path` setting in your server's `server.properties` file. See [Configuration → Individual Server][config-server] for more info.* -[config-server]: {{ site.baseurl }}docs/configuration/server.html \ No newline at end of file +[config-server]: {{ site.baseurl }}/docs/configuration/server.html \ No newline at end of file diff --git a/docs/configuration/msm.md b/docs/configuration/msm.md index 91b36bb..e2f087f 100644 --- a/docs/configuration/msm.md +++ b/docs/configuration/msm.md @@ -24,7 +24,7 @@ Default Values MSM has default values for all possible settings. This means that `/etc/msm.conf` could be left blank and MSM would still work with sensible defaults. -It is however advised that each value be explicitly defined nonetheless, allowing admins to be sure of what MSM is doing. The installation documentation encourages this approach by downloading the msm.conf file ready with default values. +It is however advised that each value be explicitly defined nonetheless, allowing admins to be sure of what MSM is doing. The installation documentation encourages this approach by downloading the msm.conf file ready with default values. Server Defaults --------------- diff --git a/docs/configuration/server.md b/docs/configuration/server.md index ed76e18..684c17a 100644 --- a/docs/configuration/server.md +++ b/docs/configuration/server.md @@ -25,6 +25,7 @@ Remember an absolute path is one that starts with a forwards slash, whereas a re These options cover starting the server in the way you want: msm-username= # The linux user used to start the server + msm-version= # Set the Minecraft verion so MSM knows how to talk it's language **IMPORTANT** msm-screen-name= # The name used to reference the screen session for this server msm-world-storage-path= # The directory (relative to the server directory) to store worlds in msm-world-storage-inactive-path= # The directory to store unused worlds @@ -61,32 +62,4 @@ When interruptions to the normal experience occur, it's nice to give players som msm-message-complete-backup-started= # The message shown to players when starting to backup the entire server msm-message-complete-backup-finished= # The message shown to players when finished backing up the entire server -## Log Confirmation - -To be as responsive as possible, MSM determines exactly when a command has completed by watching the server logs for specific entries. When that entry is found, the command can return. If Minecraft server changes the messages it logs (for "save-on", "save-off", "save-all" and when starting up) these values should be altered in `/etc/msm.conf` globally if possible. However if a single server has a different version to the rest you may override what log entries to wait for in a server's `server.conf` file. - -Each setting value when set constitutes part of a regular expression used to look for that log entry. As such one may use any special regular expression characters to better define the entry. - - msm-confirm-save-on= # The log entry (following "[INFO]") which confirms the "save-on" command has completed. - msm-confirm-save-off= # The log entry that confirms the "save-off" command has completed. - msm-confirm-save-all= # The log entry that confirms the "save-all" command has completed. - msm-confirm-start= # The log entry that confirms the server has finished starting up. - msm-confirm-kick= # The log entry that confirms a user has been kicked - msm-confirm-kick-fail= # The log entry that confirms a user has not been kicked - msm-confirm-time-set= # The log entry that confirms the time has been set - msm-confirm-time-set-fail= # The log entry that confirms the time format was invalid - msm-confirm-time-add= # The log entry that confirms the time has been incremented - msm-confirm-time-add-fail= # The log entry that confirms the time format was invalid - msm-confirm-toggledownfall= # The log entry that confirms the toggle of down fall - msm-confirm-toggledownfall-fail= # The log entry that confirms the world specified for toggling did not exit - msm-confirm-gamemode= # The log entry that confirms as user's game mode was changed - msm-confirm-gamemode-fail-no-user= # The log entry that confirms the specified user was not found - msm-confirm-gamemode-fail-no-change= # The log entry that confirms the user was already in that mode - msm-confirm-give= # The log entry that confirms a player was given an entity - msm-confirm-give-fail-no-user= # The log entry that confirms the specified user was not found - msm-confirm-give-fail-no-item= # The log entry that confirms the item ID/name was not found - msm-confirm-xp= # The log entry that confirms the XP was awarded to a player - msm-confirm-xp-fail-no-user= # The log entry that confirms the specified user was not found - msm-confirm-xp-fail-invalid-amount= # The log entry that confirms the XP amount was an invalid format - -[global-config]: {{ site.baseurl }}docs/configuration/msm.html \ No newline at end of file +[global-config]: {{ site.baseurl }}/docs/configuration/msm.html \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 9de4d71..9d0aa50 100644 --- a/docs/index.html +++ b/docs/index.html @@ -7,7 +7,7 @@ docsitem: home

Getting Started

-

If your looking to get going see the Install guide, then peruse the commands. After that maybe watch the project for updates on GitHub and join the MSM community.

+

If your looking to get going see the Install guide, then peruse the commands. After that maybe watch the project for updates on GitHub and join the MSM community.