From ec1ef2713f40491b62a6afd88ae298bf30dc64d0 Mon Sep 17 00:00:00 2001 From: "codeberg.org" Date: Sun, 2 Aug 2020 17:13:08 +0200 Subject: [PATCH] Organize docs --- LICENSE | 428 ++++++++++++++++++ Overview.md | 22 - README.md | 5 +- codeberg.png | Bin 24317 -> 0 bytes doc/advanced/third-party-tools.md | 6 + .../authentication/add-ssh-key.png | Bin .../authentication/clone-commit-via-http.md | 4 + .../authentication/clone-commit-via-ssh.md | 6 +- .../getting-started/authentication/ssh-key.md | 6 +- .../getting-started/create-repo-01.png | Bin .../getting-started/create-repo-02.png | Bin .../getting-started/create-repo.md | 8 +- .../including-images-in-wiki-pages.en-us.md | 10 +- .../git/fork-button.png | Bin .../git/pull-request-button.png | Bin .../git/pull-requests-and-git-flow.md | 14 +- .../git/squash-commits.md | 5 + doc/help/issues.md | 7 + 18 files changed, 487 insertions(+), 34 deletions(-) create mode 100644 LICENSE delete mode 100644 Overview.md delete mode 100644 codeberg.png create mode 100644 doc/advanced/third-party-tools.md rename add_ssh_key.png => doc/getting-started/authentication/add-ssh-key.png (100%) rename Clone-%26-commit-via-HTTP-%28username-%26-password%29.md => doc/getting-started/authentication/clone-commit-via-http.md (92%) rename Clone-%26-commit-via-SSH.md => doc/getting-started/authentication/clone-commit-via-ssh.md (92%) rename SSH-key-for-Codeberg.md => doc/getting-started/authentication/ssh-key.md (94%) rename create_repo_01.png => doc/getting-started/create-repo-01.png (100%) rename create_repo_02.png => doc/getting-started/create-repo-02.png (100%) rename Create-repository.md => doc/getting-started/create-repo.md (87%) rename Including-images-in-wiki-pages.md => doc/getting-started/wiki/including-images-in-wiki-pages.en-us.md (82%) rename Codeberg-build-deploy-gitea-fork.png => doc/git/fork-button.png (100%) rename Codeberg-build-deploy-gitea-pull-request.png => doc/git/pull-request-button.png (100%) rename Pull-requests-and-GIT-flow.md => doc/git/pull-requests-and-git-flow.md (84%) rename Merge-multiple-commits-into-one.md => doc/git/squash-commits.md (91%) create mode 100644 doc/help/issues.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..a73481c --- /dev/null +++ b/LICENSE @@ -0,0 +1,428 @@ +Attribution-ShareAlike 4.0 International + +======================================================================= + +Creative Commons Corporation ("Creative Commons") is not a law firm and +does not provide legal services or legal advice. Distribution of +Creative Commons public licenses does not create a lawyer-client or +other relationship. Creative Commons makes its licenses and related +information available on an "as-is" basis. Creative Commons gives no +warranties regarding its licenses, any material licensed under their +terms and conditions, or any related information. Creative Commons +disclaims all liability for damages resulting from their use to the +fullest extent possible. + +Using Creative Commons Public Licenses + +Creative Commons public licenses provide a standard set of terms and +conditions that creators and other rights holders may use to share +original works of authorship and other material subject to copyright +and certain other rights specified in the public license below. The +following considerations are for informational purposes only, are not +exhaustive, and do not form part of our licenses. + + Considerations for licensors: Our public licenses are + intended for use by those authorized to give the public + permission to use material in ways otherwise restricted by + copyright and certain other rights. Our licenses are + irrevocable. Licensors should read and understand the terms + and conditions of the license they choose before applying it. + Licensors should also secure all rights necessary before + applying our licenses so that the public can reuse the + material as expected. Licensors should clearly mark any + material not subject to the license. This includes other CC- + licensed material, or material used under an exception or + limitation to copyright. More considerations for licensors: + wiki.creativecommons.org/Considerations_for_licensors + + Considerations for the public: By using one of our public + licenses, a licensor grants the public permission to use the + licensed material under specified terms and conditions. If + the licensor's permission is not necessary for any reason--for + example, because of any applicable exception or limitation to + copyright--then that use is not regulated by the license. Our + licenses grant only permissions under copyright and certain + other rights that a licensor has authority to grant. Use of + the licensed material may still be restricted for other + reasons, including because others have copyright or other + rights in the material. A licensor may make special requests, + such as asking that all changes be marked or described. + Although not required by our licenses, you are encouraged to + respect those requests where reasonable. More considerations + for the public: + wiki.creativecommons.org/Considerations_for_licensees + +======================================================================= + +Creative Commons Attribution-ShareAlike 4.0 International Public +License + +By exercising the Licensed Rights (defined below), You accept and agree +to be bound by the terms and conditions of this Creative Commons +Attribution-ShareAlike 4.0 International Public License ("Public +License"). To the extent this Public License may be interpreted as a +contract, You are granted the Licensed Rights in consideration of Your +acceptance of these terms and conditions, and the Licensor grants You +such rights in consideration of benefits the Licensor receives from +making the Licensed Material available under these terms and +conditions. + + +Section 1 -- Definitions. + + a. Adapted Material means material subject to Copyright and Similar + Rights that is derived from or based upon the Licensed Material + and in which the Licensed Material is translated, altered, + arranged, transformed, or otherwise modified in a manner requiring + permission under the Copyright and Similar Rights held by the + Licensor. For purposes of this Public License, where the Licensed + Material is a musical work, performance, or sound recording, + Adapted Material is always produced where the Licensed Material is + synched in timed relation with a moving image. + + b. Adapter's License means the license You apply to Your Copyright + and Similar Rights in Your contributions to Adapted Material in + accordance with the terms and conditions of this Public License. + + c. BY-SA Compatible License means a license listed at + creativecommons.org/compatiblelicenses, approved by Creative + Commons as essentially the equivalent of this Public License. + + d. Copyright and Similar Rights means copyright and/or similar rights + closely related to copyright including, without limitation, + performance, broadcast, sound recording, and Sui Generis Database + Rights, without regard to how the rights are labeled or + categorized. For purposes of this Public License, the rights + specified in Section 2(b)(1)-(2) are not Copyright and Similar + Rights. + + e. Effective Technological Measures means those measures that, in the + absence of proper authority, may not be circumvented under laws + fulfilling obligations under Article 11 of the WIPO Copyright + Treaty adopted on December 20, 1996, and/or similar international + agreements. + + f. Exceptions and Limitations means fair use, fair dealing, and/or + any other exception or limitation to Copyright and Similar Rights + that applies to Your use of the Licensed Material. + + g. License Elements means the license attributes listed in the name + of a Creative Commons Public License. The License Elements of this + Public License are Attribution and ShareAlike. + + h. Licensed Material means the artistic or literary work, database, + or other material to which the Licensor applied this Public + License. + + i. Licensed Rights means the rights granted to You subject to the + terms and conditions of this Public License, which are limited to + all Copyright and Similar Rights that apply to Your use of the + Licensed Material and that the Licensor has authority to license. + + j. Licensor means the individual(s) or entity(ies) granting rights + under this Public License. + + k. Share means to provide material to the public by any means or + process that requires permission under the Licensed Rights, such + as reproduction, public display, public performance, distribution, + dissemination, communication, or importation, and to make material + available to the public including in ways that members of the + public may access the material from a place and at a time + individually chosen by them. + + l. Sui Generis Database Rights means rights other than copyright + resulting from Directive 96/9/EC of the European Parliament and of + the Council of 11 March 1996 on the legal protection of databases, + as amended and/or succeeded, as well as other essentially + equivalent rights anywhere in the world. + + m. You means the individual or entity exercising the Licensed Rights + under this Public License. Your has a corresponding meaning. + + +Section 2 -- Scope. + + a. License grant. + + 1. Subject to the terms and conditions of this Public License, + the Licensor hereby grants You a worldwide, royalty-free, + non-sublicensable, non-exclusive, irrevocable license to + exercise the Licensed Rights in the Licensed Material to: + + a. reproduce and Share the Licensed Material, in whole or + in part; and + + b. produce, reproduce, and Share Adapted Material. + + 2. Exceptions and Limitations. For the avoidance of doubt, where + Exceptions and Limitations apply to Your use, this Public + License does not apply, and You do not need to comply with + its terms and conditions. + + 3. Term. The term of this Public License is specified in Section + 6(a). + + 4. Media and formats; technical modifications allowed. The + Licensor authorizes You to exercise the Licensed Rights in + all media and formats whether now known or hereafter created, + and to make technical modifications necessary to do so. The + Licensor waives and/or agrees not to assert any right or + authority to forbid You from making technical modifications + necessary to exercise the Licensed Rights, including + technical modifications necessary to circumvent Effective + Technological Measures. For purposes of this Public License, + simply making modifications authorized by this Section 2(a) + (4) never produces Adapted Material. + + 5. Downstream recipients. + + a. Offer from the Licensor -- Licensed Material. Every + recipient of the Licensed Material automatically + receives an offer from the Licensor to exercise the + Licensed Rights under the terms and conditions of this + Public License. + + b. Additional offer from the Licensor -- Adapted Material. + Every recipient of Adapted Material from You + automatically receives an offer from the Licensor to + exercise the Licensed Rights in the Adapted Material + under the conditions of the Adapter's License You apply. + + c. No downstream restrictions. You may not offer or impose + any additional or different terms or conditions on, or + apply any Effective Technological Measures to, the + Licensed Material if doing so restricts exercise of the + Licensed Rights by any recipient of the Licensed + Material. + + 6. No endorsement. Nothing in this Public License constitutes or + may be construed as permission to assert or imply that You + are, or that Your use of the Licensed Material is, connected + with, or sponsored, endorsed, or granted official status by, + the Licensor or others designated to receive attribution as + provided in Section 3(a)(1)(A)(i). + + b. Other rights. + + 1. Moral rights, such as the right of integrity, are not + licensed under this Public License, nor are publicity, + privacy, and/or other similar personality rights; however, to + the extent possible, the Licensor waives and/or agrees not to + assert any such rights held by the Licensor to the limited + extent necessary to allow You to exercise the Licensed + Rights, but not otherwise. + + 2. Patent and trademark rights are not licensed under this + Public License. + + 3. To the extent possible, the Licensor waives any right to + collect royalties from You for the exercise of the Licensed + Rights, whether directly or through a collecting society + under any voluntary or waivable statutory or compulsory + licensing scheme. In all other cases the Licensor expressly + reserves any right to collect such royalties. + + +Section 3 -- License Conditions. + +Your exercise of the Licensed Rights is expressly made subject to the +following conditions. + + a. Attribution. + + 1. If You Share the Licensed Material (including in modified + form), You must: + + a. retain the following if it is supplied by the Licensor + with the Licensed Material: + + i. identification of the creator(s) of the Licensed + Material and any others designated to receive + attribution, in any reasonable manner requested by + the Licensor (including by pseudonym if + designated); + + ii. a copyright notice; + + iii. a notice that refers to this Public License; + + iv. a notice that refers to the disclaimer of + warranties; + + v. a URI or hyperlink to the Licensed Material to the + extent reasonably practicable; + + b. indicate if You modified the Licensed Material and + retain an indication of any previous modifications; and + + c. indicate the Licensed Material is licensed under this + Public License, and include the text of, or the URI or + hyperlink to, this Public License. + + 2. You may satisfy the conditions in Section 3(a)(1) in any + reasonable manner based on the medium, means, and context in + which You Share the Licensed Material. For example, it may be + reasonable to satisfy the conditions by providing a URI or + hyperlink to a resource that includes the required + information. + + 3. If requested by the Licensor, You must remove any of the + information required by Section 3(a)(1)(A) to the extent + reasonably practicable. + + b. ShareAlike. + + In addition to the conditions in Section 3(a), if You Share + Adapted Material You produce, the following conditions also apply. + + 1. The Adapter's License You apply must be a Creative Commons + license with the same License Elements, this version or + later, or a BY-SA Compatible License. + + 2. You must include the text of, or the URI or hyperlink to, the + Adapter's License You apply. You may satisfy this condition + in any reasonable manner based on the medium, means, and + context in which You Share Adapted Material. + + 3. You may not offer or impose any additional or different terms + or conditions on, or apply any Effective Technological + Measures to, Adapted Material that restrict exercise of the + rights granted under the Adapter's License You apply. + + +Section 4 -- Sui Generis Database Rights. + +Where the Licensed Rights include Sui Generis Database Rights that +apply to Your use of the Licensed Material: + + a. for the avoidance of doubt, Section 2(a)(1) grants You the right + to extract, reuse, reproduce, and Share all or a substantial + portion of the contents of the database; + + b. if You include all or a substantial portion of the database + contents in a database in which You have Sui Generis Database + Rights, then the database in which You have Sui Generis Database + Rights (but not its individual contents) is Adapted Material, + + including for purposes of Section 3(b); and + c. You must comply with the conditions in Section 3(a) if You Share + all or a substantial portion of the contents of the database. + +For the avoidance of doubt, this Section 4 supplements and does not +replace Your obligations under this Public License where the Licensed +Rights include other Copyright and Similar Rights. + + +Section 5 -- Disclaimer of Warranties and Limitation of Liability. + + a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE + EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS + AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF + ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS, + IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION, + WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR + PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS, + ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT + KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT + ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU. + + b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE + TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION, + NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT, + INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES, + COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR + USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR + DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR + IN PART, THIS LIMITATION MAY NOT APPLY TO YOU. + + c. The disclaimer of warranties and limitation of liability provided + above shall be interpreted in a manner that, to the extent + possible, most closely approximates an absolute disclaimer and + waiver of all liability. + + +Section 6 -- Term and Termination. + + a. This Public License applies for the term of the Copyright and + Similar Rights licensed here. However, if You fail to comply with + this Public License, then Your rights under this Public License + terminate automatically. + + b. Where Your right to use the Licensed Material has terminated under + Section 6(a), it reinstates: + + 1. automatically as of the date the violation is cured, provided + it is cured within 30 days of Your discovery of the + violation; or + + 2. upon express reinstatement by the Licensor. + + For the avoidance of doubt, this Section 6(b) does not affect any + right the Licensor may have to seek remedies for Your violations + of this Public License. + + c. For the avoidance of doubt, the Licensor may also offer the + Licensed Material under separate terms or conditions or stop + distributing the Licensed Material at any time; however, doing so + will not terminate this Public License. + + d. Sections 1, 5, 6, 7, and 8 survive termination of this Public + License. + + +Section 7 -- Other Terms and Conditions. + + a. The Licensor shall not be bound by any additional or different + terms or conditions communicated by You unless expressly agreed. + + b. Any arrangements, understandings, or agreements regarding the + Licensed Material not stated herein are separate from and + independent of the terms and conditions of this Public License. + + +Section 8 -- Interpretation. + + a. For the avoidance of doubt, this Public License does not, and + shall not be interpreted to, reduce, limit, restrict, or impose + conditions on any use of the Licensed Material that could lawfully + be made without permission under this Public License. + + b. To the extent possible, if any provision of this Public License is + deemed unenforceable, it shall be automatically reformed to the + minimum extent necessary to make it enforceable. If the provision + cannot be reformed, it shall be severed from this Public License + without affecting the enforceability of the remaining terms and + conditions. + + c. No term or condition of this Public License will be waived and no + failure to comply consented to unless expressly agreed to by the + Licensor. + + d. Nothing in this Public License constitutes or may be interpreted + as a limitation upon, or waiver of, any privileges and immunities + that apply to the Licensor or You, including from the legal + processes of any jurisdiction or authority. + + +======================================================================= + +Creative Commons is not a party to its public +licenses. Notwithstanding, Creative Commons may elect to apply one of +its public licenses to material it publishes and in those instances +will be considered the “Licensor.” The text of the Creative Commons +public licenses is dedicated to the public domain under the CC0 Public +Domain Dedication. Except for the limited purpose of indicating that +material is shared under a Creative Commons public license or as +otherwise permitted by the Creative Commons policies published at +creativecommons.org/policies, Creative Commons does not authorize the +use of the trademark "Creative Commons" or any other trademark or logo +of Creative Commons without its prior written consent including, +without limitation, in connection with any unauthorized modifications +to any of its public licenses or any other arrangements, +understandings, or agreements concerning use of licensed material. For +the avoidance of doubt, this paragraph does not form part of the +public licenses. + +Creative Commons may be contacted at creativecommons.org. + diff --git a/Overview.md b/Overview.md deleted file mode 100644 index 43a81de..0000000 --- a/Overview.md +++ /dev/null @@ -1,22 +0,0 @@ -# Basic topics -## Start with Codeberg... -[Create a repository](https://codeberg.org/Codeberg/Documentation/wiki/Create-repository) - -[SSH key for Codeberg](https://codeberg.org/Codeberg/Documentation/wiki/SSH-key-for-Codeberg) - -## Work with Codeberg... -[Clone & commit via HTTP (username & password)](https://codeberg.org/Codeberg/Documentation/wiki/Clone-%26-commit-via-HTTP-%28username-%26-password%29) - -[Clone & commit via SSH (key file)](https://codeberg.org/Codeberg/Documentation/wiki/Clone-%26-commit-via-SSH) - -# Advanced topics -[Pull requests and GIT flow](https://codeberg.org/Codeberg/Documentation/wiki/Pull-requests-and-GIT-flow) - -[Merge multiple commits into one](https://codeberg.org/Codeberg/Documentation/wiki/Merge-multiple-commits-into-one) -# Wiki related topics -[Including images in wiki pages](https://codeberg.org/Codeberg/Documentation/wiki/Including-images-in-wiki-pages) - -# Other Codeberg related topics -[Terms of use](https://codeberg.org/codeberg/org/src/branch/master/TermsOfUse.md) - -[All Codeberg Wiki Pages](https://codeberg.org/Codeberg/Documentation/wiki/_pages) \ No newline at end of file diff --git a/README.md b/README.md index 6190513..37f6dec 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,5 @@ +# Codeberg Documentation +Please have a look into and consider to help writing the Documentation Wiki. This is still very much work-in-progress, the more useful material we collect, the better we can later present it! All contributions very welcome! -#### Please have a look into and consider to help writing the Documentation Wiki. This is still very much work-in-progress, the more useful material we collect, the better we can later present it! All contributions very welcome! +## License +This project is under the CC BY-SA 4.0 License. See the LICENSE file for the full license text. diff --git a/codeberg.png b/codeberg.png deleted file mode 100644 index c7e8ec0beb58f906f3c337eebf49d8aa3eaca804..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24317 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\X*xRAvtmh3N$ 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�t6QU~T^IO;CeiwNR56X}5whw1;BK%f0B(U^cI8X8I{7 z_1W>wCz5aKJ11Vw0Y}N|yb`Jd7a~i~@_9s`_O!|=SwkcAqb~X`(Le!O&WRQYZm%N9 zm)Tv?l_>B8X;A-4dfxv*{|sXg=g=XT|8<%U)i8#&S6Xw5uFFo>1P=c;{9!52H@rDe zk>U15&>ZWlbwfdboDXQ;=-d0Q*_H@;mD)@K-5#}tn;*W2*$-}{({74+ITXkB%jZPA1DJ>y7scbP;mdG>Xx4958(li_}7?5>V(Z8X+kZmZdUDcY@5`6 zt?+mZwIe+!mV>6cOh|mV1wfQ7w^>w*{4w%3J(a&dDh!>9yU5^dzq6( zMijz2@YGQe>HHdY993IXJef)}j-ij$tybI_$56X#pi5?aTqtf>wTS*AUhcg)QX$IV z=Se3C-YCr?lwhC6rP6JxcpXVjEyt72`JFt!zLCu~Tiafl|Dj~AsvEsCQm4w&hfNrtMKp&WNW27rBlydqcPKy$eR?{^&M=fB~Bcm?K3^r)R*Aa*WNXEia#zR zy?(<^svQ?09sy4!xw|6z0vRnvRDr!;BCZpKHX%EAg=*A^5F+ysNw z+PY@16I62>KU8i9tx8cJCauSO{pB!Etop@N&i5iC#MC!4Kf7MBtoWT%rl+Y;x{0j{ zE`J>}TAYaG75Kt8@0;q3LtH*L6;l1-=S|dOc3lYkac#Ud;yxAIe5=^{Dr?18dY2vtDat=< zXlYf)y_7-Q;h$Icdya|^Kd1M$y?qR$ZA{YYCN(IE3MCB=Y;fJiH>1A(wH9a(NMRmR4Z2djKL=S@3UJ6S(U8m*vE+50M~T2e;w78XB(#U zu7u2Z`^C-Y#2DN7>k1u$T9HDgWJTF#+od9BggkFXVW-Zj7YVT!Hj9kSK_Q2GH_^25 z3SBQ_2k`E8{a4GzG+)}8k#|$Y4Eo|^jkQbCwKIs-)Vv))xiz)Vb7i=Y`j%x2*qj?05#D-eg=Nj~DuCkjaR zA-KF^`(u5+0ougl@h1(pH_?%D)dVx#EB4rzIj>4nFvYI69x};PL}GK0M!NP>H?+?> zL#22^P$^v()cI#eA9=a7`Z@l8t|I?GJ?fE&qdN@lgtCm4AUq^!d1vu>q32;~?qMYX zbF%_34+Qx5#ku)}x%q`(^NC9c3rPs_J>wIQ;Nu$^(A4|C4sdj~w6pg4e;?4Ae7+72 xfZYEFZD(r_FLO7m2VP!YJa$g@?l5x~D;{Szo6J2aD)2`SR9|Q)mdl$3{SR0q#<>6h diff --git a/doc/advanced/third-party-tools.md b/doc/advanced/third-party-tools.md new file mode 100644 index 0000000..80cf806 --- /dev/null +++ b/doc/advanced/third-party-tools.md @@ -0,0 +1,6 @@ +--- +title: "Third Party Tools" +--- + +# Third-party tools +Check out [awesome-gitea](https://gitea.com/gitea/awesome-gitea/src/branch/master/README.md) for a comprehensive list of tools that work with Codeberg! \ No newline at end of file diff --git a/add_ssh_key.png b/doc/getting-started/authentication/add-ssh-key.png similarity index 100% rename from add_ssh_key.png rename to doc/getting-started/authentication/add-ssh-key.png diff --git a/Clone-%26-commit-via-HTTP-%28username-%26-password%29.md b/doc/getting-started/authentication/clone-commit-via-http.md similarity index 92% rename from Clone-%26-commit-via-HTTP-%28username-%26-password%29.md rename to doc/getting-started/authentication/clone-commit-via-http.md index 53ac7e2..65325f8 100644 --- a/Clone-%26-commit-via-HTTP-%28username-%26-password%29.md +++ b/doc/getting-started/authentication/clone-commit-via-http.md @@ -1,3 +1,7 @@ +--- +title: "Clone & commit via HTTP (username & password)" +--- + # Clone & commit via HTTP (username & password) The user in this examples is `JohnDoe` and it's repository is `foobar`. The repository was created via the Codeberg.org website including a `README.md` file. diff --git a/Clone-%26-commit-via-SSH.md b/doc/getting-started/authentication/clone-commit-via-ssh.md similarity index 92% rename from Clone-%26-commit-via-SSH.md rename to doc/getting-started/authentication/clone-commit-via-ssh.md index c33836b..f7d6a9d 100644 --- a/Clone-%26-commit-via-SSH.md +++ b/doc/getting-started/authentication/clone-commit-via-ssh.md @@ -1,4 +1,8 @@ -# Clone +--- +title: "Clone & commit via SSH" +--- + +# Clone & commit via SSH The user in this examples is `JohnDoe` and it's repository is `foobar`. The repository was [created](https://codeberg.org/Codeberg/Documentation/wiki/Create-repository---Local-and-on-Codeberg) via the Codeberg.org website including a `README.md` file. ```bash diff --git a/SSH-key-for-Codeberg.md b/doc/getting-started/authentication/ssh-key.md similarity index 94% rename from SSH-key-for-Codeberg.md rename to doc/getting-started/authentication/ssh-key.md index 1664d0a..38d5f03 100644 --- a/SSH-key-for-Codeberg.md +++ b/doc/getting-started/authentication/ssh-key.md @@ -1,5 +1,9 @@ +--- +title: "SSH key for Codeberg" +--- + # Introduction -It is recommanded to use one key per client. It means if you access your Codeberg repository from your home PC, your laptop and your office PC you should generate spearate keys for each machine. +It is reccomended to use one key per client. It means if you access your Codeberg repository from your home PC, your laptop and your office PC you should generate spearate keys for each machine. In the context of Codeberg you should decide yourself if you add a pasphrase to your SSH key or not. Read the on-going discussion about that topic in this [Codeberg-Issue](https://codeberg.org/Codeberg/Documentation/issues/2). diff --git a/create_repo_01.png b/doc/getting-started/create-repo-01.png similarity index 100% rename from create_repo_01.png rename to doc/getting-started/create-repo-01.png diff --git a/create_repo_02.png b/doc/getting-started/create-repo-02.png similarity index 100% rename from create_repo_02.png rename to doc/getting-started/create-repo-02.png diff --git a/Create-repository.md b/doc/getting-started/create-repo.md similarity index 87% rename from Create-repository.md rename to doc/getting-started/create-repo.md index 805cb46..a31e0c6 100644 --- a/Create-repository.md +++ b/doc/getting-started/create-repo.md @@ -1,11 +1,15 @@ +--- +title: "Create a repository" +--- + # Create a Codeberg repository To create a new repository you need to login into your account on Codeberg.org. After login you can use one of the two buttons shown in the two following pictures. -![Create repository 01](create_repo_01.png "Create repository 01") +![Create repository 01](create-repo-01.png) -![Create repository 02](create_repo_02.png "Create repository 02") +![Create repository 02](create-repo-02.png) Note it is not possible to use your git on your local machine to push a fresh repository on Codeberg. # Connect a local repository to Codeberg diff --git a/Including-images-in-wiki-pages.md b/doc/getting-started/wiki/including-images-in-wiki-pages.en-us.md similarity index 82% rename from Including-images-in-wiki-pages.md rename to doc/getting-started/wiki/including-images-in-wiki-pages.en-us.md index 7b7fcd5..cba0656 100644 --- a/Including-images-in-wiki-pages.md +++ b/doc/getting-started/wiki/including-images-in-wiki-pages.en-us.md @@ -1,3 +1,9 @@ +--- +title: "Including images in wiki pages" +--- + +# Including images in wiki pages + ### Upload images via git Currently, gitea supports only images in the base directory of the wiki git. (Gitea wiki pages are stored in a separate wiki right beside the project, wiki pages themselves are markdown files). @@ -19,8 +25,6 @@ Now, you can reference the image in markdown, like this: ![image alt text](codeberg.png "image title") ``` -After saving your changes, the image should be visible like this: +After saving your changes, the image should be visible. *NOTE: In contrast to embedding external images, images in git are only rendered after saving the wiki or markdown file changes.* - -![image alt text](codeberg.png "image title") diff --git a/Codeberg-build-deploy-gitea-fork.png b/doc/git/fork-button.png similarity index 100% rename from Codeberg-build-deploy-gitea-fork.png rename to doc/git/fork-button.png diff --git a/Codeberg-build-deploy-gitea-pull-request.png b/doc/git/pull-request-button.png similarity index 100% rename from Codeberg-build-deploy-gitea-pull-request.png rename to doc/git/pull-request-button.png diff --git a/Pull-requests-and-GIT-flow.md b/doc/git/pull-requests-and-git-flow.md similarity index 84% rename from Pull-requests-and-GIT-flow.md rename to doc/git/pull-requests-and-git-flow.md index 9b3e968..f0ad788 100644 --- a/Pull-requests-and-GIT-flow.md +++ b/doc/git/pull-requests-and-git-flow.md @@ -1,8 +1,14 @@ +--- +title: "Pull requests and Git flow" +--- + +# Pull requests and Git flow + ## Benefits of a pull-request based workflow -> ***&TLDR;*** *Keep an eye on your repository and org permissions. Don't take sweets from strangers. Use pull requests. Easy to review, easy to manage, and only the project maintainers/owners need full access to the repo to merge them.* +> ***TLDR:*** *Keep an eye on your repository and org permissions. Don't take sweets from strangers. Use pull requests. Easy to review, easy to manage, and only the project maintainers/owners need full access to the repo to merge them.* -Although it is perfectly possible to use a GIT project on Codeberg just as single shared central repository for individuals and teams, a collaborative workflow based on pull requests provides many benefits: +Although it is perfectly possible to use a Git project on Codeberg just as single shared central repository for individuals and teams, a collaborative workflow based on pull requests provides many benefits: - The "hot" project repository requires only very few maintainers with full rights to sign off pull requests. Contributors can easily work on forked repositories. - Each pull request collects the full edit history for a fix or feature branch. Contributors can squash this, or keep it, just as they prefer. @@ -13,7 +19,7 @@ Let's say, you would like to contribute to project [https://codeberg.org/Codeber First, fork the project you would like to work on, by clicking the `fork` button on the top-right corner of the project page: -![Fork a project](Codeberg-build-deploy-gitea-fork.png) +![Fork a project](fork-button.png) Then clone it onto your local machine. We assume that you have set up your SSH keys as described in [SSH-key-for-Codeberg](https://codeberg.org/Codeberg/Documentation/wiki/SSH-key-for-Codeberg). This has to be done only once: @@ -39,7 +45,7 @@ git push Now you can create the pull request by selecting your feature branch, and clicking on the pull request button: -![Create a pull request](Codeberg-build-deploy-gitea-pull-request.png) +![Create a pull request](pull-request-button.png) ### Keep it up-to-date: rebase pull requests to upstream diff --git a/Merge-multiple-commits-into-one.md b/doc/git/squash-commits.md similarity index 91% rename from Merge-multiple-commits-into-one.md rename to doc/git/squash-commits.md index e78a94d..b4dc85c 100644 --- a/Merge-multiple-commits-into-one.md +++ b/doc/git/squash-commits.md @@ -1,3 +1,8 @@ +--- +title: "Merge multiple commits into one" +--- + +# Merge multiple commits into one Sometimes you will merge multiple commits into one. Maybe the commits are "dirty" full with not working code or embarrasing commit messages. This solution is only one of mutliple possible solutions. See this [stackoverflow question](https://stackoverflow.com/q/2563632/4865723) for more details and variants. Here is an example. diff --git a/doc/help/issues.md b/doc/help/issues.md new file mode 100644 index 0000000..b40556b --- /dev/null +++ b/doc/help/issues.md @@ -0,0 +1,7 @@ +--- +title: "Issue" +--- + +# Issues + +If you found any issues with Codeberg, please create an [issue on Codeberg/Community](https://codeberg.org/Codeberg/Community/issues).