aboutsummaryrefslogtreecommitdiff
path: root/docs/source
diff options
context:
space:
mode:
Diffstat (limited to 'docs/source')
-rw-r--r--docs/source/community/channels.rst37
-rw-r--r--docs/source/community/code_contributions.rst (renamed from docs/source/development/for_proj_contributors.rst)4
-rw-r--r--docs/source/community/contributing.rst (renamed from docs/source/contributing.rst)4
-rw-r--r--docs/source/community/index.rst18
-rw-r--r--docs/source/development/index.rst1
-rw-r--r--docs/source/index.rst6
6 files changed, 60 insertions, 10 deletions
diff --git a/docs/source/community/channels.rst b/docs/source/community/channels.rst
new file mode 100644
index 00000000..ea12c3f7
--- /dev/null
+++ b/docs/source/community/channels.rst
@@ -0,0 +1,37 @@
+.. _channels:
+
+===========================
+Communication channels
+===========================
+
+Mailing list
+-------------------------------------------------------------------------------
+
+Users and developers of the library are using the mailing list to discuss all
+things related to PROJ. The mailing list is the primary forum for asking for
+help with use of PROJ. The mailing list is also used for announcements, discussions
+about the development of the library and from time to time interesting discussions
+on geodesy appear as well. You are more than welcome to join in on the discussions!
+
+
+The PROJ mailing list can be found at http://lists.maptools.org/mailman/listinfo/proj
+
+
+GitHub
+-------------------------------------------------------------------------------
+
+GitHub is the development platform we use for collaborating on the PROJ code.
+We use GitHub to keep track of the changes in the code and to index bug reports
+and feature requests. We are happy to take contributions in any form, either
+as code, bug reports, documentation or feature requests. See :ref:`contributing`
+for more info on how you can help improve PROJ.
+
+The PROJ GitHub page can be found at https://github.com/OSGeo/proj.4
+
+.. note::
+
+ The issue tracker on GitHub is only meant to keep track of bugs, feature
+ request and other things related to the development of PROJ. Please ask
+ your questions about the use of PROJ on the mailing list instead.
+
+
diff --git a/docs/source/development/for_proj_contributors.rst b/docs/source/community/code_contributions.rst
index d85f5cb1..ef144399 100644
--- a/docs/source/development/for_proj_contributors.rst
+++ b/docs/source/community/code_contributions.rst
@@ -1,7 +1,7 @@
-.. _for_proj_contributors:
+.. _code_contributions:
================================================================================
-Development rules and tools for PROJ code contributors
+Guidelines for PROJ code contributors
================================================================================
This is a guide for PROJ, casual or regular, code contributors.
diff --git a/docs/source/contributing.rst b/docs/source/community/contributing.rst
index 368f659f..d56aef6e 100644
--- a/docs/source/contributing.rst
+++ b/docs/source/community/contributing.rst
@@ -92,13 +92,13 @@ the documentation should be made as `Pull
Requests <https://github.com/OSGeo/proj.4/pulls>`__ on GitHub.
If you intend to document one of PROJ's supported projections please
-use the `Mercator projection <http://proj4.org/projections/merc.html>`__
+use the :doc:`Mercator projection <../operations/projections/merc>`
as a template.
Code contributions
------------------
-See :doc:`Code contributions <development/for_proj_contributors>`
+See :doc:`Code contributions <code_contributions>`
Legalese
~~~~~~~~
diff --git a/docs/source/community/index.rst b/docs/source/community/index.rst
new file mode 100644
index 00000000..07308753
--- /dev/null
+++ b/docs/source/community/index.rst
@@ -0,0 +1,18 @@
+.. _community:
+
+Community
+===============================================================================
+
+The PROJ community is what makes the software stand out from its competitors.
+PROJ is used and developed by group of very enthusiastic, knowledgeable and
+friendly people. Whether you are a first time user of PROJ or a long-time
+contributor the community is always very welcoming.
+
+.. only:: html
+
+ .. toctree::
+ :maxdepth: 1
+
+ channels
+ contributing
+ code_contributions
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
index 0a5fea60..3f8a7bf6 100644
--- a/docs/source/development/index.rst
+++ b/docs/source/development/index.rst
@@ -19,4 +19,3 @@ PROJ project or using the library in their own software.
cmake
bindings
migration
- for_proj_contributors
diff --git a/docs/source/index.rst b/docs/source/index.rst
index 5eb521c8..03e993ec 100644
--- a/docs/source/index.rst
+++ b/docs/source/index.rst
@@ -41,16 +41,12 @@ Documentation
resource_files
geodesic
development/index
+ community/index
faq
- contributing
glossary
license
references
-Mailing List
-================================================================================
-
-The PROJ mailing list can be found at http://lists.maptools.org/mailman/listinfo/proj
Indices and tables
==================