Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update documentation for Apple #2117

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Update documentation for Apple #2117

merged 1 commit into from
Sep 11, 2024

Conversation

nblock
Copy link
Collaborator

@nblock nblock commented Sep 9, 2024

I tried hard not to modify the actual instructions as I don't have Apple devices that I could use to test it.

See the commit message for details.

  • have read the CONTRIBUTING.md file
  • raised a GitHub issue or discussed it on the projects chat beforehand
  • added unit tests
  • added integration tests
  • updated documentation if needed
  • updated CHANGELOG.md

Summary by CodeRabbit

  • Documentation
    • Updated the "Client OS support" section for improved clarity and navigation.
    • Enhanced the Apple client documentation to include both iOS and macOS, with reorganised headers for better structure.
    • Improved the Windows client documentation for better visibility of critical instructions.
    • Adjusted navigation structure to consolidate iOS and Apple documentation into a single entry.

@nblock nblock marked this pull request as draft September 9, 2024 12:33
Copy link
Contributor

coderabbitai bot commented Sep 9, 2024

Walkthrough

This pull request updates the documentation for headscale, specifically enhancing the "Client OS support" section in README.md, reorganising the Apple client documentation in docs/apple-client.md, and modifying the navigation in mkdocs.yml. The changes include improved links for macOS and iOS, a broader reference to Apple clients, and adjustments to section headers for clarity and consistency.

Changes

Files Change Summary
README.md, docs/apple-client.md, mkdocs.yml Updated documentation links for macOS and iOS; restructured Apple client documentation to encompass both iOS and macOS; modified navigation to reflect this consolidation.
docs/windows-client.md Improved clarity and organisation of the Windows client documentation by relocating and reformatting key instructions.
integration/scenario_test.go Corrected a typographical error in comments.
hscontrol/templates/apple.html Reorganised and streamlined configuration instructions for Tailscale on iOS and macOS.

Possibly related PRs

Poem

🐇 In the meadow, changes bloom,
Documentation sheds old gloom.
Apple clients now unite,
Clarity shines, oh what a sight!
Links updated, paths refined,
A joyful hop, all aligned! 🍏✨

Tip

New features

Walkthrough comment now includes:

  • Possibly related PRs: A list of potentially related PRs to help you recall past context.
  • Suggested labels: CodeRabbit can now suggest labels by learning from your past PRs. You can also provide custom labeling instructions in the UI or configuration file.

Notes:

  • Please share any feedback in the discussion post on our Discord.
  • Possibly related PRs, automatic label suggestions based on past PRs, learnings, and possibly related issues require data opt-in (enabled by default).

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share
Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai generate interesting stats about this repository and render them as a table.
    • @coderabbitai show all the console.log statements in this repository.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

Outside diff range, codebase verification and nitpick comments (1)
docs/apple-client.md (1)

18-18: Info note modification is appropriate but verify the exclamation usage.

The change in the info note to "Instructions on your headscale instance" is suitable as it generalises the information for all Apple devices. However, the use of three exclamation marks might be seen as excessive. Consider reducing it to maintain a professional tone in the documentation.

-!!! info "Instructions on your headscale instance"
+! info "Instructions on your headscale instance"
Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 7be8796 and b70442a.

Files selected for processing (3)
  • README.md (1 hunks)
  • docs/apple-client.md (1 hunks)
  • mkdocs.yml (1 hunks)
Additional context used
LanguageTool
docs/apple-client.md

[style] ~17-~17: Using many exclamation marks might seem excessive (in this case: 3 exclamation marks for a text that’s 1035 characters long)
Context: ...7). ### Configuring the headscale URL !!! info "Instructions on your headscale in...

(EN_EXCESSIVE_EXCLAMATION)

README.md

[grammar] ~72-~72: The operating system from Apple is written “macOS”.
Context: ... | | macOS | Yes (see docs and /apple on your headscale for mor...

(MAC_OS)

Additional comments not posted (4)
docs/apple-client.md (2)

1-1: Header change enhances clarity.

The change from "Connecting an iOS client" to "Connecting an Apple client" broadens the scope of the documentation to include both iOS and macOS, aligning with the updated content that addresses both platforms.


10-10: Reorganisation of section headers.

The reorganisation from "## iOS" to "### Installation" under the iOS section is a logical restructuring that clarifies the hierarchy of information, making it easier for users to navigate the documentation.

Also applies to: 12-12

mkdocs.yml (1)

142-142: Navigation update aligns with documentation restructuring.

The addition of "Apple: apple-client.md" and the removal of "iOS: iOS-client.md" in the navigation structure are consistent with the broader documentation updates that now encompass both macOS and iOS under a unified Apple category. This change simplifies the navigation and reflects the updated documentation focus.

README.md (1)

72-73: Updated documentation links enhance navigability.

The modifications to the documentation links for macOS and iOS, which now point to more specific sections within the same documentation file, improve user navigability and access to relevant information. This change is a positive step towards making the documentation more user-friendly and accessible.

Tools
LanguageTool

[grammar] ~72-~72: The operating system from Apple is written “macOS”.
Context: ... | | macOS | Yes (see docs and /apple on your headscale for mor...

(MAC_OS)

docs/apple-client.md Outdated Show resolved Hide resolved
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 5

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between b70442a and 3a8fe85.

Files selected for processing (4)
  • README.md (1 hunks)
  • docs/apple-client.md (1 hunks)
  • docs/windows-client.md (1 hunks)
  • mkdocs.yml (1 hunks)
Files skipped from review due to trivial changes (1)
  • docs/windows-client.md
Files skipped from review as they are similar to previous changes (1)
  • mkdocs.yml
Additional context used
LanguageTool
docs/apple-client.md

[style] ~6-~6: Using many exclamation marks might seem excessive (in this case: 3 exclamation marks for a text that’s 1604 characters long)
Context: ...ilscale.com) clients with headscale. !!! info "Instructions on your headscale in...

(EN_EXCESSIVE_EXCLAMATION)


[uncategorized] ~22-~22: If this is a compound adjective that modifies the following noun, use a hyphen.
Context: ... on the iOS device - Scroll down to the third party apps section, under Game Center or `...

(EN_COMPOUND_ADJECTIVE_INTERNAL)


[grammar] ~34-~34: The operating system from Apple is written “macOS”.
Context: ...of the available [Tailscale clients for MacOS](https://tailscale.com/kb/1065/macos-va...

(MAC_OS)

README.md

[grammar] ~72-~72: The operating system from Apple is written “macOS”.
Context: ... | | macOS | Yes (see docs and /apple on your headscale for mor...

(MAC_OS)

Markdownlint
docs/apple-client.md

42-42: null
Fenced code blocks should have a language specified

(MD040, fenced-code-language)


42-42: Expected: indented; Actual: fenced
Code block style

(MD046, code-block-style)

docs/apple-client.md Show resolved Hide resolved
docs/apple-client.md Outdated Show resolved Hide resolved
docs/apple-client.md Outdated Show resolved Hide resolved
docs/apple-client.md Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
* Rename docs/ios-client.md to docs/apple-client.md. Add instructions
  for macOS; those are copied from the /apple endpoint and slightly
  modified. Fix doc links in the README.
* Move infoboxes for /apple and /windows under the "Goal" section to the
  top. Those should be seen by users first as they contain *their*
  specific headscale URL.
* Swap order of macOS and iOS to move "Profiles" further down.
* Remove apple configuration profiles
* Remove Tailscale versions hints
* Mention /apple and /windows in the README along with their docs

See: juanfont#2096
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

Review details

Configuration used: .coderabbit.yaml
Review profile: CHILL

Commits

Files that changed from the base of the PR and between 3a8fe85 and 05d9419.

Files selected for processing (6)
  • README.md (1 hunks)
  • docs/apple-client.md (1 hunks)
  • docs/windows-client.md (1 hunks)
  • hscontrol/templates/apple.html (2 hunks)
  • integration/scenario_test.go (1 hunks)
  • mkdocs.yml (1 hunks)
Files skipped from review due to trivial changes (1)
  • integration/scenario_test.go
Files skipped from review as they are similar to previous changes (2)
  • docs/windows-client.md
  • mkdocs.yml
Additional context used
LanguageTool
docs/apple-client.md

[style] ~6-~6: Using many exclamation marks might seem excessive (in this case: 3 exclamation marks for a text that’s 1604 characters long)
Context: ...ilscale.com) clients with headscale. !!! info "Instructions on your headscale in...

(EN_EXCESSIVE_EXCLAMATION)


[uncategorized] ~22-~22: If this is a compound adjective that modifies the following noun, use a hyphen.
Context: ... on the iOS device - Scroll down to the third party apps section, under Game Center or `...

(EN_COMPOUND_ADJECTIVE_INTERNAL)

README.md

[grammar] ~72-~72: The operating system from Apple is written “macOS”.
Context: ... | | macOS | Yes (see docs and /apple on your headscale for mor...

(MAC_OS)

Markdownlint
docs/apple-client.md

42-42: null
Fenced code blocks should have a language specified

(MD040, fenced-code-language)


42-42: Expected: indented; Actual: fenced
Code block style

(MD046, code-block-style)

Additional comments not posted (6)
docs/apple-client.md (3)

5-11: Clarify the endpoint information.

The documentation mentions an endpoint at /apple on the running instance but does not specify what type of information or interface the user can expect to find there. It would be beneficial to provide a brief description of what the endpoint offers or how it aids in the connection process.

Would you like me to draft a more detailed description for this endpoint, or would you prefer to update it yourself?

Tools
LanguageTool

[style] ~6-~6: Using many exclamation marks might seem excessive (in this case: 3 exclamation marks for a text that’s 1604 characters long)
Context: ...ilscale.com) clients with headscale. !!! info "Instructions on your headscale in...

(EN_EXCESSIVE_EXCLAMATION)


22-22: Hyphenate compound adjectives for clarity.

The phrase "third party apps" should be hyphenated when used as a compound adjective:

- Scroll down to the `third party apps` section
+ Scroll down to the `third-party apps` section

This change will improve the readability and correctness of the documentation.

Tools
LanguageTool

[uncategorized] ~22-~22: If this is a compound adjective that modifies the following noun, use a hyphen.
Context: ... on the iOS device - Scroll down to the third party apps section, under Game Center or `...

(EN_COMPOUND_ADJECTIVE_INTERNAL)


42-44: Specify the language for code blocks and adjust the code block style.

The fenced code block should specify a language for better syntax highlighting and readability. Additionally, the code block style should be consistent with the rest of the documentation:

- ```
+ ```bash
tailscale login --login-server <YOUR_HEADSCALE_URL>

Also, consider using indentation for code blocks instead of fencing if that is the standard in this documentation.

Tools
Markdownlint

42-42: null
Fenced code blocks should have a language specified

(MD040, fenced-code-language)


42-42: Expected: indented; Actual: fenced
Code block style

(MD046, code-block-style)

hscontrol/templates/apple.html (2)

Line range hint 65-129: Review the macOS configuration section for consistency and clarity.

The macOS configuration section follows the iOS instructions and has been adjusted for consistency. Verify that the instructions are clear and the formatting is consistent with the rest of the document. The links to download profiles should be checked to ensure they are accessible and correct.


28-62: Review the iOS configuration section for clarity and accuracy.

The iOS configuration section has been reorganized and updated to provide clearer instructions. Ensure that the steps are accurate and easy to follow for users. The use of placeholders like {{.URL}} should be verified to ensure they are correctly replaced during template rendering.

README.md (1)

65-73: Update the documentation links for macOS and iOS.

The modifications to the "Client OS support" section enhance the clarity and navigability of the documentation. The links provided for macOS and iOS now point to more specific sections, which is a significant improvement. However, ensure that the capitalisation of "macOS" is consistent throughout the document:

- | macOS   | Yes (see [docs](./docs/apple-client.md#macos) and `/apple` on your headscale for more information)
+ | macOS   | Yes (see [docs](./docs/apple-client.md#macOS) and `/apple` on your headscale for more information)
Tools
LanguageTool

[grammar] ~72-~72: The operating system from Apple is written “macOS”.
Context: ... | | macOS | Yes (see docs and /apple on your headscale for mor...

(MAC_OS)

@nblock nblock marked this pull request as ready for review September 9, 2024 17:11
Copy link
Collaborator

@kradalby kradalby left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, nothing jumps out as if it would not work, and it looks a lot more streamlined, thank you!

@kradalby kradalby merged commit c3ef90a into juanfont:main Sep 11, 2024
117 checks passed
@nblock nblock deleted the apple branch September 11, 2024 16:55
kradalby pushed a commit to kradalby/headscale that referenced this pull request Sep 30, 2024
* Rename docs/ios-client.md to docs/apple-client.md. Add instructions
  for macOS; those are copied from the /apple endpoint and slightly
  modified. Fix doc links in the README.
* Move infoboxes for /apple and /windows under the "Goal" section to the
  top. Those should be seen by users first as they contain *their*
  specific headscale URL.
* Swap order of macOS and iOS to move "Profiles" further down.
* Remove apple configuration profiles
* Remove Tailscale versions hints
* Mention /apple and /windows in the README along with their docs

See: juanfont#2096
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants