Unverified Commit 43908070 authored by s1udge's avatar s1udge

updated links, team, faq, and added cs-academy to partners

parent 944f128c
......@@ -22,7 +22,7 @@ and a gateway to spread innovative ideas born inside it's community.
### Join Our Community
 
<a href="https://community.parrotsec.org" class="btn btn-default btn-success"><strong>Parrot Community Forum</strong></a>
<a href="https://community.parrot.sh" class="btn btn-default btn-success"><strong>Parrot Community Forum</strong></a>
### Chat with us on Matrix / Riot.im
......@@ -78,7 +78,7 @@ Our community lives in several places, here are some links to stay in touch with
### Local Communities
<a href="https://community.parrotsec.org/c/community/ar" class="btn btn-default btn-primary"><strong>Arabic Community</strong></a> <a href="https://t.me/joinchat/ParrotArabic" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/ar" class="btn btn-default btn-primary"><strong>Arabic Community</strong></a> <a href="https://t.me/joinchat/ParrotArabic" class="btn btn-default">Telegram</a>
----
......@@ -86,39 +86,39 @@ Our community lives in several places, here are some links to stay in touch with
----
<a href="https://community.parrotsec.org/c/community/fr" class="btn btn-default btn-primary"><strong>French Community</strong></a> <a href="https://t.me/ParrotSecFrance" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/fr" class="btn btn-default btn-primary"><strong>French Community</strong></a> <a href="https://t.me/ParrotSecFrance" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/de" class="btn btn-default btn-primary"><strong>German Community</strong></a> <a href="https://t.me/ParrotSecGer" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/de" class="btn btn-default btn-primary"><strong>German Community</strong></a> <a href="https://t.me/ParrotSecGer" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/gr" class="btn btn-default btn-primary"><strong>Greek Community</strong></a> <a href="https://t.me/parrotsecgr" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/gr" class="btn btn-default btn-primary"><strong>Greek Community</strong></a> <a href="https://t.me/parrotsecgr" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/in" class="btn btn-default btn-primary"><strong>Indian Community</strong></a> <a href="https://t.me/parrotsecindia" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/in" class="btn btn-default btn-primary"><strong>Indian Community</strong></a> <a href="https://t.me/parrotsecindia" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/it" class="btn btn-default btn-primary"><strong>Italian Community</strong></a> <a href="https://t.me/joinchat/BykV5UL_Y5Z1KOY81UxicA" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/it" class="btn btn-default btn-primary"><strong>Italian Community</strong></a> <a href="https://t.me/joinchat/BykV5UL_Y5Z1KOY81UxicA" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/id" class="btn btn-default btn-primary"><strong>Indonesian Community</strong></a> <a href="https://t.me/parrotsecurityindonesia" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/id" class="btn btn-default btn-primary"><strong>Indonesian Community</strong></a> <a href="https://t.me/parrotsecurityindonesia" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/es" class="btn btn-default btn-primary"><strong>Spanish Community</strong></a> <a href="https://t.me/ParrotSpanishGroup" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/es" class="btn btn-default btn-primary"><strong>Spanish Community</strong></a> <a href="https://t.me/ParrotSpanishGroup" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/ru" class="btn btn-default btn-primary"><strong>Russian Community</strong></a> <a href="https://t.me/ParrotSecRU" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/ru" class="btn btn-default btn-primary"><strong>Russian Community</strong></a> <a href="https://t.me/ParrotSecRU" class="btn btn-default">Telegram</a>
----
<a href="https://community.parrotsec.org/c/community/tr" class="btn btn-default btn-primary"><strong>Turkish Community</strong></a> <a href="https://t.me/parrotsecturkey" class="btn btn-default">Telegram</a>
<a href="https://community.parrot.sh/c/community/tr" class="btn btn-default btn-primary"><strong>Turkish Community</strong></a> <a href="https://t.me/parrotsecturkey" class="btn btn-default">Telegram</a>
&nbsp;
......
......@@ -79,7 +79,7 @@ If the bug involves a specific piece of software maintained by Parrot, then sear
If the bug involves a software package that is not listed, then you should contact the maintainer of that particular software.
If you are not sure what software is involved, or if you don't know how to contact the upstream developer, then contact us on our [Community Portal](https://community.parrotsec.org/c/development/)
If you are not sure what software is involved, or if you don't know how to contact the upstream developer, then contact us on our [Community Portal](https://community.parrot.sh/c/development/)
### What should my sources.list look like?
......@@ -88,10 +88,10 @@ If you are not sure what software is involved, or if you don't know how to conta
`/etc/apt/sources.list.d/parrot.list` should contain the following content
```bash
deb https://deb.parrotsec.org/parrot/ rolling main contrib non-free
#deb-src https://deb.parrotsec.org/parrot/ rolling main contrib non-free
deb https://deb.parrotsec.org/parrot/ rolling-security main contrib non-free
#deb-src https://deb.parrotsec.org/parrot/ rolling-security main contrib non-free
deb https://deb.parrot.sh/parrot/ rolling main contrib non-free
#deb-src https://deb.parrot.sh/parrot/ rolling main contrib non-free
deb https://deb.parrot.sh/parrot/ rolling-security main contrib non-free
#deb-src https://deb.parrot.sh/parrot/ rolling-security main contrib non-free
```
......@@ -133,7 +133,7 @@ Uh no. Nooope. . . You do not know deh way. <br>Seriously, [reading](https://doc
### How can I disable the GUI update reminder?
Please see [here](https://community.parrotsec.org/t/parrot-updater/1485/2)
Please see [here](https://community.parrot.sh/t/parrot-updater/1485/2)
### I can't login at startup as root?
......
# Home
For the ParrotOS homepage, visit [parrotsec.org](https://parrotsec.org).
For the Parrot Project homepage, visit [parrotsec.org](https://parrotsec.org).
An important part of any operating system is documentation, the technical manuals which describe the operation and use of programs. As part of its efforts to create a high-quality free operating system, the Parrot Project is making every effort to provide all of its users with proper documentation in an easily accessible form.
The documentation is still under construction, and all the Parrot users are invited to contribute to the creation and translation process of this portal.
The documentation is a continuous work in progress, and all Parrot users are invited to contribute to the creation and translation process of this portal.
![screenshot](https://docs.parrot.sh/img/screenshot.png)
......@@ -58,7 +58,7 @@ The documentation is still under construction, and all the Parrot users are invi
&nbsp;
### Need help? [Contact our Staff](https://community.parrotsec.org)
### Need help? [Contact our Staff](https://community.parrotsec.org/c/support/)
We have a staff of volunteers and community members who can help you
troubleshoot system bugs and guide you from installation to configuration
......
......@@ -7,7 +7,7 @@ visible: true
---
## Introduction
ParrotOS does not only deliver a ready-to-use system in the ISO format, but it also provides a vast amount of additional software that can be installed apart from the official parrot repository.
The Parrot Project not only delivers a ready-to-use system in the ISO format, but it also provides a vast amount of additional software that can be installed apart from the official parrot repository.
The Parrot repository is used to provide officially supported software, system updates and security fixes.
......@@ -332,7 +332,7 @@ Start the rsync service:
### Make your mirror official
If you want your mirror to be added to our official mirrors list and to our mirror directors, contact us with the following email: team AT parrotsec DOT org
If you want your mirror to be added to our official mirrors list and to our mirror directors, email us at team AT parrotsec DOT org
......
......@@ -17,11 +17,22 @@ The collaboration consists in a friendly partnership where we help Caine in its
***
### CS-Academy
![logo](/img/cs-academy.png)
CS-Academy is an Spanish-language online training center that provides Cybersecurity and Ethical Hacking training courses, Pentesting services, digital forensics analysis and incidents response for individuals and companies.
[About CS-Academy](https://cs-academy.org/) (en español)
***
### FSecurity Academy
Emerging learning resource in Costa Rica that makes use of the Parrot system.
[About FSecurity Academy](https://www.fsecurityacademy.com/about/)
[About FSecurity Academy](https://www.fsecurityacademy.com/#partner) (en español)
***
......@@ -29,7 +40,7 @@ Emerging learning resource in Costa Rica that makes use of the Parrot system.
[ProDefence SRL](https://www.prodefence.ro/) is an IT company dedicated to cyber security services, protecting companies from vulnerabilities and system penetration, providing security information training to their employees. Company employees can take advantage of the remote support we give anytime anyday to any platform. In addition to this, we analyze any file, as well as, network activity for malware or any other malicious and suspicious activity and help to recover and educate the users involved.
[ProDefence SRL Blog](https://www.prodefence.org/)
[ProDefence SRL Blog](https://www.prodefence.org/)
***
......@@ -41,11 +52,7 @@ Emerging learning resource in Costa Rica that makes use of the Parrot system.
### Leaseweb Global B.V.
Leaseweb is a global Infrastructure-as-a-Service (IaaS) provider offering customers hosting solutions to boost their business while cutting costs.
### KNXSecurity
KNXSecurity is an Italian community dedicated to cyber security training that helps us by testing the beta images of Parrot before the final release.
[Leaseweb](https://www.leaseweb.com/about) is a global Infrastructure-as-a-Service (IaaS) provider offering customers hosting solutions to boost their business while cutting costs.
***
......
......@@ -19,9 +19,7 @@ In this page we list contributors and members, past and present, who have contri
| mibofra | Francesco Bonanno | ARM Releases Dev<br>Core Dev<br>Sysadmin<br>IPFS Repository Maintainer | mibofra at parrotsec dot org |
| nikksno | Nicolas North | Sysadmin<br>legal shit | nz at os dot vu |
| marafed | Federica Marasà | Graphic Designer | marafed at parrotsec dot org |
| sheireen | Lisetta Ferrero | Core Dev | sheireen at parrotsec dot org |
| s1udge | | Operations lead <br> Forum Admin <br> Docs writer | s1udge at parrotsec dot org |
| s1udge | | Operations lead <br> Forum Admin <br> Docs writer <br> Dev | s1udge at parrotsec dot org |
&nbsp;
......@@ -30,7 +28,8 @@ In this page we list contributors and members, past and present, who have contri
| ---------------- | --------------------- | --------------------------------------------------------------- | ---------------------------- |
| Andi | | Dev | |
| h0tw4t3r | | Dev <br> Forum Moderator <br> Tutorial Writer <br> Website contributor | h0tw4t3r at parrotsec dot org |
| Dm Knght | Nông Hoàng Tú | Dev <br> Forum Moderator <br> Tutorial writer | dmknght at protonmail dot com |
| Dm Knght | Nông Hoàng Tú | Dev <br> Forum Moderator <br> Tutorial writer | dmknght at parrotsec dot org |
| disrupt_the_flow | | Dev <br> Docs writer <br> Telegram Admin <br> Forum Moderator | disrupt_the_flow at parrotsec dot org|
&nbsp;
# Community Team
......@@ -41,17 +40,17 @@ In this page we list contributors and members, past and present, who have contri
| ByteHackr | Sandipan Roy(nemo) | Indian community Leader <br> Forum Moderator | nemo at parrotsec dot org |
| AresX | | Chinese Community Leader <br> Forum Moderator | |
| anubi5 | Abdel Rhman Anter | Arabic Community Leader <br> Forum Moderator | anubi5 at parrotsec dot org |
| disrupt_the_flow | | Greek Community Leader <br> Docs writer <br> Telegram Admin <br> Forum Moderator | disrupt_the_flow at parrotsec dot org|
| disrupt_the_flow | | Greek Community Leader | disrupt_the_flow at parrotsec dot org|
| Mr-B Relax | Bimantara Sutato Putra | Indonesian Community Leader <br> Forum Moderator | |
| Fugu | | French Community Leader <br> Forum Moderator | |
| Kratvers | Denis | Russian Community Leader <br> Forum Moderator | |
| xx4h | Fabian Melters | German Community Leader <br> Forum Moderator | |
| ku3k3n | | German Community Leader (Alternate) <br> Forum Moderator | |
| ku3k3n | | German Community Leader <br> Forum Moderator | |
| rowie | | German Community Leader (Alternate) <br> Forum Moderator | rowie at parrotsec dot org |
| Nico_Paul | Nico Gialluca | English Community Leader <br> Forum Moderator <br>Organizer | nico at parrotsec dot org |
| Kidklown | | English Community <br> Forum Moderator | |
| Jeff | Jeff Szydel | Facebook admin <br> System Tester | jeff at parrotsec dot org |
| Zaphod BB | | Telegram Admin <br> Forum Moderator | |
| mastrobirraio | Pino Matranga | Web Team Leader <br> Italian Community Leader <br> Forum Moderator | |
| Zaphod BB | | Telegram Admin <br> Forum Moderator | ptd at parrotsec dot org |
| mastrobirraio | Pino Matranga | Web Team Leader <br> Italian Community Leader <br> Forum Moderator | |
| LulzRose | Kurt Bruggeman | | LulzRose at riseup dot net |
| KileXt | | Forum Moderator <br> Tutorial writer | |
......@@ -62,9 +61,10 @@ In this page we list contributors and members, past and present, who have contri
| nickname | name | role(s) | email |
| ---------------- | --------------------- | --------------------------------------------------------------- | ---------------------------- |
| Serverket | Manuel Hernandez | Design Team Leader | |
| janopineda | Alejandro Pineda | | |
| marafed | Federica Marasà | Graphic Designer | marafed at parrotsec dot org |
| Serverket | Manuel Hernandez | Design Team Leader | |
| janopineda | Alejandro Pineda | | |
&nbsp;
# Contributors
......@@ -97,7 +97,7 @@ In this page we list contributors and members, past and present, who have contri
| Tissy | Irene Pirrotta | Former Package Manager | tissy at parrotsec dot org |
| Quietwalker | Manuel Di Vita | Former free-software licensing consultant | |
| Paal | | Forum setup <br>Organizer<br>Graphic Design | paal at parrotsec dot org |
| sheireen | Lisetta Ferrero | Core Dev | sheireen at parrotsec dot org |
&nbsp;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment