-<em/Note:/ Do not upload packages containing software that is
-export-controlled by the United States government to <tt/master/, or
-to the overseas upload queues on <tt/chiark/ or <tt/erlangen/. This
-prohibition covers almost all cryptographic software, and even
-sometimes software that contains ``hooks'' to cryptographic software,
-such as electronic mail readers that support PGP encryption and
-authentication. Uploads of such software should go to <tt/non-us/
-(see below). If you are not sure whether U.S. export controls apply
-to your package, post a message to
-<email/debian-devel@lists.debian.org/ and ask.
- <p>
-You may also find the Debian package <package/dupload/ useful when
-uploading packages. This handy program is distributed with defaults
-for uploading via <prgn/ftp/ to <tt/master/, <tt/chiark/, and
-<tt/erlangen/. It can also be configured to use <prgn/ssh/. See
-<manref name="dupload" section="1"> and <manref name="dupload"
-section="5"> for more information.
-
-
- <sect1>Uploads via <tt/chiark/
- <p>
-If you have a slow network connection to <tt/master/, there are
-alternatives. One is to upload files to <tt/Incoming/ via a
-cron-driven upload queue in Europe on <tt/chiark/. For details connect
-to <ftpsite>ftp.chiark.greenend.org.uk</ftpsite> using anonymous FTP
-and read
-<ftppath>/pub/debian/private/project/README.how-to-upload</ftppath>.
- <p>
-<em/Note:/ Do not upload packages containing software that is
+<em>Note:</em> Do not upload to <tt>ftp-master</tt> packages
+containing software that is patent-restricted by the United States
+government, nor any cryptographic packages which belong to
+<em>contrib</em> or <em>non-free</em>. If you can't upload it to
+<tt>ftp-master</tt>, then neither can you upload it to the overseas
+upload queues on <tt>chiark</tt> or <tt>erlangen</tt>. Uploads of
+such software should go to <tt>non-us</tt> (see <ref
+id="upload-non-us">). If you are not sure whether U.S. patent
+controls or cryptographic controls apply to your package, post a
+message to &email-debian-devel; and ask.
+ <p>
+You may also find the Debian packages <package>dupload</package> or
+<package>dput</package> useful
+when uploading packages. These handy program are distributed with
+defaults for uploading via <prgn>ftp</prgn> to <tt>ftp-master</tt>,
+<tt>chiark</tt>, and <tt>erlangen</tt>. They can also be configured to
+use <prgn>ssh</prgn> or <prgn>rsync</prgn>. See <manref name="dupload"
+section="1">, <manref name="dupload" section="5"> and <manref name="dput"
+section="1"> for more information.
+ <p>
+After uploading your package, you can check how the archive maintenance
+software will process it by running <prgn>dinstall</prgn> on your changes
+file: <example>dinstall -n foo.changes</example>
+
+ <sect2 id="upload-non-us">Uploading to <tt>non-US</tt> (pandora)
+ <p>
+As discussed above, export controlled software should not be uploaded
+to <tt>ftp-master</tt>. Instead, upload the package to
+<ftpsite>non-us.debian.org</ftpsite>, placing the files in
+<tt>&non-us-upload-dir;</tt> (both <ref id="dupload"> and <ref
+id="dput"> can be used also, with the right invokation). By default,
+you can use the same account/password that works on
+<tt>ftp-master</tt>. If you use anonymous FTP to upload, place the
+files into <ftppath>/pub/UploadQueue/</ftppath>.
+ <p>
+You can check your upload the same way it's done on <tt>ftp-master</tt>,
+with:
+<example>dinstall -n foo.changes</example>
+ <p>
+Note that U.S. residents or citizens are subject to restrictions on
+export of cryptographic software. As of this writing, U.S. citizens
+are allowed to export some cryptographic software, subject to
+notification rules by the U.S. Department of Commerce. However, this
+restriction has been waived for software which is already available
+outside the U.S. Therefore, any cryptographic software which belongs
+in the <em>main</em> section of the Debian archive and does not depend
+on any package outside of <em>main</em> (e.g., does not depend on
+anything in <em>non-US/main</em>) can be uploaded to <tt>ftp-master</tt>
+or its queues, described above.
+ <p>
+Debian policy does not prevent upload to non-US by U.S. residents or
+citizens, but care should be taken in doing so. It is recommended that
+developers take all necessary steps to ensure that they are not
+breaking current US law by doing an upload to non-US, <em>including
+consulting a lawyer</em>.
+ <p>
+For packages in <em>non-US/main</em>, <em>non-US/contrib</em>,
+developers should at least follow the <url id="&url-u.s.-export;"
+name="procedure outlined by the US Government">. Maintainers of
+<em>non-US/non-free</em> packages should further consult the <url
+id="&url-notification-of-export;" name="rules on notification of
+export"> of non-free software.
+ <p>
+This section is for information only and does not constitute legal
+advice. Again, it is strongly recommended that U.S. citizens and
+residents consult a lawyer before doing uploads to non-US.
+
+
+ <sect2>Uploads via <tt>chiark</tt>
+ <p>
+If you have a slow network connection to <tt>ftp-master</tt>, there are
+alternatives. One is to upload files to <tt>Incoming</tt> via a
+upload queue in Europe on <tt>chiark</tt>. For details connect to
+<url id="&url-chiark-readme;">.
+ <p>
+<em>Note:</em> Do not upload packages containing software that is