From aefdf3122156d82f0dfe042bc2ce9a090b56f119 Mon Sep 17 00:00:00 2001 From: cburroughs Date: Fri, 26 Sep 2014 09:30:22 -0700 Subject: [PATCH] use nav markup in userguide Summary: An explicit navigation markup was recenty added. Use it in the userguide instead of ad-hoc -> or `->` chains. Test Plan: Read the docs. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: epriestley Differential Revision: https://secure.phabricator.com/D10560 Conflicts: src/docs/user/userguide/diffusion_hosting.diviner --- src/docs/user/userguide/diffusion_hosting.diviner | 9 ++++----- src/docs/user/userguide/diffusion_symbols.diviner | 2 +- src/docs/user/userguide/external_editor.diviner | 4 ++-- src/docs/user/userguide/mail_rules.diviner | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/docs/user/userguide/diffusion_hosting.diviner b/src/docs/user/userguide/diffusion_hosting.diviner index 1639639831..ecf7e1c3e3 100644 --- a/src/docs/user/userguide/diffusion_hosting.diviner +++ b/src/docs/user/userguide/diffusion_hosting.diviner @@ -127,7 +127,7 @@ If you plan to use authenticated HTTP, you need to set use only anonymous HTTP, you can leave this setting disabled. If you plan to use authenticated HTTP, you'll also need to configure a VCS -password in "Settings" -> "VCS Password". This is a different password than +password in {nav Settings > VCS Password}. This is a different password than your main Phabricator password primarily for security reasons. Otherwise, if you've configured system accounts above, you're all set. No @@ -254,9 +254,9 @@ Some general tips for troubleshooting problems with HTTP: - Make sure `diffusion.allow-http-auth` is enabled in your Phabricator config. - Make sure HTTP serving is enabled for the repository you're trying to clone. - You can find this in "Edit Repository" -> "Hosting". + You can find this in {nav Edit Repository > Hosting}. - Make sure you've configured a VCS password. This is separate from your main - account password. You can configure this in "Settings" -> "VCS Password". + account password. You can configure this in {nav Settings > VCS Password}. - Make sure the main repository screen in Diffusion shows a clone/checkout command for HTTP. If it doesn't, something above isn't set up correctly: double-check your configuration. You should see a `svn checkout http://...`, @@ -291,8 +291,7 @@ Some general tips for troubleshooting problems with SSH: SSH Read Only or Read/Write > Save Changes}. - Make sure you've added an SSH public key to your account. You can do this - in {nav Settings > - SSH Public Keys}. + in {nav Settings > SSH Public Keys}. - Make sure the main repository screen in Diffusion shows a clone/checkout command for SSH. If it doesn't, something above isn't set up correctly. You should see an `svn checkout svn+ssh://...`, `git clone ssh://...` or diff --git a/src/docs/user/userguide/diffusion_symbols.diviner b/src/docs/user/userguide/diffusion_symbols.diviner index b9b96ec209..0a212055d5 100644 --- a/src/docs/user/userguide/diffusion_symbols.diviner +++ b/src/docs/user/userguide/diffusion_symbols.diviner @@ -77,7 +77,7 @@ configuration. To configure Differential integration, you need to tell Phabricator which projects have symbol indexes you want to use, and which other projects they should pull symbols from. To do this, go to -`Repositories -> Arcanist Projects -> Edit` as an administrator. You need to +{nav Repositories > Arcanist Projects > Edit} as an administrator. You need to fill out these fields: - **Repository**: Associate the project with a tracked repository. diff --git a/src/docs/user/userguide/external_editor.diviner b/src/docs/user/userguide/external_editor.diviner index 675ed7eb1f..c98ccb1903 100644 --- a/src/docs/user/userguide/external_editor.diviner +++ b/src/docs/user/userguide/external_editor.diviner @@ -10,8 +10,8 @@ and Diffusion in your preferred text editor. = Configuring Editors = -To configure an external editor, go to Settings -> Application Settings -> -Display Preferences and set "Editor Link" to a URI pattern (see below). This +To configure an external editor, go to {nav Settings > Application Settings > +Display Preferences} and set "Editor Link" to a URI pattern (see below). This will enable an "Open in Editor" link in Differential, and an "Edit" button in Diffusion. diff --git a/src/docs/user/userguide/mail_rules.diviner b/src/docs/user/userguide/mail_rules.diviner index cc0860a1ae..64d0723fdb 100644 --- a/src/docs/user/userguide/mail_rules.diviner +++ b/src/docs/user/userguide/mail_rules.diviner @@ -16,7 +16,7 @@ write sophisticated rules to route, categorize, or delete email. = Reducing Email = You can reduce the amount of email you receive by turning off some types of -email in ##Settings -> Email Preferences##. For example, you can turn off email +email in {nav Settings > Email Preferences}. For example, you can turn off email produced by your own actions (like when you comment on a revision), and some types of less-important notifications about events.