| 
					
				 | 
			
			
				@@ -5,30 +5,26 @@ development. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 * Main contribution rules 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-1. The master git repository is hosted publicly at [[https://orgmode.org][orgmode.org]]. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+1. The master git repository is hosted publicly on [[https://savannah.gnu.org][savannah.gnu.org]]. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   Anyone can get a clone of the current repository state using the 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   command 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   : git clone https://git.savannah.gnu.org/git/emacs/org-mode.git 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   : git clone https://code.orgmode.org/bzg/org-mode.git 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   This is sufficient to start hacking and to produce patches that can 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   easily and consistently be applied to the main repository. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   Having a clone is sufficient to start hacking and to produce 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   patches that can easily and consistently be applied to the main 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   repository. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-2. People who are interested in participating to the Org mode 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   development can do so by sending patches to this address: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+2. People who want to participate to the Org mode development can send 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   patches to this address: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    : emacs-orgmode@gnu.org 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-3. An interested developer can also request push access to the central 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   repository by creating an account on code.orgmode.org and by 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   sending her/his user info to the maintainer. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				- 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   After you have been added as a user with push privileges, clone the 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   repository through ssh using 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+3. If you are a regular contributor, you can request push access to 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   the repository by creating an account on [[https://savannah.gnu.org/account/register.php][savannah.gnu.org]] and by 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   [[https://savannah.gnu.org/git/?group=emacs][joining the Emacs group]]. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   After you have been added as a user with push privileges, you can 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   clone the repository like this: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-   : git clone git@code.orgmode.org:bzg/org-mode.git 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+   : git clone git://git.savannah.gnu.org/emacs/org-mode.git 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    By requesting push access, you acknowledge that you have read and 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    agreed with the following rules: 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -40,14 +36,13 @@ development. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      applies are: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      - all *.el files in the lisp directory of the repository 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     - org.texi, orgcard.tex in the doc directory 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     - the corresponding ChangeLog files 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     - org.texi, orgcard.tex in the doc/ directory 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    - Before making any significant changes, please explain and discuss 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     them on the mailing list [[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]].   
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     them on the mailing list [[mailto:emacs-orgmode@gnu.org][emacs-orgmode@gnu.org]]. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      This does obviously not apply to people who are maintaining their 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     own contributions to Org mode. Please, just use the new mechanism 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     own contributions to Org mode.  Please just use the new mechanism 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      to make sure all changes end up in the right place. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      We value a nice tone in our discussions: please check and respect 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -58,9 +53,8 @@ development. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      `CONTRIBUTE' file in the main Emacs repository. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    - Among other things, Org mode is widely appreciated because of its 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     simplicity, cleanness and consistency.  We should try hard to 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     preserve this and ask everyone to keep this in mind when 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-     proposing changes. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     simplicity, cleanness and consistency.  We should try to preserve 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     them and ask everyone to keep this in mind when posting changes. 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 * The contrib/ directory 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |