فهرست منبع

Normalize the contributing documents

move the description of signing the cla to a single document and
reference this on each page that wants to.
mafoo 9 سال پیش
والد
کامیت
ea0f16d5fa

+ 3 - 1
source/contributing.rst

@@ -10,6 +10,7 @@ What We Need:
 2. Technical Writers
 3. Translators
 4. Quality Assurance Testers
+5. Documentors
 
 .. note::
 
@@ -36,10 +37,11 @@ How to Get Started:
   :glob:
 
   contributing/contributing_code.rst
+  contributing/signing_the_cla.rst
   contributing/contributing_documentation.rst
   contributing/contributing_translations.rst
   contributing/qa_testing.rst
   contributing/github_rebase.rst
   contributing/coding_standards
-  contributing/directory_structure
+#  contributing/directory_structure
 

+ 1 - 50
source/contributing/contributing_code.rst

@@ -2,26 +2,6 @@
 Contributing Code
 *****************
 
-https://github.com/fusionpbx/open-source
-
-Open Source at FusionPBX
-==============================================
-
-This repository serves as the umbrella project to represent the
-various open source efforts of Mark J. Crane(https://fusionpbx.com).
-Come here to get an overview of the various projects, to learn how to
-contribute to them, and to sign up as a contributor.
-
-Table Of Contents
------------------
-
-* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
-* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
-* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
-* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
-
-
-
 Note to External Contributors
 -----------------------------
 
@@ -30,36 +10,7 @@ Hello, External Person!
 We at FusionPBX are eager to work with you. 
 
 In particular, in order for us to accept any patches from you, you will have to
-electronically sign a statement that indicates two things:
-
-* You are willingly licensing your contributions under the terms of
-  the open source license of the project that you’re contributing to.
-
-* You are legally able to license your contributions as stated.
-
-The reason we do this is to ensure, to the extent possible, that we don’t “taint”
-the projects we manage with contributions that turn out to be improper. This protects
-everyone who wants to use the projects, including *you*! If you want a longer explanation,
-then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
-
-Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
-merge your contributions with a clear conscience and with only the friction that results
-from the usual technical back-and-forth of a vibrant open source project.
-
-To get started with this process, visit the
-[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
-page.
-
+electronically sign the contributor license agreement [Signing the CLA]/en/latest/contributing/signing_the_cla.html
 
 Thanks, FusionPBX!
 
-
-
-List of Projects
-----------------
-
-* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) The Official FusionPBX Repo.
-* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) Applications for FusionPBX.
-* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) Install and Upgrade Scripts for FusionPBX.
-* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) This site.
-

+ 1 - 51
source/contributing/contributing_documentation.rst

@@ -2,27 +2,6 @@
 Contributing Documentation
 **************************
 
-
-https://github.com/fusionpbx/open-source
-
-Open Source at FusionPBX
-==============================================
-
-This repository serves as the umbrella project to represent the
-various open source efforts of Mark J. Crane(https://fusionpbx.com).
-Come here to get an overview of the various projects, to learn how to
-contribute to them, and to sign up as a contributor.
-
-Table Of Contents
------------------
-
-* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
-* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
-* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
-* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
-
-
-
 Note to External Contributors
 -----------------------------
 
@@ -31,37 +10,8 @@ Hello, External Person!
 We at FusionPBX are eager to work with you. 
 
 In particular, in order for us to accept any patches from you, you will have to
-electronically sign a statement that indicates two things:
-
-* You are willingly licensing your contributions under the terms of
-  the open source license of the project that you’re contributing to.
-
-* You are legally able to license your contributions as stated.
-
-The reason we do this is to ensure, to the extent possible, that we don’t “taint”
-the projects we manage with contributions that turn out to be improper. This protects
-everyone who wants to use the projects, including *you*! If you want a longer explanation,
-then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
-
-Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
-merge your contributions with a clear conscience and with only the friction that results
-from the usual technical back-and-forth of a vibrant open source project.
-
-To get started with this process, visit the
-[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
-page.
-
+electronically sign the contributor license agreement [Signing the CLA]/en/latest/contributing/signing_the_cla.html
 
 Thanks, FusionPBX!
 
 
-
-List of Projects
-----------------
-
-* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) The Official FusionPBX Repo.
-* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) Applications for FusionPBX.
-* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) Install and Upgrade Scripts for FusionPBX.
-* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) This site.
-
-

+ 1 - 51
source/contributing/contributing_translations.rst

@@ -2,26 +2,6 @@
 Contributing Translations
 *************************
 
-https://github.com/fusionpbx/open-source
-
-Open Source at FusionPBX
-==============================================
-
-This repository serves as the umbrella project to represent the
-various open source efforts of Mark J. Crane(https://fusionpbx.com).
-Come here to get an overview of the various projects, to learn how to
-contribute to them, and to sign up as a contributor.
-
-Table Of Contents
------------------
-
-* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
-* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
-* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
-* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
-
-
-
 Note to External Contributors
 -----------------------------
 
@@ -30,37 +10,7 @@ Hello, External Person!
 We at FusionPBX are eager to work with you. 
 
 In particular, in order for us to accept any patches from you, you will have to
-electronically sign a statement that indicates two things:
-
-* You are willingly licensing your contributions under the terms of
-  the open source license of the project that you’re contributing to.
-
-* You are legally able to license your contributions as stated.
-
-The reason we do this is to ensure, to the extent possible, that we don’t “taint”
-the projects we manage with contributions that turn out to be improper. This protects
-everyone who wants to use the projects, including *you*! If you want a longer explanation,
-then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
-
-Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
-merge your contributions with a clear conscience and with only the friction that results
-from the usual technical back-and-forth of a vibrant open source project.
-
-To get started with this process, visit the
-[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
-page.
-
+electronically sign the contributor license agreement [Signing the CLA]/en/latest/contributing/signing_the_cla.html
 
 Thanks, FusionPBX!
 
-
-
-List of Projects
-----------------
-
-* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) The Official FusionPBX Repo.
-* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) Applications for FusionPBX.
-* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) Install and Upgrade Scripts for FusionPBX.
-* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) This site.
-
-

+ 0 - 2
source/contributing/directory_structure.rst

@@ -2,8 +2,6 @@
 File & Directory Structure
 **************************
 
-
-
 HMVC
 -------------
 

+ 1 - 52
source/contributing/qa_testing.rst

@@ -2,27 +2,6 @@
 Quality Assurance Testing
 *************************
 
-
-https://github.com/fusionpbx/open-source
-
-Open Source at FusionPBX
-==============================================
-
-This repository serves as the umbrella project to represent the
-various open source efforts of Mark J. Crane(https://fusionpbx.com).
-Come here to get an overview of the various projects, to learn how to
-contribute to them, and to sign up as a contributor.
-
-Table Of Contents
------------------
-
-* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
-* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
-* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
-* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
-
-
-
 Note to External Contributors
 -----------------------------
 
@@ -31,37 +10,7 @@ Hello, External Person!
 We at FusionPBX are eager to work with you. 
 
 In particular, in order for us to accept any patches from you, you will have to
-electronically sign a statement that indicates two things:
-
-* You are willingly licensing your contributions under the terms of
-  the open source license of the project that you’re contributing to.
-
-* You are legally able to license your contributions as stated.
-
-The reason we do this is to ensure, to the extent possible, that we don’t “taint”
-the projects we manage with contributions that turn out to be improper. This protects
-everyone who wants to use the projects, including *you*! If you want a longer explanation,
-then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
-
-Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
-merge your contributions with a clear conscience and with only the friction that results
-from the usual technical back-and-forth of a vibrant open source project.
-
-To get started with this process, visit the
-[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
-page.
-
+electronically sign the contributor license agreement [Signing the CLA]/en/latest/contributing/signing_the_cla.html
 
 Thanks, FusionPBX!
 
-
-
-List of Projects
-----------------
-
-* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) The Official FusionPBX Repo.
-* [FusionPBX Apps](https://github.com/Fusionpbx/opensource) Applications for FusionPBX.
-* [FusionPBX Scripts](https://github.com/Fusionpbx/opensource) Install and Upgrade Scripts for FusionPBX.
-* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) This site.
-
-

+ 63 - 0
source/contributing/signing_the_cla.rst

@@ -0,0 +1,63 @@
+***************
+Signing the CLA
+***************
+
+https://github.com/fusionpbx/open-source
+
+Open Source at FusionPBX
+==============================================
+
+This repository serves as the umbrella project to represent the
+various open source efforts of Mark J. Crane(https://fusionpbx.com).
+Come here to get an overview of the various projects, to learn how to
+contribute to them, and to sign up as a contributor.
+
+Table Of Contents
+-----------------
+
+* [Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md) - Step 1 [Required]
+* [CLA Rationale](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md) - [Optional if Curious]
+* [Contributors](https://github.com/Fusionpbx/opensource/blob/master/contributors) - [List of Contributors]
+* [Contributor License Agreement 2.0](https://github.com/Fusionpbx/opensource/blob/master/cla-2.0.md) - [The Actual CLA]
+
+
+
+Note to External Contributors
+-----------------------------
+
+Hello, External Person!
+
+We at FusionPBX are eager to work with you. 
+
+In particular, in order for us to accept any patches from you, you will have to
+electronically sign a statement that indicates two things:
+
+* You are willingly licensing your contributions under the terms of
+  the open source license of the project that you’re contributing to.
+
+* You are legally able to license your contributions as stated.
+
+The reason we do this is to ensure, to the extent possible, that we don’t “taint”
+the projects we manage with contributions that turn out to be improper. This protects
+everyone who wants to use the projects, including *you*! If you want a longer explanation,
+then you can check out the [CLA Rationale page](https://github.com/Fusionpbx/opensource/blob/master/cla-rationale.md).
+
+Once you sign the Contributor License Agreement (the “CLA”), we will then be able to
+merge your contributions with a clear conscience and with only the friction that results
+from the usual technical back-and-forth of a vibrant open source project.
+
+To get started with this process, visit the
+[Sign the CLA](https://github.com/Fusionpbx/opensource/blob/master/sign-cla.md)
+page.
+
+
+Thanks, FusionPBX!
+
+List of Projects
+----------------
+
+* [FusionPBX](https://github.com/Fusionpbx/fusionpbx) The Official FusionPBX Repo.
+* [FusionPBX Apps](https://github.com/Fusionpbx/fusionpbx-apps) Applications for FusionPBX.
+* [FusionPBX Scripts](https://github.com/Fusionpbx/fusionpbx-install.sh) Install and Upgrade Scripts for FusionPBX.
+* [FusionPBX Documents](https://github.com/Fusionpbx/fusionpbx-docs) This site.
+* [Open Source Umbrella Project](https://github.com/Fusionpbx/opensource) Signed contributor licenses agreements.

+ 1 - 1
source/index.rst

@@ -40,7 +40,7 @@ Benefits of FusionPBX
 +-------------------------+-----------------------+------------------------------+------------------------------------------+
 | **Call Detail Records** | **Conference Center** |    **Contacts**              |      `Fax Server`_                       |
 +-------------------------+-----------------------+------------------------------+------------------------------------------+
-| **Follow-Me**           | **Hot Desking**       |     `IVR Menus`_             |           `Ring Groups`_                 |
+| **Follow-Me**           | **Hot Desking**       |    `IVR Menus`_              |      `Ring Groups`_                      |
 +-------------------------+-----------------------+------------------------------+------------------------------------------+
 | **Multi-Tenant**        | **Music on Hold**     |    **Queues**                |      `Recordings`_                       |
 +-------------------------+-----------------------+------------------------------+------------------------------------------+