Skip to content

Commit 119bcae

Browse files
committed
Update info in the sections and fix grammatical mistakes
1 parent 81056f6 commit 119bcae

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/maintainer/adding_pkgs.rst

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -115,35 +115,30 @@ Post staging process
115115
Feedstock repository structure
116116
------------------------------
117117

118-
Once the PR having the recipe for a package is merged in the ``staged-recipes`` repository, a new repository is created automatically called ``<package-name> feedstock`` which lies in the `feedstock <https://github.com/conda-forge/feedstocks/>`__ repository.
119-
A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configuration files for automatic building using freely available continuous integration services.
118+
Once the PR having the recipe for a package is merged in the ``staged-recipes`` repository, a new repository is created automatically called ``<package-name>-feedstock``.
119+
A feedstock is made up of a conda recipe (the instructions on what and how to build the package) and the necessary configuration files for automatic builds using freely available continuous integration services.
120120

121-
Each feedstock contains various files which are generated automatically using `conda-smithy <https://github.com/conda-forge/conda-smithy/>`__ which is a tool used for managing continuous integration and maintenance of the feedstocks. Broadly every feedstock has the following files :
121+
Each feedstock contains various files which are generated automatically using our automated provisioning tool `conda-smithy <https://github.com/conda-forge/conda-smithy/>`__. Broadly every feedstock has the following files:
122122

123123
recipe
124124
......
125125

126-
This folder contians the ``meta.yaml`` file in which everything is defined that is required to build and use the package.
126+
This folder contains the ``meta.yaml`` file and any other files/scripts needed to build the package.
127127

128128
LICENSE.txt
129129
............
130130

131-
This is an auto-generated license which is generated when feedstock is created. This license is different from the related package license, which you define while submitting the package recipe using ``license_file`` in the ``meta.yaml`` file.
131+
This file is the license for the recipe itself. This license is different from the package license, which you define while submitting the package recipe using ``license_file`` in the ``meta.yaml`` file.
132132

133133
CI-files
134134
........
135135

136-
These are the CI configuration files for service providers like CircleCI, AppVeyor and TravisCI, which makes it possible to build and upload installable packages to the conda-forge Anaconda-Cloud channel for Linux, Windows and OSX respectively.
137-
138-
``.scripts``
139-
.............
140-
141-
This folder contains build scripts for various environments.
136+
These are the CI configuration files for service providers like Azure and TravisCI.
142137

143138
conda-forge.yml
144139
................
145140

146-
This file is used to configure how conda-forge is set up and built. Making any changes in this files usually requires `rerending of the feedstock <https://conda-forge.org/docs/maintainer/updating_pkgs.html#dev-update-rerender>`__.
141+
This file is used to configure how the feedstock is set up and built. Making any changes in this file usually requires `rerending of the feedstock <https://conda-forge.org/docs/maintainer/updating_pkgs.html#dev-update-rerender>`__.
147142

148143
Maintainer role
149144
---------------

0 commit comments

Comments
 (0)