Merge pull request #1134 from OSInside/update_org_references
Update documentation references
This commit is contained in:
commit
d8f782a74e
12
README.rst
12
README.rst
@ -1,15 +1,15 @@
|
||||
KIWI - Next Generation
|
||||
======================
|
||||
|
||||
.. |Build Status| image:: https://travis-ci.com/SUSE/kiwi.svg?branch=master
|
||||
:target: https://travis-ci.com/SUSE/kiwi
|
||||
.. |Build Status| image:: https://travis-ci.com/OSInside/kiwi.svg?branch=master
|
||||
:target: https://travis-ci.com/OSInside/kiwi
|
||||
.. |GitLab CI Pipeline| image:: https://gitlab.com/schaefi/kiwi-ci/badges/master/pipeline.svg
|
||||
:target: https://gitlab.com/schaefi/kiwi-ci/pipelines
|
||||
.. |Health| image:: https://api.codacy.com/project/badge/Grade/8ebd8ce362294fabb0870f50358e564f
|
||||
:target: https://www.codacy.com/app/Appliances/kiwi?utm_source=github.com&utm_medium=referral&utm_content=SUSE/kiwi&utm_campaign=Badge_Grade
|
||||
.. |Doc| replace:: `Documentation <https://opensource.suse.com/kiwi>`__
|
||||
.. |Installation| replace:: `Installation <https://opensource.suse.com/kiwi/installation.html>`__
|
||||
.. |Contributing| replace:: `Contributing <https://opensource.suse.com/kiwi/development.html>`__
|
||||
:target: https://www.codacy.com/app/Appliances/kiwi?utm_source=github.com&utm_medium=referral&utm_content=OSInside/kiwi&utm_campaign=Badge_Grade
|
||||
.. |Doc| replace:: `Documentation <https://osinside.github.io/kiwi/>`__
|
||||
.. |Installation| replace:: `Installation <https://osinside.github.io/kiwi/installation.html>`__
|
||||
.. |Contributing| replace:: `Contributing <https://osinside.github.io/kiwi/development.html>`__
|
||||
.. |Donate| image:: https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif
|
||||
:target: https://www.paypal.me/SchaeferMarcus
|
||||
|
||||
|
||||
@ -165,9 +165,9 @@ pygments_style = 'sphinx'
|
||||
todo_include_todos = True
|
||||
|
||||
extlinks = {
|
||||
'issue': ('https://github.com/SUSE/kiwi/issues/%s', '#'),
|
||||
'pr': ('https://github.com/SUSE/kiwi/pull/%s', 'PR #'),
|
||||
'ghkiwi': ('https://github.com/SUSE/kiwi/blob/master/%s', '')
|
||||
'issue': ('https://github.com/OSInside/kiwi/issues/%s', '#'),
|
||||
'pr': ('https://github.com/OSInside/kiwi/pull/%s', 'PR #'),
|
||||
'ghkiwi': ('https://github.com/OSInside/kiwi/blob/master/%s', '')
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -20,12 +20,12 @@ driven development rules.
|
||||
|
||||
If you want to implement a bigger feature, consider opening an issue on
|
||||
GitHub first to discuss the changes. Or join the discussion in the
|
||||
``#kiwi`` channel on `Riot.im <https://riot.im/>`_.
|
||||
``#kiwi`` channel on `Riot.im <https://about.riot.im>`_.
|
||||
|
||||
Fork the upstream KIWI repository
|
||||
---------------------------------
|
||||
|
||||
1. On GitHub, navigate to: https://github.com/SUSE/kiwi
|
||||
1. On GitHub, navigate to: https://github.com/OSInside/kiwi
|
||||
|
||||
2. In the top-right corner of the page, click :command:`Fork`.
|
||||
|
||||
@ -36,7 +36,7 @@ Create a local clone of the forked KIWI repository
|
||||
|
||||
$ git clone https://github.com/YOUR-USERNAME/kiwi
|
||||
|
||||
$ git remote add upstream https://github.com/SUSE/kiwi.git
|
||||
$ git remote add upstream https://github.com/OSInside/kiwi.git
|
||||
|
||||
Install Required Operating System Packages
|
||||
------------------------------------------
|
||||
@ -219,7 +219,7 @@ Make and commit your changes.
|
||||
$ git commit -S -a
|
||||
|
||||
Run the tests and code style checks. All of these are also performed by the
|
||||
`Travis CI <https://travis-ci.com/SUSE/kiwi>`_ and `GitLab CI
|
||||
`Travis CI <https://travis-ci.com/OSInside/kiwi>`_ and `GitLab CI
|
||||
<https://gitlab.com/schaefi/kiwi-ci/pipelines>`_ integration test systems
|
||||
when a pull request is created.
|
||||
|
||||
|
||||
@ -8,8 +8,8 @@ build Linux system appliances.
|
||||
|
||||
.. sidebar:: Links
|
||||
|
||||
* `GitHub Sources <https://github.com/SUSE/kiwi>`__
|
||||
* `GitHub Releases <https://github.com/SUSE/kiwi/releases>`__
|
||||
* `GitHub Sources <https://github.com/OSInside/kiwi>`__
|
||||
* `GitHub Releases <https://github.com/OSInside/kiwi/releases>`__
|
||||
* `RPM Packages <http://download.opensuse.org/repositories/Virtualization:/Appliances:/Builder>`__
|
||||
* `Build Tests(x86) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_x86>`__
|
||||
* `Build Tests(arm) <https://build.opensuse.org/project/show/Virtualization:Appliances:Images:Testing_arm>`__
|
||||
@ -80,7 +80,7 @@ Contact
|
||||
`subscribe <mailto:kiwi-images+subscribe@googlegroups.com>`__,
|
||||
even if you do not have a Google account.
|
||||
|
||||
* `Matrix <https://matrix.org/blog/home/>`__
|
||||
* `Matrix <https://matrix.org>`__
|
||||
|
||||
An open network for secure, decentralized communication. Please find the
|
||||
`kiwi` room via `Riot <https://riot.im/app/>`__ on the web or by using
|
||||
|
||||
@ -144,7 +144,7 @@ The prepare step consists of the following substeps:
|
||||
installation of packages into the new root tree. The aforementioned two
|
||||
packages might not be enough for every distribution. Consult the
|
||||
`kiwi-descriptions repository
|
||||
<https://github.com/SUSE/kiwi-descriptions/>`_ containing examples for
|
||||
<https://github.com/OSInside/kiwi-descriptions/>`_ containing examples for
|
||||
various Linux distributions.
|
||||
|
||||
The installation of software packages through the selected package
|
||||
|
||||
@ -10,7 +10,7 @@ Legacy KIWI vs. Next Generation
|
||||
maintenance state of the legacy kiwi version and under which
|
||||
circumstances the use of the legacy kiwi version is required.
|
||||
|
||||
There is still the former `KIWI <https://github.com/openSUSE/kiwi>`__
|
||||
There is still the former `KIWI <https://github.com/OSInside/kiwi-legacy>`__
|
||||
version and we decided to rewrite it.
|
||||
|
||||
The reasons to rewrite software from scratch could be very different
|
||||
@ -52,7 +52,7 @@ the used KIWI version.
|
||||
This provides an opportunity for users to test the next generation KIWI
|
||||
with their appliance descriptions without risk. If it builds and works
|
||||
as expected, I recommend to switch to the next generation KIWI. If not,
|
||||
please open an issue on https://github.com/SUSE/kiwi.
|
||||
please open an issue on https://github.com/OSInside/kiwi.
|
||||
|
||||
The legacy KIWI version will be further developed in maintenance mode.
|
||||
There won't be any new features added in that code base though.
|
||||
|
||||
@ -495,7 +495,7 @@ class Defaults(object):
|
||||
|
||||
:rtype: str
|
||||
"""
|
||||
return 'KIWI - http://suse.github.com/kiwi'
|
||||
return 'KIWI - https://github.com/OSInside/kiwi'
|
||||
|
||||
@staticmethod
|
||||
def get_publisher():
|
||||
|
||||
@ -73,7 +73,7 @@ class Cli(object):
|
||||
'In case of a correct legacy kiwi command but not',
|
||||
'supported by kiwicompat, please contact us via the',
|
||||
'github issue system at:\n',
|
||||
'https://github.com/SUSE/kiwi/issues'
|
||||
'https://github.com/OSInside/kiwi/issues'
|
||||
]
|
||||
)
|
||||
raise NotImplementedError(
|
||||
|
||||
2
setup.py
2
setup.py
@ -179,7 +179,7 @@ config = {
|
||||
'name': 'kiwi',
|
||||
'description': 'KIWI - Appliance Builder (next generation)',
|
||||
'author': 'Marcus Schaefer',
|
||||
'url': 'http://suse.github.io/kiwi',
|
||||
'url': 'https://osinside.github.io/kiwi',
|
||||
'download_url': 'https://download.opensuse.org/repositories/Virtualization:/Appliances:/Builder',
|
||||
'author_email': 'ms@suse.com',
|
||||
'version': __version__,
|
||||
|
||||
@ -258,7 +258,7 @@ class TestLiveImageBuilder(object):
|
||||
custom_args={
|
||||
'meta_data': {
|
||||
'mbr_id': '0xffffffff',
|
||||
'preparer': 'KIWI - http://suse.github.com/kiwi',
|
||||
'preparer': 'KIWI - https://github.com/OSInside/kiwi',
|
||||
'publisher': 'Custom publisher',
|
||||
'volume_id': 'volid',
|
||||
'efi_mode': 'uefi',
|
||||
|
||||
@ -36,7 +36,7 @@ class TestDefaults(object):
|
||||
)
|
||||
|
||||
def test_get_preparer(self):
|
||||
assert Defaults.get_preparer() == 'KIWI - http://suse.github.com/kiwi'
|
||||
assert Defaults.get_preparer() == 'KIWI - https://github.com/OSInside/kiwi'
|
||||
|
||||
def test_get_publisher(self):
|
||||
assert Defaults.get_publisher() == 'SUSE LINUX GmbH'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user