Skip to content

Commit

Permalink
MAINT: Remove mentions of the Mumble wiki
Browse files Browse the repository at this point in the history
  • Loading branch information
Hartmnt committed Sep 23, 2024
1 parent 36fc37c commit 7ab477b
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 25 deletions.
36 changes: 20 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@
Mumble is an Open Source, low-latency and high-quality voice-chat program
written on top of Qt and Opus.

There are two modules in Mumble; the client (mumble) and the server (murmur).
There are two modules in Mumble; the client (mumble) and the server (mumble-server formerly known as murmur).
The client works on Windows, Linux, FreeBSD, OpenBSD, and macOS,
while the server should work on anything Qt can be installed on.

The documentation of the project can be found on the [wiki](https://wiki.mumble.info/wiki/Main_Page). The
[FAQ](https://wiki.mumble.info/wiki/FAQ/English) can also be found there.
The documentation of the project can be found on [the website](https://www.mumble.info/documentation/).


## Contributing
Expand Down Expand Up @@ -64,12 +63,12 @@ We graciously acknowledge that this program uses free code signing provided by
After installation, you should have a new Mumble folder in your
Start Menu, from which you can start Mumble.

### Running Murmur
### Running Mumble-Server

Double-click the Murmur icon to start Murmur. There will be a small icon on your
Double-click the icon to start ``mumble-server``. There will be a small icon on your
taskbar from which you can view the log.

To set the superuser password, run murmur with the parameters `-supw <password>`.
To set the superuser password, run ``mumble-server`` with the parameters `-supw <password>`.


## MacOS
Expand All @@ -79,13 +78,13 @@ To set the superuser password, run murmur with the parameters `-supw <password>`
To install Mumble, drag the application from the downloaded
disk image into your `/Applications` folder.

### Running Murmur
### Running Mumble-Server

Murmur is distributed separately from the Mumble client on MacOS.
``mumble-server`` is distributed separately from the Mumble client on MacOS.
It is called Static OS X Server and can be downloaded from the main webpage.

Once downloaded it can be run in the same way as on any other Unix-like system.
For more information please see the "Running Murmur" in the Linux/Unix section below.
For more information please see the "Running mumble-server" in the Linux/Unix section below.


## Linux/Unix
Expand All @@ -96,21 +95,21 @@ If you have installed Mumble through your distribution package
repository, you should be able to find Mumble in your start menu. No
additional steps are necessary.

### Running Murmur
### Running Mumble-Server

Murmur should be run from the command line, so start a shell (command prompt)
and go to wherever you installed Mumble. Run murmur as
``mumble-server`` should be run from the command line, so start a shell (command prompt)
and go to wherever you installed Mumble. Run ``mumble-server`` as

```
murmurd [-supw <password>] [-ini <inifile>] [-fg] [v]
mumble-server [-supw <password>] [-ini <inifile>] [-fg] [v]
-supw Set a new password for the user SuperUser, which is hardcoded to
bypass ACLs. Keep this password safe. Until you set a password,
the SuperUser is disabled. If you use this option, murmur will
the SuperUser is disabled. If you use this option, mumble-server will
set the password in the database and then exit.
-ini Use an inifile other than murmur.ini, use this to run several instances
of murmur from the same directory. Make sure each instance is using
-ini Use an inifile other than mumble-server.ini, use this to run several instances
of mumble-server from the same directory. Make sure each instance is using
a separate database.
-fg Run in the foreground, logging to standard output.
Expand All @@ -131,6 +130,11 @@ You can also specify the user ID (UID) and group ID (GID) for the *murmur* user
docker build --pull -t mumble-server --build-arg UID=1234 --build-arg GID=1234 github.com/mumble-voip/mumble#master
```

### Server configuration

You can find an up-to-date ``mumble-server`` configuration template in [this repository](auxiliary_files/mumble-server.ini).
Further server configuration documentation can be found [on the project website](https://www.mumble.info/documentation/administration/).

### OpenGL Overlay

The OpenGL overlay works by intercepting the call to switch buffers, and just
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
</content_rating>
<url type="homepage">@CMAKE_PROJECT_HOMEPAGE_URL@</url>
<url type="bugtracker">https://github.com/mumble-voip/mumble/issues</url>
<url type="help">https://wiki.mumble.info/wiki/Main_Page</url>
<url type="help">https://www.mumble.info/documentation</url>
<url type="donation">https://liberapay.com/mumble</url>
<url type="translate">https://wiki.mumble.info/wiki/Language_Translation</url>
<url type="translate">https://github.com/mumble-voip/mumble/blob/master/README.md#translating</url>
<launchable type="desktop-id">info.mumble.Mumble.desktop</launchable>
<screenshots>
<screenshot type="default">
Expand Down
5 changes: 1 addition & 4 deletions docs/dev/ExtendingTheIceInterface.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ interact with the server. A small amount of configuration is required, namely:
> any other case.
An existing Python Ice client is [`mice.py`](https://github.com/mumble-voip/mumble-scripts/blob/master/Helpers/mice.py), which simply creates
necessary Ice objects and then drops you into an interactive Python shell. (Refer to the [Wiki](https://wiki.mumble.info/wiki/Mice) and
[Natenom](https://blog.natenom.com/2016/02/an-introduction-on-how-to-manage-your-mumble-server-murmur-through-ice-with-mice/) for longer guides.)
necessary Ice objects and then drops you into an interactive Python shell.

```python
# Make sure the Mumble server is running (in a separate terminal)
Expand Down Expand Up @@ -144,6 +143,4 @@ In [5]: [(user.session, user.name) for user in s.getUsers().values()]
Out[5]: [(7L, 'Bob')]
```

> :information_source: Refer to [the Wiki for additional 3rd-party applications](https://wiki.mumble.info/wiki/3rd_Party_Applications) which leverage
> the server's Ice interface.

3 changes: 1 addition & 2 deletions docs/dev/TheMumbleSourceCode.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ The `cmake` directory contains a few cmake scripts that are needed to make the b
issue (or extend the build system), you can probably ignore this directory.

Obviously you are already aware of the `docs` directory (you are reading this file, which lives in there). It contains mostly development related
documentation. The more extended user documentation is available on our website or (depending on how far we have gotten to migrate it yet) on our
wiki. The most relevant documentation for you is probably within the `dev` (development) subdirectory.
documentation. The more extended user documentation is available on our website. The most relevant documentation for you is probably within the `dev` (development) subdirectory.

`g15helper` and `helper` will generally not concern you. We could probably find a better place for these, but at the moment they are where they are…

Expand Down
2 changes: 1 addition & 1 deletion src/mumble/NetworkConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ void NetworkConfig::on_qcbAutoUpdate_stateChanged(int state) {
"version from your distribution's package repository that have their own update cycles.</p>"
"<p>If you want to always have the most recent Mumble version, you should consider using a "
"different method of installation.\n"
"See <a href=\"https://wiki.mumble.info/wiki/Installing_Mumble\">the Mumble wiki</a> for what "
"See <a href=\"https://github.com/mumble-voip/mumble\">the project repository</a> for what "
"alternatives there are.</p>"));
msgBox.setIcon(QMessageBox::Warning);
msgBox.exec();
Expand Down

0 comments on commit 7ab477b

Please sign in to comment.