Просмотр исходного кода

Updating links for shared drive and access notes (#1933)

Part of #1902 

Fixes #1904 

Regarding #1904, using #access-requests because I've decided I feel weird using any other channel for this (including #proposal-prs-and-process)
Jon Ross-Perkins 3 лет назад
Родитель
Сommit
d7613f5ef7
4 измененных файлов с 35 добавлено и 13 удалено
  1. 29 7
      CONTRIBUTING.md
  2. 3 3
      README.md
  3. 1 1
      docs/images/snippets.md
  4. 2 2
      docs/project/faq.md

+ 29 - 7
CONTRIBUTING.md

@@ -21,6 +21,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
     -   [Contributor License Agreements (CLAs)](#contributor-license-agreements-clas)
         -   [Future CLA plans](#future-cla-plans)
     -   [Collaboration systems](#collaboration-systems)
+        -   [Getting access](#getting-access)
     -   [Contribution tools](#contribution-tools)
     -   [Contribution guidelines and standards](#contribution-guidelines-and-standards)
         -   [Guidelines and philosophy for contributions](#guidelines-and-philosophy-for-contributions)
@@ -143,7 +144,7 @@ the Code of Conduct.
 -   [The GitHub carbon-language organization](https://github.com/carbon-language)
     is used for our repositories.
 -   [Discord](https://discord.gg/ZjVdShJDAs) is used for chat.
--   [A shared Google Drive](https://drive.google.com/corp/drive/folders/18AFPsUWNXfAloZx0tRHTsrdCWUlJLpeW)
+-   [A shared Google Drive](https://drive.google.com/drive/folders/1aC5JJ5EcI8B7cgVDrLvO7WNw97F0LpS2)
     is used for all of our Google Docs, particularly proposal drafts.
 -   [Google Calendar](https://calendar.google.com/calendar/embed?src=c_07td7k4qjq0ssb4gdl6bmbnkik%40group.calendar.google.com)
     is used for meeting invites and project reminders. Contributors may add
@@ -157,11 +158,32 @@ the Code of Conduct.
         which are unstructured meeting slots used for discussing proposals,
         tooling, and other Carbon topics based on who attends.
 
-Note that commenting on Google Docs, attending meetings, and some label changes
-in GitHub will require some contributor access: make sure you've
-[signed the CLA](#contributor-license-agreements-clas) then ask for access on
-[#getting-started](https://discord.com/channels/655572317891461132/655577725347561492)
-on Discord.
+#### Getting access
+
+Our collaboration systems are all viewable publicly, and most can be joined
+without particular requests. However, some require extra permissions, such as
+editing Google Docs, joining meetings, or some details of the proposal process.
+
+When requesting any of the following access, please provide a reason for the
+access. All requests require a
+[signed CLA](#contributor-license-agreements-clas).
+
+-   Google Docs/Calendar commenter access:
+    [join group](https://groups.google.com/a/carbon-lang.dev/g/commenters)
+    -   Grants commenter access to Carbon Language documents, as well as the
+        ability to view Calendar events.
+-   Google Docs/Calendar contributor access:
+    [join group](https://groups.google.com/a/carbon-lang.dev/g/contributors)
+    -   Grants edit access to Carbon Language documents, as well as the ability
+        to edit Calendar events.
+-   GitHub Label/project contributor access:
+    [ask on #access-requests](https://discord.com/channels/655572317891461132/1006221387574292540)
+    -   Don't forget to mention your GitHub username.
+    -   Used by the proposal process.
+
+If you simply want to chime in on GitHub or Discord, none of this is needed. If
+you're interested in joining meetings, ask for commenter access. If you're
+trying to write proposals, both types of contributor access will help.
 
 ### Contribution tools
 
@@ -257,7 +279,7 @@ A license is required at the top of all documents and files.
 ### Google Docs
 
 Google Docs all use
-[this template](https://docs.google.com/document/d/1sqEnIWWZKTrtMz2XgD7_RqvogwbI0tBQjAZIvOabQsw/template/preview).
+[this template](https://docs.google.com/document/d/1tAwE0230PDxweVruHUVY6DSfSnrJF2LnLOWXQYqNJuI/template/preview?usp=sharing&resourcekey=0-zsrwCWP7ictbxhCuePk-fw).
 It puts the license at the top of every page if printed.
 
 ### Markdown

+ 3 - 3
README.md

@@ -172,7 +172,7 @@ C++ code like this:
 <a href="docs/images/snippets.md#c">
 <!--
 Edit snippet in docs/images/snippets.md and:
-https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA
+https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB
 -->
 <img src="docs/images/cpp_snippet.svg" width="600"
      alt="A snippet of C++ code. Follow the link to read it.">
@@ -183,7 +183,7 @@ corresponds to this Carbon code:
 <a href="docs/images/snippets.md#carbon">
 <!--
 Edit snippet in docs/images/snippets.md and:
-https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA
+https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB
 -->
 <img src="docs/images/carbon_snippet.svg" width="600"
      alt="A snippet of converted Carbon code. Follow the link to read it.">
@@ -196,7 +196,7 @@ new Carbon on top of your existing C++ investment. For example:
 <a href="docs/images/snippets.md#mixed">
 <!--
 Edit snippet in docs/images/snippets.md and:
-https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA
+https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB
 -->
 <img src="docs/images/mixed_snippet.svg" width="600"
      alt="A snippet of mixed Carbon and C++ code. Follow the link to read it.">

+ 1 - 1
docs/images/snippets.md

@@ -9,7 +9,7 @@ SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 ## Images
 
 Images are managed in
-[Google Drive](https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA).
+[Google Drive](https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB).
 
 ## Quicksort
 

+ 2 - 2
docs/project/faq.md

@@ -174,7 +174,7 @@ For example, considering a pure C++ application:
 <a href="/docs/images/snippets.md#c">
 <!--
 Edit snippet in /docs/images/snippets.md and:
-https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA
+https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB
 -->
 <img src="/docs/images/cpp_snippet.svg" width="600"
      alt="A snippet of C++ code. Follow the link to read it.">
@@ -185,7 +185,7 @@ It's possible to migrate a single function to Carbon:
 <a href="/docs/images/snippets.md#mixed">
 <!--
 Edit snippet in /docs/images/snippets.md and:
-https://drive.google.com/drive/folders/1-rsUjiya7dSZ87L8kpZmu3MZghRVxzLA
+https://drive.google.com/drive/folders/1QrBXiy_X74YsOueeC0IYlgyolWIhvusB
 -->
 <img src="/docs/images/mixed_snippet.svg" width="600"
      alt="A snippet of mixed Carbon and C++ code. Follow the link to read it.">