diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index e75644fe..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,30 +0,0 @@ -Contributing to Wine Staging ----------------------------- - -First of all, thank you for taking the time to contribute to this project. - -### Reporting bugs - -Since WineConf 2015 Wine Staging is an official part of WineHQ, which means you -can report problems directly at [bugs.winehq.org](https://bugs.winehq.org/). -Most of the time bugs found in Wine Staging also turn out to be present in the -development branch, so its recommended to open your bug in the "Wine" product, -unless you are sure its really "Wine Staging" specific. For bugs related to our -binary packages, please open a bug report in the "Packaging" product. - -### Submitting patches - -**IMPORTANT:** Please use [dev.wine-staging.com](https://dev.wine-staging.com/patches) -for patch submissions, we currently do not accept Pull requests on GitHub. - -Wine Staging mainly concentrates on experimental features and patches which are -difficult to get into the development branch. If you have a very simple bug fix -including tests, there is usually no need to send it to Wine Staging. You can -directly contribute it to the -[development branch](http://wiki.winehq.org/SubmittingPatches). However, if you -already tried that without success, or are working on such a complex area that -you do not really think its ready for inclusion, you might want to submit it to -our Staging tree. Please open a patch submission request on -[dev.wine-staging.com](https://dev.wine-staging.com/patches) including the patch. -More information is also available in our -[Wiki](https://wiki.winehq.org/Wine-Staging_Patches). diff --git a/LICENSE.md b/LICENSE.md index 1bf866fc..e65e73ad 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -8,7 +8,8 @@ are part of **Wine Staging** and are licensed under the terms of the ``` Copyright (C) 2014-2017 the Wine Staging project authors. -Copyright (C) 2018 Alistair Leslie-Hughes +Copyright (C) 2018 Alistair Leslie-Hughes, Zebediah Figura +Copyright (C) 2019 Alistair Leslie-Hughes, Zebediah Figura, Paul Gofman Wine Staging is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/README.md b/README.md index 45a40136..bf4f03c2 100644 --- a/README.md +++ b/README.md @@ -6,15 +6,14 @@ features, which have not been integrated into the development branch yet. The idea of Wine Staging is to provide experimental features faster to end users and to give developers the possibility to discuss and improve their patches before they are integrated into the main branch. More information about Wine Staging -can also be found on our website [wine-staging.com](http://wine-staging.com). +can also be found [on the WineHQ wiki](https://wiki.winehq.org/Wine-Staging). Installation ------------ Ready-to-use packages for Wine Staging are available for a variety of Linux -distributions and for Mac OS X. Just follow the -[installation instructions](https://wine-staging.com/installation.html) -for your operating system. +distributions and for Mac OS X. Just follow the [installation +instructions](https://wiki.winehq.org/Download) for your operating system. On most distributions the `wine-staging` package is installed to `/opt/wine-staging`, such that multiple Wine versions can be installed in @@ -78,5 +77,6 @@ in our [Wiki](https://wiki.winehq.org/Wine-Staging). Contributing ------------ -Please see CONTRIBUTING.md for more information about contributing to Wine -Staging. +For information on contributing to Wine-Staging, please see +. Note that GitHub pull +requests are strongly dispreferred, especially for patches. \ No newline at end of file