diff --git a/ocfweb/docs/docs/staff/backend/printhost.md b/ocfweb/docs/docs/staff/backend/printhost.md index 239fb6879..3eb2240f6 100644 --- a/ocfweb/docs/docs/staff/backend/printhost.md +++ b/ocfweb/docs/docs/staff/backend/printhost.md @@ -140,7 +140,7 @@ and emails users in the case a job fails. After printing a document from a desktop, lab visitors are notified when pages are subtracted from their quota by a little popup notification. This is done by a short daemon script, [notify script][notify], which starts upon login and -runs the [[paper command|doc staff/howto/user-services/paper]] every minute to see if the +runs the [[paper command|doc staff/howto/printing/paper]] every minute to see if the quota has changed. In the future, it would be nice to have a more robust notification system where @@ -157,9 +157,9 @@ current user. ## See also -- [[Printing maintenance|doc staff/howto/maintenance/printing]] +- [[Printing maintenance|doc staff/howto/printing/printing]] - The [ocf\_printhost][ocf_printhost] Puppet class -- The [[paper|doc staff/howto/user-services/paper]] command +- The [[paper|doc staff/howto/printing/paper]] command - [CUPS documentation at Samba][cups-samba] (for Windows users, but has general CUPS info as well) diff --git a/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md b/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md index edafeb90b..c7e0644b3 100644 --- a/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md +++ b/ocfweb/docs/docs/staff/howto/infrastructure/installing-updates.md @@ -17,7 +17,7 @@ To install updates: 1. Make sure the desktops are not [suspended](https://github.com/ocf/puppet/blob/master/modules/ocf_desktop/files/suspend/ocf-suspend), and that you aren't trying to install updates near a 15-minute boundary when - the desktops auto-suspend. See [[lab-wakeup|doc staff/howto/maintenance/lab-wakeup]] to + the desktops auto-suspend. See [[lab-wakeup|doc staff/howto/infrastructure/lab-wakeup]] to wake up the desktops prior to updating. 2. From `supernova`, run: diff --git a/ocfweb/docs/docs/staff/howto/maintenance/lab-wakeup.md b/ocfweb/docs/docs/staff/howto/infrastructure/lab-wakeup.md similarity index 100% rename from ocfweb/docs/docs/staff/howto/maintenance/lab-wakeup.md rename to ocfweb/docs/docs/staff/howto/infrastructure/lab-wakeup.md diff --git a/ocfweb/docs/docs/staff/howto/maintenance.md b/ocfweb/docs/docs/staff/howto/maintenance.md deleted file mode 100644 index 98c4bf5ac..000000000 --- a/ocfweb/docs/docs/staff/howto/maintenance.md +++ /dev/null @@ -1 +0,0 @@ -[[!meta title="Maintenance"]] diff --git a/ocfweb/docs/docs/staff/howto/other/pdf-open.md b/ocfweb/docs/docs/staff/howto/other/pdf-open.md index 779b0bdde..cd33ceb6f 100644 --- a/ocfweb/docs/docs/staff/howto/other/pdf-open.md +++ b/ocfweb/docs/docs/staff/howto/other/pdf-open.md @@ -15,6 +15,6 @@ filename doesn't have any spaces or weird characters in it. After re-rasterizing the file, Evince will open, and you can start a new print job from there. Monitor the job's progress in [printhost.ocf.berkeley.edu](//printhost.ocf.berkeley.edu) to ensure the job -survives. You may [[refund|doc staff/howto/user-services/paper]] printing credits to +survives. You may [[refund|doc staff/howto/printing/paper]] printing credits to the user in case they've gone over their daily capacity and you're feeling generous. diff --git a/ocfweb/docs/docs/staff/howto/printing.md b/ocfweb/docs/docs/staff/howto/printing.md new file mode 100644 index 000000000..4c73239ac --- /dev/null +++ b/ocfweb/docs/docs/staff/howto/printing.md @@ -0,0 +1 @@ +[[!meta title="Printing"]] diff --git a/ocfweb/docs/docs/staff/howto/maintenance/economode.md b/ocfweb/docs/docs/staff/howto/printing/economode.md similarity index 100% rename from ocfweb/docs/docs/staff/howto/maintenance/economode.md rename to ocfweb/docs/docs/staff/howto/printing/economode.md diff --git a/ocfweb/docs/docs/staff/howto/user-services/paper.md b/ocfweb/docs/docs/staff/howto/printing/paper.md similarity index 100% rename from ocfweb/docs/docs/staff/howto/user-services/paper.md rename to ocfweb/docs/docs/staff/howto/printing/paper.md diff --git a/ocfweb/docs/docs/staff/howto/maintenance/printing.md b/ocfweb/docs/docs/staff/howto/printing/printing.md similarity index 100% rename from ocfweb/docs/docs/staff/howto/maintenance/printing.md rename to ocfweb/docs/docs/staff/howto/printing/printing.md diff --git a/ocfweb/docs/urls.py b/ocfweb/docs/urls.py index 5fd0d0ddc..57deeb4fa 100644 --- a/ocfweb/docs/urls.py +++ b/ocfweb/docs/urls.py @@ -65,9 +65,9 @@ '/staff/procedures/setting-up-mdraid': 'staff/howto/infrastructure/setting-up-mdraid', '/staff/scripts/ssh-list': 'staff/howto/infrastructure/ssh-list', '/staff/procedures/ssl': 'staff/howto/infrastructure/ssl', - '/staff/scripts/economode': 'staff/howto/maintenance/economode', - '/staff/scripts/lab-wakeup': 'staff/howto/maintenance/lab-wakeup', - '/staff/procedures/printing': 'staff/howto/maintenance/printing', + '/staff/scripts/economode': 'staff/howto/printing/economode', + '/staff/scripts/lab-wakeup': 'staff/howto/infrastructure/lab-wakeup', + '/staff/procedures/printing': 'staff/howto/printing/printing', '/staff/procedures/dmca': 'staff/howto/other/dmca', '/staff/scripts/how': 'staff/howto/other/how', '/staff/scripts/ocf-tv': 'staff/howto/other/ocf-tv', @@ -76,9 +76,8 @@ '/staff/procedures/granting-privileges': 'staff/howto/staff-admin/granting-privileges', '/staff/procedures/accounts/alumni-reset': 'staff/howto/user-services/alumni-reset', '/staff/scripts/approve': 'staff/howto/user-services/approve', - '/staff/scripts/paper': 'staff/howto/user-services/paper', + '/staff/scripts/paper': 'staff/howto/printing/paper', '/staff/procedures/vhost': 'staff/howto/user-services/vhost', - }